Synch to No Gnus 200405270734.

[elisp/gnus.git-] / lisp / nnmail.el

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 03cdc17..1949e6e 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -31,7 +31,6 @@
 (require 'gnus)                                ; for macro gnus-kill-buffer, at least
 (require 'nnheader)
 (require 'message)
-(require 'custom)
 (require 'gnus-util)
 (require 'mail-source)
 
@@ -381,12 +380,8 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                   (widget-apply (car (widget-get widget :children))
                                 :value-inline))
   :default-get (lambda (widget)
-                 ;;(widget-default-get
-                 ;; (widget-convert (widget-get widget :type))))
-                ;; `widget-default-get' isn't available in Mule 2.
-                (let ((w (widget-convert (widget-get widget :type))))
-                  (or (widget-get w :value)
-                      (widget-apply w :default-get))))
+                 (widget-default-get
+                  (widget-convert (widget-get widget :type))))
   :match (lambda (widget value)
            (widget-apply (widget-convert (widget-get widget :type))
                          :match value))
@@ -470,7 +465,7 @@ FIELD must match a complete field name.  VALUE must match a complete
 word according to the `nnmail-split-fancy-syntax-table' syntax table.
 You can use \".*\" in the regexps to match partial field names or words.
 
-FIELD and VALUE can also be lisp symbols, in that case they are expanded
+FIELD and VALUE can also be Lisp symbols, in that case they are expanded
 as specified in `nnmail-split-abbrev-alist'.
 
 GROUP can contain \\& and \\N which will substitute from matching
@@ -1310,12 +1305,8 @@ to actually put the message in the right group."
 (defun nnmail-split-fancy ()
   "Fancy splitting method.
 See the documentation for the variable `nnmail-split-fancy' for details."
-  (let ((syntab (syntax-table)))
-    (unwind-protect
-       (progn
-         (set-syntax-table nnmail-split-fancy-syntax-table)
-         (nnmail-split-it nnmail-split-fancy))
-      (set-syntax-table syntab))))
+  (with-syntax-table nnmail-split-fancy-syntax-table
+    (nnmail-split-it nnmail-split-fancy)))
 
 (defvar nnmail-split-cache nil)
 ;; Alist of split expressions their equivalent regexps.