diff options
| -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 @@ | |||
| 1 | 2013-01-07 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 2 | |||
| 3 | * wid-edit.el (widget-default-get): Work for inlined elements. | ||
| 4 | (Bug#12670) | ||
| 5 | |||
| 1 | 2013-01-07 Michael Albinus <michael.albinus@gmx.de> | 6 | 2013-01-07 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * net/tramp.el (tramp-default-host-alist): New defcustom. | 8 | * net/tramp.el (tramp-default-host-alist): New defcustom. |
| @@ -11,7 +16,7 @@ | |||
| 11 | (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection): | 16 | (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection): |
| 12 | Use `tramp-file-name-host' instead of `tramp-adb-file-name-host'. | 17 | Use `tramp-file-name-host' instead of `tramp-adb-file-name-host'. |
| 13 | 18 | ||
| 14 | * net/tramp-sh.el : Move eshell integration code to tramp.el. | 19 | * net/tramp-sh.el: Move eshell integration code to tramp.el. |
| 15 | 20 | ||
| 16 | 2013-01-06 Jürgen Hötzel <juergen@archlinux.org> | 21 | 2013-01-06 Jürgen Hötzel <juergen@archlinux.org> |
| 17 | 22 | ||
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." | |||
| 526 | "Extract the default external value of WIDGET." | 526 | "Extract the default external value of WIDGET." |
| 527 | (widget-apply widget :value-to-external | 527 | (widget-apply widget :value-to-external |
| 528 | (or (widget-get widget :value) | 528 | (or (widget-get widget :value) |
| 529 | (widget-apply widget :default-get)))) | 529 | (progn |
| 530 | (when (widget-get widget :args) | ||
| 531 | (let (args) | ||
| 532 | (dolist (arg (widget-get widget :args)) | ||
| 533 | (setq args (append args | ||
| 534 | (if (widget-get arg :inline) | ||
| 535 | (widget-get arg :args) | ||
| 536 | (list arg))))) | ||
| 537 | (widget-put widget :args args))) | ||
| 538 | (widget-apply widget :default-get))))) | ||
| 530 | 539 | ||
| 531 | (defun widget-match-inline (widget vals) | 540 | (defun widget-match-inline (widget vals) |
| 532 | "In WIDGET, match the start of VALS." | 541 | "In WIDGET, match the start of VALS." |