From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Fri, 17 Aug 2007 22:16:59 +0000 (+0000)
Subject: Revert last change.
X-Git-Tag: emacs-pretest-22.1.90~971
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2659333c28521b1ca9263d5a9dae88d853e7292;p=emacs.git

Revert last change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c64d493124..69d753121ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2007-08-17  Kimit Yada  <kimitto@gmail.com>  (tiny change)
-
-	* emacs-lisp/copyright.el (copyright-update-year, copyright-update)
-	(copyright-fix-years): Fix bug: Handle nil copyright-limit.
-
 2007-08-17  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
 
 	* progmode/cperl-mode.el (cperl-look-at-leading-count)
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index d3f0056c413..ed1d01023fb 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -84,10 +84,7 @@ When this is `function', only ask when called non-interactively."
 
 (defun copyright-update-year (replace noquery)
   (when (re-search-forward copyright-regexp
-                           (if copyright-limit
-                               (+ (point) copyright-limit)
-                             t)
-                           t)
+                           (if copyright-limit (+ (point) copyright-limit)) t)
     ;; If the years are continued onto multiple lined
     ;; that are marked as comments, skip to the end of the years anyway.
     (while (save-excursion
@@ -167,10 +164,7 @@ interactively."
                 "\\(the Free Software Foundation;\
  either \\|; a\\^u eldono \\([0-9]+\\)a, ? a\\^u (la\\^u via	 \\)\
 version \\([0-9]+\\), or (at"
-                (if copyright-limit
-                    (+ (point) copyright-limit)
-                  t)
-                t)
+                (if copyright-limit (+ (point) copyright-limit)) t)
 	       (not (string= (match-string 3) copyright-current-gpl-version))
 	       (or noquery
 		   (y-or-n-p (concat "Replace GPL version by "
@@ -193,10 +187,7 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
   (widen)
   (goto-char (point-min))
   (if (re-search-forward copyright-regexp
-                         (if copyright-limit
-                             (+ (point) copyright-limit)
-                           t)
-                         t)
+                         (if copyright-limit (+ (point) copyright-limit)) t)
       (let ((s (match-beginning 2))
 	    (e (copy-marker (1+ (match-end 2))))
 	    (p (make-marker))