diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-31 05:02:54 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-31 05:02:54 +0000 |
| commit | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (patch) | |
| tree | 165cbd151b45eb84012e017a4944c398fae79654 /lisp/emacs-lisp/copyright.el | |
| parent | 22eca14e49cfc7d696534cbf90a49c3ec9b7a68c (diff) | |
| parent | bd53d37c664e18c3417da079de4bb999533886af (diff) | |
| download | emacs-2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca.tar.gz emacs-2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca.tar.bz2 emacs-2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca.zip | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 75-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
2007-07-29 Kimit Yada <kimitto@gmail.com> (tiny change)
* lisp/emacs-lisp/copyright.el (copyright-update-year, copyright-update)
(copyright-fix-years, copyright): Correctly handle the case where
copyright-limit is nil.
2007-07-28 Konstantin Novitsky <knovitsk@Bear.com> (tiny change)
* lisp/progmodes/python.el (run-python): Fix path separator under w32.
2007-07-24 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-msg.el (gnus-summary-supersede-article)
(gnus-summary-resend-message-edit): Add Gcc header.
(gnus-summary-resend-bounced-mail): Ditto; search whole body for parent
article's Message-ID; refer parent article in summary buffer.
* lisp/gnus/message.el (message-bounce): Call mime-to-mml.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-838
Diffstat (limited to 'lisp/emacs-lisp/copyright.el')
| -rw-r--r-- | lisp/emacs-lisp/copyright.el | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index 15dce4310a2..8543bad2f4e 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -46,8 +46,8 @@ A value of nil means to search whole buffer." ;; The character classes have the Latin-1 version and the Latin-9 ;; version, which is probably enough. (defcustom copyright-regexp - "\\([����]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *\\(?:(C)\\)?\ -\\|[Cc]opyright\\s *:?\\s *[����]\\)\ + "\\([����]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *\\(?:(C)\\)?\ +\\|[Cc]opyright\\s *:?\\s *[����]\\)\ \\s *\\([1-9]\\([-0-9, ';/*%#\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)" "What your copyright notice looks like. The second \\( \\) construct must match the years." @@ -95,7 +95,8 @@ When this is `function', only ask when called non-interactively." (re-search-forward (concat "\\(" copyright-regexp "\\)\\([ \t]*\n\\)?.*\\(?:" copyright-names-regexp "\\)") - (+ (point) copyright-limit) t) + (if copyright-limit (+ (point) copyright-limit)) + t) ;; In case the regexp is rejected. This is useful because ;; copyright-update is typically called from before-save-hook where ;; such an error is very inconvenient for the user. @@ -176,10 +177,11 @@ interactively." (and copyright-current-gpl-version ;; match the GPL version comment in .el files, including the ;; bilingual Esperanto one in two-column, and in texinfo.tex - (re-search-forward "\\(the Free Software Foundation;\ + (re-search-forward + "\\(the Free Software Foundation;\ either \\|; a\\^u eldono \\([0-9]+\\)a, ? a\\^u (la\\^u via \\)\ version \\([0-9]+\\), or (at" - (+ (point) copyright-limit) 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 " @@ -201,7 +203,8 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx." (interactive) (widen) (goto-char (point-min)) - (if (re-search-forward copyright-regexp (+ (point) copyright-limit) t) + (if (re-search-forward copyright-regexp + (if copyright-limit (+ (point) copyright-limit)) t) (let ((s (match-beginning 2)) (e (copy-marker (1+ (match-end 2)))) (p (make-marker)) @@ -241,7 +244,7 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx." "Copyright (C) " `(substring (current-time-string) -4) " by " (or (getenv "ORGANIZATION") str) - '(if (> (point) (+ (point-min) copyright-limit)) + '(if (and copyright-limit (> (point) (+ (point-min) copyright-limit))) (message "Copyright extends beyond `copyright-limit' and won't be updated automatically.")) comment-end \n) |