From: Miles Bader <miles@gnu.org>
Date: Fri, 3 Aug 2007 05:20:51 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~361
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e145a7fe95fb8f97407d125f94653ef95e42696d;p=emacs.git

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 832-838)

   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Update from CVS
   - Restore lisp/emacs-lisp/cl-loaddefs.el
   - Merge from emacs--rel--22

 * 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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
---

e145a7fe95fb8f97407d125f94653ef95e42696d
diff --cc lisp/emacs-lisp/copyright.el
index 0931ba8635c,8543bad2f4e..7538439d76c
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@@ -43,10 -43,12 +43,10 @@@ A value of nil means to search whole bu
    :type '(choice (integer :tag "Limit")
  		 (const :tag "No limit")))
  
 -;; 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)\\)?\
 - "\\([©©]\\|@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]+\\)"
+ \\s *\\([1-9]\\([-0-9, ';/*%#\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)"
    "What your copyright notice looks like.
  The second \\( \\) construct must match the years."
    :group 'copyright
diff --cc lisp/ps-print.el
index 62556b83a24,3526c170e1f..090e598e46c
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@@ -6526,9 -7137,15 +6526,9 @@@ Initialize global data for printing mul
  
  \(fn)" nil nil)
  
 -(autoload (quote ps-mule-encode-header-string) "ps-mule" "\
 -Generate PostScript code for ploting STRING by font FONTTAG.
 -FONTTAG should be a string \"/h0\" or \"/h1\".
 -
 -\(fn STRING FONTTAG)" nil nil)
 -
  (autoload (quote ps-mule-begin-job) "ps-mule" "\
  Start printing job for multi-byte chars between FROM and TO.
- This checks if all multi-byte characters in the region are printable or not.
+ It checks if all multi-byte characters in the region are printable or not.
  
  \(fn FROM TO)" nil nil)