[Erc-commit] [commit][emacs22] erc-stamp: Fix bug with timestamp movement

[mwolson]

commit 0b75c8bab8097436fb896cf48eb48dfc362398a8
Author: Michael Olson <address@hidden>
Date:   Tue Nov 21 02:38:02 2006 +0000

    erc-stamp: Fix bug with timestamp movement
    
    2006-10-01  John J Foerch  <address@hidden>
    
        * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
        from the erc-timestamp field.
    git-archimport-id: address@hidden/erc--main--0--patch-65

diff --git a/CREDITS b/CREDITS
index d50680e..25ffd3b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -138,8 +138,21 @@ Eric Hanchrow <address@hidden>:
   * Implemented check of /ignore argument to see whether it was a
     regexp or a normal string (4 lines changed).
 
+John J Foerch <address@hidden>
+  * Fix bug with movement around right timestamps (2 lines changed).
+
+ukasz Demianiuk  <address@hidden>:
+  * Fix bug in erc-header-line (1 line changed).
+
+Andrea Russo <address@hidden>:
+  * Fixed wrong type argument bug in erc-dcc (1 line changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
 forgot.  If you aren't listed here and should be, send an email to
 address@hidden along with a list of your contributions.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/ChangeLog b/ChangeLog
index 74c9b29..62ee2d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,11 @@
        `erc-show-my-nick' is non-nil.
        (erc-compute-server): Doc fix.
 
+2006-10-01  John J Foerch  <address@hidden>
+
+       * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
+       from the erc-timestamp field.
+
 2006-09-11  Michael Olson  <address@hidden>
 
        * erc-nicklist.el (erc-nicklist-insert-contents): Add missing
diff --git a/erc-stamp.el b/erc-stamp.el
index 7d8684a..6b03713 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -266,8 +266,8 @@ be printed just before the window-width."
        (indent-to pos)
        (setq from (point))
        (insert string))
-      (erc-put-text-property from (1+ (point)) 'field 'erc-timestamp)
-      (erc-put-text-property from (1+ (point)) 'rear-nonsticky t)
+      (erc-put-text-property from (point) 'field 'erc-timestamp)
+      (erc-put-text-property from (point) 'rear-nonsticky t)
       (when erc-timestamp-intangible
        (erc-put-text-property from (1+ (point)) 'intangible t)))))