Synch to No Gnus 200512141312.

[elisp/gnus.git-] / lisp / mm-uu.el

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index e0bcaf2..bff144a 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -97,18 +97,18 @@ This can be either \"inline\" or \"attachment\".")
   :group 'gnus-article-mime)
 
 (defvar mm-uu-type-alist
-  `((postscript
+  '((postscript
      "^%!PS-"
      "^%%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
@@ -165,8 +165,11 @@ This can be either \"inline\" or \"attachment\".")
      nil
      mm-uu-diff-test)
     (message-marks
-     ,(concat "^" (regexp-quote message-mark-insert-begin))
-     ,(concat "^" (regexp-quote message-mark-insert-end))
+     ;; Text enclosed with tags similar to `message-mark-insert-begin' and
+     ;; `message-mark-insert-end'.  Don't use those variables to avoid
+     ;; dependency on `message.el'.
+     "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$"
+     "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$"
      (lambda () (mm-uu-verbatim-marks-extract 0 -1 1 -2))
      nil)
     ;; Omitting [a-z8<] leads to false positives (bogus signature separators
@@ -234,8 +237,8 @@ To disable dissecting shar codes, for instance, add
 (defcustom mm-uu-hide-markers
   (< 16 (or (and (fboundp 'defined-colors)
                 (length (defined-colors)))
-           (and (fboundp (device-color-cells))
-                (length (device-color-cells)))
+           (and (fboundp 'device-color-cells)
+                (device-color-cells))
            0))
   "If non-nil, hide verbatim markers.
 The value should be nil on displays where the face