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

[Juanma Barranquero]

Index: emacs/lisp/wid-edit.el
diff -c emacs/lisp/wid-edit.el:1.113 emacs/lisp/wid-edit.el:1.114
*** emacs/lisp/wid-edit.el:1.113        Thu Oct  3 09:46:24 2002
--- emacs/lisp/wid-edit.el      Thu Oct 17 12:46:28 2002
***************
*** 202,208 ****
    "Choose an item from a list.
  
  First argument TITLE is the name of the list.
! Second argument ITEMS is an list whose members are either
   (NAME . VALUE), to indicate selectable items, or just strings to
   indicate unselectable items.
  Optional third argument EVENT is an input event.
--- 202,208 ----
    "Choose an item from a list.
  
  First argument TITLE is the name of the list.
! Second argument ITEMS is a list whose members are either
   (NAME . VALUE), to indicate selectable items, or just strings to
   indicate unselectable items.
  Optional third argument EVENT is an input event.
***************
*** 301,307 ****
      (nreverse result)))
  
  ;;; Widget text specifications.
! ;; 
  ;; These functions are for specifying text properties.
  
  (defvar widget-field-add-space t
--- 301,307 ----
      (nreverse result)))
  
  ;;; Widget text specifications.
! ;;
  ;; These functions are for specifying text properties.
  
  (defvar widget-field-add-space t
***************
*** 333,339 ****
        (rear-sticky
         (or (not widget-field-add-space) (widget-get widget :size))))
      (if (functionp help-echo)
!       (setq help-echo 'widget-mouse-help))    
      (when (= (char-before to) ?\n)
        ;; When the last character in the field is a newline, we want to
        ;; give it a `field' char-property of `boundary', which helps the
--- 333,339 ----
        (rear-sticky
         (or (not widget-field-add-space) (widget-get widget :size))))
      (if (functionp help-echo)
!       (setq help-echo 'widget-mouse-help))
      (when (= (char-before to) ?\n)
        ;; When the last character in the field is a newline, we want to
        ;; give it a `field' char-property of `boundary', which helps the
***************
*** 509,515 ****
  
  (defun widget-default-get (widget)
    "Extract the default external value of WIDGET."
!   (widget-apply widget :value-to-external 
                (or (widget-get widget :value)
                    (widget-apply widget :default-get))))
  
--- 509,515 ----
  
  (defun widget-default-get (widget)
    "Extract the default external value of WIDGET."
!   (widget-apply widget :value-to-external
                (or (widget-get widget :value)
                    (widget-apply widget :default-get))))
  
***************
*** 892,898 ****
    (if (widget-event-point event)
        (let* ((pos (widget-event-point event))
             (start (event-start event))
!            (button (get-char-property 
                      pos 'button (and (windowp (posn-window start))
                                       (window-buffer (posn-window start))))))
        (if button
--- 892,898 ----
    (if (widget-event-point event)
        (let* ((pos (widget-event-point event))
             (start (event-start event))
!            (button (get-char-property
                      pos 'button (and (windowp (posn-window start))
                                       (window-buffer (posn-window start))))))
        (if button
***************
*** 1315,1322 ****
    :indent nil
    :offset 0
    :format-handler 'widget-default-format-handler
!   :button-face-get 'widget-default-button-face-get 
!   :sample-face-get 'widget-default-sample-face-get 
    :delete 'widget-default-delete
    :copy 'identity
    :value-set 'widget-default-value-set
--- 1315,1322 ----
    :indent nil
    :offset 0
    :format-handler 'widget-default-format-handler
!   :button-face-get 'widget-default-button-face-get
!   :sample-face-get 'widget-default-sample-face-get
    :delete 'widget-default-delete
    :copy 'identity
    :value-set 'widget-default-value-set
***************
*** 1532,1538 ****
    (or (widget-get widget :always-active)
        (and (not (widget-get widget :inactive))
           (let ((parent (widget-get widget :parent)))
!            (or (null parent) 
                 (widget-apply parent :active))))))
  
  (defun widget-default-deactivate (widget)
--- 1532,1538 ----
    (or (widget-get widget :always-active)
        (and (not (widget-get widget :inactive))
           (let ((parent (widget-get widget :parent)))
!            (or (null parent)
                 (widget-apply parent :active))))))
  
  (defun widget-default-deactivate (widget)
***************
*** 1726,1736 ****
    (find-file (locate-library (widget-value widget))))
  
  ;;; The `emacs-commentary-link' Widget.
!     
  (define-widget 'emacs-commentary-link 'link
    "A link to Commentary in an Emacs Lisp library file."
    :action 'widget-emacs-commentary-link-action)
!     
  (defun widget-emacs-commentary-link-action (widget &optional event)
    "Find the Commentary section of the Emacs file specified by WIDGET."
    (finder-commentary (widget-value widget)))
--- 1726,1736 ----
    (find-file (locate-library (widget-value widget))))
  
  ;;; The `emacs-commentary-link' Widget.
! 
  (define-widget 'emacs-commentary-link 'link
    "A link to Commentary in an Emacs Lisp library file."
    :action 'widget-emacs-commentary-link-action)
! 
  (defun widget-emacs-commentary-link-action (widget &optional event)
    "Find the Commentary section of the Emacs file specified by WIDGET."
    (finder-commentary (widget-value widget)))
***************
*** 3057,3063 ****
  
  (defvar widget-coding-system-prompt-value-history nil
    "History of input to `widget-coding-system-prompt-value'.")
!   
  (define-widget 'coding-system 'symbol
    "A MULE coding-system."
    :format "%{%t%}: %v"
--- 3057,3063 ----
  
  (defvar widget-coding-system-prompt-value-history nil
    "History of input to `widget-coding-system-prompt-value'.")
! 
  (define-widget 'coding-system 'symbol
    "A MULE coding-system."
    :format "%{%t%}: %v"
***************
*** 3422,3428 ****
  
  ;;; The `color' Widget.
  
! ;; Fixme: match 
  (define-widget 'color 'editable-field
    "Choose a color name (with sample)."
    :format "%t: %v (%{sample%})\n"
--- 3422,3428 ----
  
  ;;; The `color' Widget.
  
! ;; Fixme: match
  (define-widget 'color 'editable-field
    "Choose a color name (with sample)."
    :format "%t: %v (%{sample%})\n"