From: Ivan Shmakov <ivan@siamics.net>
Date: Fri, 10 Oct 2014 13:16:12 +0000 (-0400)
Subject: Only initialize erc-last-saved-position if not already a marker.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~85
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/43f52995ea9d4846c84f81d64107314a6577e595

Only initialize erc-last-saved-position if not already a marker.

Fixes: debbugs:16145
---

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index fd8f83bd78..0833bda4cb 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-10  Kelvin White  <kwhite@gnu.org>
+
+	* erc.el (erc-initialize-log-marker): Only initialize
+	  erc-last-saved-position if not already a marker.
+
 2014-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* erc.el (erc-channel-receive-names): Silence compiler warning.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 2fd41a34ad..1e81929d80 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2057,9 +2057,10 @@ Returns the buffer for the given server or channel."
   "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