Index: wid-edit.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/wid-edit.el,v retrieving revision 1.157 diff -c -r1.157 wid-edit.el *** wid-edit.el 17 Dec 2005 08:52:54 -0000 1.157 --- wid-edit.el 18 Dec 2005 02:45:39 -0000 *************** *** 124,129 **** --- 124,136 ---- :type 'face :group 'widget-faces) + (defface widget-link-face + `((((class color) (background light)) (:foreground "blue" :underline t)) + (((class color) (background dark)) (:foreground "cyan" :underline t))) + "Face used to highlight attributes that are links." + :group 'custom-faces) + + ;; TTY gets special definitions here and in the next defface, because ;; the gray colors defined for other displays cause black text on a black ;; background, at least on light-background TTYs. *************** *** 403,409 **** ;; 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 'pointer 'hand) (overlay-put overlay 'follow-link follow-link) (overlay-put overlay 'help-echo help-echo))) --- 410,417 ---- ;; 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 'mouse-face (widget-apply widget :mouse-face-get))) (overlay-put overlay 'pointer 'hand) (overlay-put overlay 'follow-link follow-link) (overlay-put overlay 'help-echo help-echo))) *************** *** 1391,1396 **** --- 1399,1405 ---- :offset 0 :format-handler 'widget-default-format-handler :button-face-get 'widget-default-button-face-get + :mouse-face-get 'widget-default-mouse-face-get :sample-face-get 'widget-default-sample-face-get :delete 'widget-default-delete :copy 'identity *************** *** 1535,1540 **** --- 1544,1557 ---- (widget-apply parent :button-face-get) widget-button-face)))) + (defun widget-default-mouse-face-get (widget) + ;; Use :mouse-face or widget-mouse-face + (or (widget-get widget :mouse-face) + (let ((parent (widget-get widget :parent))) + (if parent + (widget-apply parent :mouse-face-get) + widget-mouse-face)))) + (defun widget-default-sample-face-get (widget) ;; Use :sample-face. (widget-get widget :sample-face)) *************** *** 2893,2900 **** (widget-create-child-and-convert widget 'visibility :help-echo "Show or hide rest of the documentation." ! :on "Hide Rest" ! :off "More" :always-active t :action 'widget-parent-action shown)) --- 2910,2922 ---- (widget-create-child-and-convert widget 'visibility :help-echo "Show or hide rest of the documentation." ! ;; :on "Hide Rest" ! ;; :off "More" ! :on "<<" ! :off "More..." ! :button-face 'widget-link-face ! :button-prefix "" ! :button-suffix "" :always-active t :action 'widget-parent-action shown))