(nnmail-lazy): Replace `widget-default-get' with the expanded form for Mule 2.

;; Synch it to Gnus 200312151113.
(nnmail-split-fancy): Make it customizable with Emacs 20 as well.

diff --git a/ChangeLog b/ChangeLog
index 69e94c4..e4f9f59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/nnmail.el (nnmail-lazy): Replace `widget-default-get' with
+       the expanded form for Mule 2.
+
 2003-12-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/dgnushack.el (dgnushack-make-cus-load): Use

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c503938..30018b9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnmail.el (nnmail-split-fancy): Make it customizable with Emacs
+       20 as well.
+
 2003-12-15  Simon Josefsson  <jas@extundo.com>
 
        * sha1-el.el (autoload): Ignore errors for

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 61b678d..e814123 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -381,8 +381,12 @@ 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
+                 ;; (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))))
   :match (lambda (widget value)
            (widget-apply (widget-convert (widget-get widget :type))
                          :match value))
@@ -402,12 +406,13 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                             (const :format "" &)
                             (editable-list :inline t nnmail-split-fancy))
                       (list :tag "Function with fixed arguments (:)"
-                            :value (:)
+                            :value (: nil)
                             (const :format "" :value :)
                             function 
                             (editable-list :inline t (sexp :tag "Arg"))
                             )
-                      (list :tag "Function with split arguments (!)" :value (!)
+                      (list :tag "Function with split arguments (!)"
+                            :value (! nil)
                             (const :format "" !)
                             function
                             (editable-list :inline t nnmail-split-fancy))