wid-edit.el (widget-default-get): Work for inlined elements (Bug#12670)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03b83277010d3f62c26df6aae03058f07ff03a50..4da040d6d5da6995d365063aa2078b1f60107736 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * wid-edit.el (widget-default-get): Work for inlined elements.
+       (Bug#12670)
+
 2013-01-07  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-default-host-alist): New defcustom.
@@ -11,7 +16,7 @@
        (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
        Use `tramp-file-name-host' instead of `tramp-adb-file-name-host'.
 
-       * net/tramp-sh.el : Move eshell integration code to tramp.el.
+       * net/tramp-sh.el: Move eshell integration code to tramp.el.
 
 2013-01-06  Jürgen Hötzel  <juergen@archlinux.org>
 

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 5402b0ec204e574c51e52504ae8b5d793a38fc1f..fb62b039d793e0396c964ce084cf7f0790d86f52 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -526,7 +526,16 @@ Otherwise, just return the value."
   "Extract the default external value of WIDGET."
   (widget-apply widget :value-to-external
                (or (widget-get widget :value)
-                   (widget-apply widget :default-get))))
+                   (progn
+                     (when (widget-get widget :args)
+                       (let (args)
+                         (dolist (arg (widget-get widget :args))
+                           (setq args (append args
+                                              (if (widget-get arg :inline)
+                                                  (widget-get arg :args)
+                                                (list arg)))))
+                         (widget-put widget :args args)))
+                     (widget-apply widget :default-get)))))
 
 (defun widget-match-inline (widget vals)
   "In WIDGET, match the start of VALS."