* mm-uu.el (mm-uu-verbatim-marks-extract, mm-uu-latex-extract):

Rename x-gnus-verbatim to x-verbatim.
(mm-uu-type-alist): Fix regexp for verbatim-marks.

* mm-decode.el (mm-automatic-display): Rename x-gnus-verbatim to
x-verbatim.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea685fd..567ec9e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2005-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * mm-uu.el (mm-uu-verbatim-marks-extract, mm-uu-latex-extract):
+       Rename x-gnus-verbatim to x-verbatim.
+       (mm-uu-type-alist): Fix regexp for verbatim-marks.
+
+       * mm-decode.el (mm-automatic-display): Rename x-gnus-verbatim to
+       x-verbatim.
+
        * mm-url.el (mm-url-predefined-programs): Add switches for curl.
 
        * gnus-util.el (gnus-remove-duplicates): Remove.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 921c108..ec60b54 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -296,8 +296,7 @@ when selecting a different article."
   :group 'mime-display)
 
 (defcustom mm-automatic-display
-  '("text/plain" "text/enriched" "text/richtext" "text/html"
-    "text/x-gnus-verbatim"
+  '("text/plain" "text/enriched" "text/richtext" "text/html" "text/x-verbatim"
     "text/x-vcard" "image/.*" "message/delivery-status" "multipart/.*"
     "message/rfc822" "text/x-patch" "text/dns" "application/pgp-signature"
     "application/emacs-lisp" "application/x-emacs-lisp"

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index bba9f38..d751f7f 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -167,7 +167,7 @@ This can be either \"inline\" or \"attachment\".")
     (verbatim-marks
      ;; slrn-style verbatim marks, see
      ;; http://www.slrn.org/manual/slrn-manual-6.html#ss6.81
-     "^#v\\+$"
+     "^#v\\+"
      "^#v\\-$"
      mm-uu-verbatim-marks-extract
      nil)
@@ -312,13 +312,13 @@ apply the face `mm-uu-extract'."
     (progn (goto-char start-point) (forward-line) (point))
     (progn (goto-char end-point) (forward-line -1) (point))
     t)
-   '("text/x-gnus-verbatim" (charset . gnus-decoded))))
+   '("text/x-verbatim" (charset . gnus-decoded))))
 
 (defun mm-uu-latex-extract ()
   (mm-make-handle
    (mm-uu-copy-to-buffer start-point end-point t)
    ;; application/x-tex?
-   '("text/x-gnus-verbatim" (charset . gnus-decoded))))
+   '("text/x-verbatim" (charset . gnus-decoded))))
 
 (defun mm-uu-emacs-sources-extract ()
   (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)