# HG changeset patch
# User Thien-Thi Nguyen <ttn@gnuvola.org>
# Date 1187388962 0
# Node ID 4b3345d406990aaeb77df49e135653e68f0b588d
# Parent  48dfb842bc6a603640d2b3a322590f6c51d9ad82
Revert last change.

diff -r 48dfb842bc6a -r 4b3345d40699 lisp/emacs-lisp/copyright.el
--- a/lisp/emacs-lisp/copyright.el	Fri Aug 17 22:04:18 2007 +0000
+++ b/lisp/emacs-lisp/copyright.el	Fri Aug 17 22:16:02 2007 +0000
@@ -84,10 +84,7 @@
 
 (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 @@
                 "\\(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 @@
   (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))