* lisp/descr-text.el (describe-char-unicode-data): Fix copy/paste errors.

[gnu-emacs] / lisp / erc / erc-log.el

diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 465babc74f7c26a6790b81c16e55b48c6637b19d..61a83b1739ddf78fc60f906edd84caed2dcc7e49 100644 (file)
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -1,9 +1,9 @@
 ;;; erc-log.el --- Logging facilities for ERC.
 
-;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2016 Free Software Foundation, Inc.
 
 ;; Author: Lawrence Mitchell <wence@gmx.li>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet, logging
 
 ;; Created 2003-04-26
@@ -202,6 +202,7 @@ If you set this to nil, you may want to enable both
 
 This should ideally, be a \"catch-all\" coding system, like
 `emacs-mule', or `iso-2022-7bit'."
+  :type 'coding-system
   :group 'erc-log)
 
 (defcustom erc-log-filter-function nil
@@ -269,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."
@@ -378,6 +382,8 @@ This function is a possible value for `erc-generate-log-file-name-function'."
     ;; we need a make-safe-file-name function.
     (convert-standard-filename file)))
 
+(declare-function erc-network-name "erc-networks" ())
+
 (defun erc-generate-log-file-name-network (buffer target nick server port)
   "Generates a log-file name using the network name rather than server name.
 This results in a file name of the form #channel!nick@network.txt.