Merge from emacs--rel--22

[bpt/emacs.git] / lisp / linum.el

diff --git a/lisp/linum.el b/lisp/linum.el
index 2aa79e0..41fe2de 100644 (file)
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -188,7 +186,7 @@ and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
   (run-with-idle-timer 0 nil #'linum-update-current))
 
 (defun linum-after-config ()
-  (walk-windows (lambda (w) (linum-update (window-buffer))) nil 'visible))
+  (walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
 
 (defun linum-unload-function ()
   "Unload the Linum library."