X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d02fe47dd3be7310d1bfd6e802d1fac2ea5f5e9d..15de15c66d96905aa21f1781861067eebd68b24b:/lisp/makesum.el

diff --git a/lisp/makesum.el b/lisp/makesum.el
index 9427fb5b95..21fc693cfd 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -1,17 +1,16 @@
 ;;; makesum.el --- generate key binding summary for Emacs
 
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2011  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
 
 ;; 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 +18,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:
 
@@ -88,8 +85,7 @@ Previous contents of that buffer are killed first."
 
 (defun double-column (start end)
   (interactive "r")
-  (let (half cnt
-        line lines nlines
+  (let (half line lines nlines
 	(from-end (- (point-max) end)))
     (setq nlines (count-lines start end))
     (if (<= nlines 1)
@@ -100,7 +96,7 @@ Previous contents of that buffer are killed first."
        (forward-line half)
        (while (< half nlines)
 	 (setq half (1+ half))
-	 (setq line (buffer-substring (point) (save-excursion (end-of-line) (point))))
+	 (setq line (buffer-substring (point) (line-end-position)))
 	 (setq lines (cons line lines))
 	 (delete-region (point) (progn (forward-line 1) (point)))))
       (setq lines (nreverse lines))
@@ -114,5 +110,4 @@ Previous contents of that buffer are killed first."
 
 (provide 'makesum)
 
-;; arch-tag: c2383336-fc89-46ad-8110-ded42bffaee3
 ;;; makesum.el ends here