aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2007-08-17 21:56:02 +0000
committerThien-Thi Nguyen2007-08-17 21:56:02 +0000
commitbbe5cceac71e18df96cb25e21f936b4cfe68df01 (patch)
tree2b505b3299584aa2f331720c4c6744b2c5237146
parentef1ba5eb15c28c664d526b1a3e0e0104cc29fd3a (diff)
downloademacs-bbe5cceac71e18df96cb25e21f936b4cfe68df01.tar.gz
emacs-bbe5cceac71e18df96cb25e21f936b4cfe68df01.zip
(copyright-update-year): Fix bug: Handle nil copyright-limit.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/copyright.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d41cfb66d1..1171fe04c6e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-17 Kimit Yada <kimitto@gmail.com> (tiny change)
2
3 * emacs-lisp/copyright.el (copyright-update-year):
4 Fix bug: Handle nil copyright-limit.
5
12007-08-17 Jay Belanger <jay.p.belanger@gmail.com> 62007-08-17 Jay Belanger <jay.p.belanger@gmail.com>
2 7
3 * calc/calc-units.el (math-standard-units): Give exact 8 * calc/calc-units.el (math-standard-units): Give exact
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 5fdebea68f3..84f96b12ad5 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -96,7 +96,9 @@ When this is `function', only ask when called non-interactively."
96 (re-search-forward (concat "\\(" copyright-regexp 96 (re-search-forward (concat "\\(" copyright-regexp
97 "\\)\\([ \t]*\n\\)?.*\\(?:" 97 "\\)\\([ \t]*\n\\)?.*\\(?:"
98 copyright-names-regexp "\\)") 98 copyright-names-regexp "\\)")
99 (if copyright-limit (+ (point) copyright-limit)) 99 (if copyright-limit
100 (+ (point) copyright-limit)
101 t)
100 t) 102 t)
101 ;; In case the regexp is rejected. This is useful because 103 ;; In case the regexp is rejected. This is useful because
102 ;; copyright-update is typically called from before-save-hook where 104 ;; copyright-update is typically called from before-save-hook where