diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2013-01-07 11:24:35 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2013-01-07 11:24:35 +0000 |
| commit | 3bee311e97e8512ee209853792cc8f4fd5bd0fd5 (patch) | |
| tree | cc0c7a2c9417f113de946b8b47e4e75ea3a08a61 | |
| parent | b49eebcc079d00ea9f428a786e57988195f154a6 (diff) | |
| download | emacs-3bee311e97e8512ee209853792cc8f4fd5bd0fd5.tar.gz | |
wid-edit.el (widget-default-get): Work for inlined elements (Bug#12670)
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/wid-edit.el | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03b83277010..4da040d6d5d 100644 --- 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 5402b0ec204..fb62b039d79 100644 --- 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." |