summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2015-12-27 21:08:01 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2015-12-27 21:08:01 +0100
commit5caa4dea5a3432e2b9c5f85b63265c05954c3d53 (patch)
tree82752d941e20e73b0326918017bda2a248385e34 /lisp/erc
parent03dbfb948c13dd7c9f24fae63e6ef482393c1e8e (diff)
downloademacs-5caa4dea5a3432e2b9c5f85b63265c05954c3d53.tar.gz
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).
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc-log.el9
1 files changed, 6 insertions, 3 deletions
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."