From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 27 Dec 2015 20:08:01 +0000 (+0100)
Subject: Don't insert erc logs at the end
X-Git-Tag: emacs-25.0.90~349
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5caa4dea5a3432e2b9c5f85b63265c05954c3d53;p=emacs.git

Don't insert erc logs at the end

* erc-log.el (erc-log-setup-logging): Insert the previous log
at the start of the buffer, not at the end (bug#20496).
---

diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index f022284450a..4ac13aab070 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -270,9 +270,12 @@ The current buffer is given by BUFFER."
       (setq buffer-file-name nil)
       (erc-set-write-file-functions '(erc-save-buffer-in-logs))
       (when erc-log-insert-log-on-open
-	(ignore-errors (insert-file-contents (erc-current-logfile))
-		       (move-marker erc-last-saved-position
-				    (1- (point-max))))))))
+	(ignore-errors
+	  (save-excursion
+	    (goto-char (point-min))
+	    (insert-file-contents (erc-current-logfile)))
+	  (move-marker erc-last-saved-position
+		       (1- (point-max))))))))
 
 (defun erc-log-disable-logging (buffer)
   "Disable logging in BUFFER."