[Emacs-diffs] Changes to emacs/lisp/wid-edit.el

[Luc Teirlinck]

Index: emacs/lisp/wid-edit.el
diff -c emacs/lisp/wid-edit.el:1.144 emacs/lisp/wid-edit.el:1.145
*** emacs/lisp/wid-edit.el:1.144        Sat Aug  6 22:13:43 2005
--- emacs/lisp/wid-edit.el      Sun Aug  7 01:07:33 2005
***************
*** 1956,1968 ****
        (args (widget-get widget :args))
        (explicit (widget-get widget :explicit-choice))
        current)
!     (if (and explicit (equal value (widget-get widget 
:explicit-choice-value)))
        (progn
          ;; If the user specified the choice for this value,
!         ;; respect that choice as long as the value is the same.
          (widget-put widget :children (list (widget-create-child-value
                                              widget explicit value)))
!         (widget-put widget :choice explicit))
        (while args
        (setq current (car args)
              args (cdr args))
--- 1956,1969 ----
        (args (widget-get widget :args))
        (explicit (widget-get widget :explicit-choice))
        current)
!     (if explicit
        (progn
          ;; If the user specified the choice for this value,
!         ;; respect that choice.
          (widget-put widget :children (list (widget-create-child-value
                                              widget explicit value)))
!         (widget-put widget :choice explicit)
!         (widget-put widget :explicit-choice nil))
        (while args
        (setq current (car args)
              args (cdr args))
***************
*** 2048,2060 ****
                 (setq this-explicit t)
                 (widget-choose tag (reverse choices) event))))
      (when current
!       ;; If this was an explicit user choice,
!       ;; record the choice, and the record the value it was made for.
!       ;; widget-choice-value-create will respect this choice,
!       ;; as long as the value is the same.
        (when this-explicit
!       (widget-put widget :explicit-choice current)
!       (widget-put widget :explicit-choice-value (widget-get widget :value)))
        (widget-value-set widget (widget-default-get current))
        (widget-setup)
        (widget-apply widget :notify widget event)))
--- 2049,2058 ----
                 (setq this-explicit t)
                 (widget-choose tag (reverse choices) event))))
      (when current
!       ;; If this was an explicit user choice, record the choice,
!       ;; so that widget-choice-value-create will respect it.
        (when this-explicit
!       (widget-put widget :explicit-choice current))
        (widget-value-set widget (widget-default-get current))
        (widget-setup)
        (widget-apply widget :notify widget event)))