[Emacs-diffs] /srv/bzr/emacs/trunk r111434: wid-edit.el (widget-default-get): Work for inlined elements (Bug#12670)

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 111434
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2013-01-07 11:24:35 +0000
message:
  wid-edit.el (widget-default-get): Work for inlined elements (Bug#12670)
modified:
  lisp/ChangeLog
  lisp/wid-edit.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-07 09:25:34 +0000
+++ b/lisp/ChangeLog    2013-01-07 11:24:35 +0000
@@ -1,3 +1,8 @@
+2013-01-07  Katsumi Yamaoka  <address@hidden>
+
+       * wid-edit.el (widget-default-get): Work for inlined elements.
+       (Bug#12670)
+
 2013-01-07  Michael Albinus  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/wid-edit.el'
--- a/lisp/wid-edit.el  2013-01-01 09:11:05 +0000
+++ b/lisp/wid-edit.el  2013-01-07 11:24:35 +0000
@@ -526,7 +526,16 @@
   "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."