Synch to No Gnus 200512091851.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36ab751..06a9326 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * pop3.el (pop3-stream-type): Fix custom version.
+
+       * mm-uu.el (mm-uu-type-alist): Simplify uu regexp.
+
 2005-12-09  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)
 
        * mm-decode.el (mm-display-external): Add lacked cdr.

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index af5a2c8..efdcf53 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -102,13 +102,13 @@ This can be either \"inline\" or \"attachment\".")
      "^%%EOF$"
      mm-uu-postscript-extract
      nil)
-    (uu
+    (uu ;; Maybe we should have a more strict test here.
      "^begin[ \t]+0?[0-7][0-7][0-7][ \t]+"
      "^end[ \t]*$"
      mm-uu-uu-extract
      mm-uu-uu-filename)
     (binhex
-     "^:...............................................................$"
+     "^:.\\{63,63\\}$"
      ":$"
      mm-uu-binhex-extract
      nil

diff --git a/lisp/pop3.el b/lisp/pop3.el
index aad42f8..8a43c47 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -313,7 +313,7 @@ SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
 to turn on TLS security after opening the stream).  However, if
 this is nil, `ssl' is assumed for connexions to port
 995 (pop3s)."
-  :version "23.1"                      ; fixme?
+  :version "23.0" ;; No Gnus
   :group 'pop3
   :type '(choice (const :tag "Plain" nil)
                 (const :tag "SSL/TLS" ssl)