[Emacs-diffs] trunk r118086: Only initialize erc-last-saved-position if not already a marker.

[Kelvin White]

------------------------------------------------------------
revno: 118086
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16145
author: Ivan Shmakov <address@hidden>
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Fri 2014-10-10 09:16:12 -0400
message:
  Only initialize erc-last-saved-position if not already a marker.
modified:
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2014-10-04 03:04:51 +0000
+++ b/lisp/erc/ChangeLog        2014-10-10 13:16:12 +0000
@@ -1,3 +1,8 @@
+2014-10-10  Kelvin White  <address@hidden>
+
+       * erc.el (erc-initialize-log-marker): Only initialize
+         erc-last-saved-position if not already a marker.
+
 2014-10-04  Stefan Monnier  <address@hidden>
 
        * erc.el (erc-channel-receive-names): Silence compiler warning.

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-10-04 03:04:51 +0000
+++ b/lisp/erc/erc.el   2014-10-10 13:16:12 +0000
@@ -2057,9 +2057,10 @@
   "Initialize the `erc-last-saved-position' marker to a sensible position.
 BUFFER is the current buffer."
   (with-current-buffer buffer
-    (setq erc-last-saved-position (make-marker))
-    (move-marker erc-last-saved-position
-                 (1- (marker-position erc-insert-marker)))))
+    (unless (markerp erc-last-saved-position)
+      (setq erc-last-saved-position (make-marker))
+      (move-marker erc-last-saved-position
+                  (1- (marker-position erc-insert-marker)))))
 
 ;; interactive startup