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

[Miles Bader]

Index: emacs/lisp/wid-edit.el
diff -c emacs/lisp/wid-edit.el:1.119.2.2 emacs/lisp/wid-edit.el:1.119.2.3
*** emacs/lisp/wid-edit.el:1.119.2.2    Fri Apr 16 12:50:11 2004
--- emacs/lisp/wid-edit.el      Mon Jun 28 07:28:48 2004
***************
*** 382,391 ****
        (setq help-echo 'widget-mouse-help))
      (overlay-put overlay 'button widget)
      (overlay-put overlay 'keymap (widget-get widget :keymap))
      ;; We want to avoid the face with image buttons.
      (unless (widget-get widget :suppress-face)
!       (overlay-put overlay 'face (widget-apply widget :button-face-get))
!       (overlay-put overlay 'mouse-face widget-mouse-face))
      (overlay-put overlay 'help-echo help-echo)))
  
  (defun widget-mouse-help (window overlay point)
--- 382,392 ----
        (setq help-echo 'widget-mouse-help))
      (overlay-put overlay 'button widget)
      (overlay-put overlay 'keymap (widget-get widget :keymap))
+     (overlay-put overlay 'evaporate t)
      ;; We want to avoid the face with image buttons.
      (unless (widget-get widget :suppress-face)
!       (overlay-put overlay 'face (widget-apply widget :button-face-get)))
!     (overlay-put overlay 'pointer 'hand)
      (overlay-put overlay 'help-echo help-echo)))
  
  (defun widget-mouse-help (window overlay point)
***************
*** 401,406 ****
--- 402,408 ----
    "Specify sample for WIDGET between FROM and TO."
    (let ((overlay (make-overlay from to nil t nil)))
      (overlay-put overlay 'face (widget-apply widget :sample-face-get))
+     (overlay-put overlay 'evaporate t)
      (widget-put widget :sample-overlay overlay)))
  
  (defun widget-specify-doc (widget from to)
***************
*** 408,413 ****
--- 410,416 ----
    (let ((overlay (make-overlay from to nil t nil)))
      (overlay-put overlay 'widget-doc widget)
      (overlay-put overlay 'face widget-documentation-face)
+     (overlay-put overlay 'evaporate t)
      (widget-put widget :doc-overlay overlay)))
  
  (defmacro widget-specify-insert (&rest form)
***************
*** 1286,1293 ****
  The value of the :type attribute should be an unconverted widget type."
    (let ((value (widget-get widget :value))
        (type (widget-get widget :type)))
!     (widget-put widget :children 
!                 (list (widget-create-child-value widget 
                                                   (widget-convert type)
                                                   value)))))
  
--- 1289,1296 ----
  The value of the :type attribute should be an unconverted widget type."
    (let ((value (widget-get widget :value))
        (type (widget-get widget :type)))
!     (widget-put widget :children
!                 (list (widget-create-child-value widget
                                                   (widget-convert type)
                                                   value)))))
  
***************
*** 3343,3350 ****
  nil, or a cons-cell containing a sexp and my-lisp.  This will not work
  because the `choice' widget does not allow recursion.
  
! Using the `lazy' widget you can overcome this problem, as in this 
! example: 
  
    (define-widget 'sexp-list 'lazy
      \"A list of sexps.\"
--- 3346,3353 ----
  nil, or a cons-cell containing a sexp and my-lisp.  This will not work
  because the `choice' widget does not allow recursion.
  
! Using the `lazy' widget you can overcome this problem, as in this
! example:
  
    (define-widget 'sexp-list 'lazy
      \"A list of sexps.\"
***************
*** 3353,3359 ****
    :format "%{%t%}: %v"
    ;; We don't convert :type because we want to allow recursive
    ;; datastructures.  This is slow, so we should not create speed
!   ;; critical widgets by deriving from this. 
    :convert-widget 'widget-value-convert-widget
    :value-create 'widget-type-value-create
    :value-get 'widget-child-value-get
--- 3356,3362 ----
    :format "%{%t%}: %v"
    ;; We don't convert :type because we want to allow recursive
    ;; datastructures.  This is slow, so we should not create speed
!   ;; critical widgets by deriving from this.
    :convert-widget 'widget-value-convert-widget
    :value-create 'widget-type-value-create
    :value-get 'widget-child-value-get