diff options
| author | Gerd Moellmann | 2000-01-14 22:42:11 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-01-14 22:42:11 +0000 |
| commit | b3303df7ab109ec17cc54164f093a42cbd76f529 (patch) | |
| tree | 578b2d7ca97136dc47aed3abba001ca33bc44a98 | |
| parent | 99453a38a6ec17b5a77cada52498ecf7e3d25c3a (diff) | |
| download | emacs-b3303df7ab109ec17cc54164f093a42cbd76f529.tar.gz emacs-b3303df7ab109ec17cc54164f093a42cbd76f529.zip | |
(copyright-update): Removed the
requirement for a trailing space from `copyright-regexp', to
support copyrights with owner specified on a separate line..
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/copyright.el | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9cceccc3d2..bc3ee6007fd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2000-01-14 Gerd Moellmann <gerd@gnu.org> | 1 | 2000-01-14 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * emacs-lisp/copyright.el (copyright-update): Removed the | ||
| 4 | requirement for a trailing space from `copyright-regexp', to | ||
| 5 | support copyrights with owner specified on a separate line.. | ||
| 6 | |||
| 3 | * align.el: New file. | 7 | * align.el: New file. |
| 4 | 8 | ||
| 5 | * menu-bar.el (menu-bar-tools-menu): Add EUDC submenu. | 9 | * menu-bar.el (menu-bar-tools-menu): Add EUDC submenu. |
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index c4fd29cc64c..8499b815df1 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | (defcustom copyright-regexp | 45 | (defcustom copyright-regexp |
| 46 | "\\([\251]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *(C)\ | 46 | "\\([\251]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *(C)\ |
| 47 | \\|[Cc]opyright\\s *:?\\s *[\251]\\)\ | 47 | \\|[Cc]opyright\\s *:?\\s *[\251]\\)\ |
| 48 | \\s *\\([1-9][-0-9, ']*[0-9]+\\) " | 48 | \\s *\\([1-9][-0-9, ']*[0-9]+\\)" |
| 49 | "*What your copyright notice looks like. | 49 | "*What your copyright notice looks like. |
| 50 | The second \\( \\) construct must match the years." | 50 | The second \\( \\) construct must match the years." |
| 51 | :group 'copyright | 51 | :group 'copyright |
| @@ -88,7 +88,6 @@ copyright, if any, are updated as well." | |||
| 88 | (if (string= (buffer-substring (- (match-end 2) 2) (match-end 2)) | 88 | (if (string= (buffer-substring (- (match-end 2) 2) (match-end 2)) |
| 89 | (substring copyright-current-year -2)) | 89 | (substring copyright-current-year -2)) |
| 90 | () | 90 | () |
| 91 | (backward-char 1) | ||
| 92 | (if (or (not copyright-query) | 91 | (if (or (not copyright-query) |
| 93 | (and (eq copyright-query 'function) | 92 | (and (eq copyright-query 'function) |
| 94 | (eq this-command 'copyright-update)) | 93 | (eq this-command 'copyright-update)) |