aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emacs-lisp/copyright.el
diff options
context:
space:
mode:
authorThien-Thi Nguyen <[email protected]>2007-08-17 22:16:59 +0000
committerThien-Thi Nguyen <[email protected]>2007-08-17 22:16:59 +0000
commitc2659333c28521b1ca9263d5a9dae88d853e7292 (patch)
tree769bfa319a0cd8437ad1834ebda9c2bb6ddb8e53 /lisp/emacs-lisp/copyright.el
parent578bbaf55b6a34022dd4c8ce3f2eedc96f4fb08a (diff)
Revert last change.
Diffstat (limited to 'lisp/emacs-lisp/copyright.el')
-rw-r--r--lisp/emacs-lisp/copyright.el15
1 files changed, 3 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index d3f0056c41..ed1d01023f 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))