Update copyright year to 2015

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

diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 137152ca99b63f2f70e4b44e085724d288628160..9a58288a4f5dc6a54e0f0fd2476fdcb70b02c235 100644 (file)
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -1,8 +1,9 @@
 ;;; erc-truncate.el --- Functions for truncating ERC buffers
 
-;; Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2015 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet, logging
 
 ;; This file is part of GNU Emacs.
@@ -36,7 +37,7 @@
   :group 'erc)
 
 (defcustom erc-max-buffer-size 30000
-  "*Maximum size in chars of each ERC buffer.
+  "Maximum size in chars of each ERC buffer.
 Used only when auto-truncation is enabled.
 \(see `erc-truncate-buffer' and `erc-insert-post-hook')."
   :group 'erc-truncate
@@ -66,8 +67,7 @@ region is logged if `erc-logging-enabled' returns non-nil."
     (unless (get-buffer buffer)
       (error "erc-truncate-buffer-to-size: %S is not a buffer" buffer)))
   (when (> (buffer-size buffer) (+ size 512))
-    (save-excursion
-      (set-buffer buffer)
+    (with-current-buffer buffer
       ;; Note that when erc-insert-post-hook runs, the buffer is
       ;; narrowed to the new message.  So do this delicate widening.
       ;; I am not sure, I think this was not recommended behavior in
@@ -116,4 +116,3 @@ Meant to be used in hooks, like `erc-insert-post-hook'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 22a2ea78-871f-4870-8f1e-efe534170311