(copyright-regexp): Remove redundancy.

2 files changed, 13 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f69d54d956c..5d7365f2940 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-30  Dave Love  <fx@gnu.org>
+
+        * emacs-lisp/copyright.el (copyright-regexp): Remove redundancy.
+
 2002-07-26  Kenichi Handa  <handa@etl.go.jp>
 
         * international/characters.el: Setup char-script-table.
@@ -139,7 +143,7 @@
 2002-06-15  Dave Love  <fx@gnu.org>
 
         * language/cyrillic.el ("Belarusian"): Doc fix.
-        (Cp1125, koi8-t): Doc fix.
+        (cp1125, koi8-t): Doc fix.
 
         * international/mule-cmds.el (find-multibyte-characters): Doc fix.
         (find-multibyte-characters): Don't test for charset `unknown'.
@@ -381,8 +385,8 @@
 
         * international/mule-diag.el (print-coding-system): Incomplete
         updates.
-        (Describe-character-set): List more properties.
-        (Print-fontset): Fix case of vector font-spec.
+        (describe-character-set): List more properties.
+        (print-fontset): Fix case of vector font-spec.
         (describe-current-coding-system): Fix iso-7, iso-7-else.
 
         * international/mule-conf.el (ibm866): Fix alias.
@@ -430,7 +434,7 @@
 
 2002-05-22  Dave Love  <fx@gnu.org>
 
-        * international/mule-conf.el (code-pages): Provide for
+        * international/mule-conf.el (code-pages): Provide, for
         compatibility.
 
         * international/code-pages.el: Removed.
@@ -450,8 +454,8 @@
 
 2002-05-21  Kenichi Handa  <handa@etl.go.jp>
 
-        * international/mule-conf.el (vietnamese-viscii-lower,
-        vietnamese-viscii-upper): Supply them :code-offset, then unify by
+        * international/mule-conf.el (vietnamese-viscii-lower)
+        (vietnamese-viscii-upper): Supply them :code-offset, then unify by
         mapping table.
 
 2002-05-20  Dave Love  <fx@gnu.org>
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index abed05cf902..9411c8be8ec 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -43,11 +43,9 @@ A value of nil means to search whole buffer."
 ;; Would it be cleaner to specify Latin-1 coding for this file,
 ;; and not use both unibyte and multibyte copyright symbol characters?
 
-;; The character classes include the unibyte (C) sign,
-;; the Latin-1 version, and the Latin-9 version.
 (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."
@@ -167,7 +165,7 @@ version \\([0-9]+\\), or (at"
 
 ;; For the copyright sign:
 ;; Local Variables:
-;; coding: emacs-mule
+;; coding: utf-8
 ;; End:
 
 ;;; copyright.el ends here