diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/erc/erc-log.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/erc/erc-log.el')
| -rw-r--r-- | lisp/erc/erc-log.el | 9 |
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." |