Re: fancy-splash-screen customize group...

[Lennart Borgman]

Richard M. Stallman wrote:

> Some of your changes are ok with me, but some are not.  You introduced
> a passive sentence; please avoid the passive voice whenever that is
> reasonably feasible.  Here's what I think is best:
>  
I have tried to follow this. I have attached a new patch. From my side I 
believe this is ready. Could someone please help me install the patch if 
it is ok? (I am to new to CVS to try to install it myself now.)

I have tried to write a changelog entry also. Eli was kind enough to 
give me some instructions before on how to do this.

** Please notice ***: Looking at the patch for cus-edit.el there is one 
thing I do not understand. There are some lines that adds (defgroup mac 
...). I believe I already have them in my cus-edit.el. Using 
ediff-revision there is no difference for this part, but there is using 
"cvs diff -c cus-edit.el". Weird. Any suggestions? (It is for the same 
file in the same location ...)
Index: cus-edit.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-edit.el,v
retrieving revision 1.248
diff -c -b -r1.248 cus-edit.el
*** cus-edit.el 16 Dec 2005 03:43:51 -0000      1.248
--- cus-edit.el 19 Dec 2005 15:21:28 -0000
***************
*** 459,464 ****
--- 459,471 ----
    :link '(custom-manual "(emacs)Windows")
    :group 'environment)
  
+ (defgroup mac nil
+   "Mac specific features."
+   :link '(custom-manual "(emacs)Mac OS")
+   :group 'environment
+   :version "22.1"
+   :prefix "mac-")
+ 
  ;;; Utilities.
  
  (defun custom-quote (sexp)
***************
*** 1415,1446 ****
  
  (defun custom-buffer-create-internal (options &optional description)
    (custom-mode)
    (if custom-buffer-verbose-help
!       (progn
        (widget-insert "This is a customization buffer")
        (if description
            (widget-insert description))
!       (widget-insert (format ".
! %s show active fields; type RET or click mouse-1
! on an active field to invoke its action.  Editing an option value
! changes only the text in the buffer.  Invoke the State button to set or
! save the option value.  Saving an option normally edits your init file.
! Invoke "
!                              (if custom-raised-buttons
!                                  "`Raised' buttons"
!                                "Square brackets")))
        (widget-create 'info-link
!                      :tag "Custom file"
                       "(emacs)Saving Customizations")
        (widget-insert
!        " for information on how to save in a different file.
! Invoke ")
        (widget-create 'info-link
!                      :tag "Help"
!                      :help-echo "Read the online help."
                       "(emacs)Easy Customization")
!       (widget-insert " for general information.\n\n")
!       (widget-insert "Operate on everything in this buffer:\n "))
      (widget-insert " "))
    (widget-create 'push-button
                 :tag "Set for Current Session"
--- 1422,1472 ----
  
  (defun custom-buffer-create-internal (options &optional description)
    (custom-mode)
+   (let ((inhibit-read-only t))
      (if custom-buffer-verbose-help
!         (let ((start (point)))
            (widget-insert "This is a customization buffer")
            (if description
                (widget-insert description))
!           (widget-insert ".")
!           (unless custom-raised-buttons
!             (widget-insert "\n\nThis ")
!             (widget-create 'push-button
!                            :tag "Example Button"
!                            :help-echo "This is just an example button"
!                            :action (lambda (widget &optional event)
!                                      (message
!                                       "\nYou clicked the Example Button!\n")))
!             (widget-insert " shows what a button looks like on your display; 
" 
!                            "type RET or click mouse-1 to actuate one.")
!             )
!           (widget-insert "
! 
! Editing a field's value changes only the text in the buffer.  To
! save or set an option, use its State button.  Options are
! normally saved in your Emacs init file.  See ")
            (widget-create 'info-link
!                          :button-face 'widget-link-face
!                          :button-prefix ""
!                          :button-suffix ""
!                          :mouse-face 'highlight
!                          :tag "custom file"
!                          :help-echo "Read the online help for Saving 
Customizations."
                           "(emacs)Saving Customizations")
            (widget-insert
!            " for how to save in a different file and ")
!         
            (widget-create 'info-link
!                          :button-face 'widget-link-face
!                          :button-prefix ""
!                          :button-suffix ""
!                          :mouse-face 'highlight
!                          :tag "help"
!                          :help-echo "Read the online help for Easy 
Customization Interface."
                           "(emacs)Easy Customization")
!           (widget-insert " for more information.\n\n")
!           (fill-region start (point))
!           (widget-insert "Operate on all options in this buffer:\n "))
        (widget-insert " "))
      (widget-create 'push-button
                     :tag "Set for Current Session"
***************
*** 1452,1459 ****
    (widget-create 'push-button
                 :tag "Save for Future Sessions"
                 :help-echo "\
! Make your editing in this buffer take effect for future Emacs sessions.
! This updates your Emacs initialization file or creates a new one."
                 :action (lambda (widget &optional event)
                           (Custom-save)))
    (if custom-reset-button-menu
--- 1478,1485 ----
      (widget-create 'push-button
                     :tag "Save for Future Sessions"
                     :help-echo "\
! Make your editing in this buffer take effect for future Emacs sessions."
!                    ;;This updates your Emacs initialization file or creates a 
new one."
                     :action (lambda (widget &optional event)
                               (Custom-save)))
      (if custom-reset-button-menu
***************
*** 1538,1544 ****
    (widget-setup)
    (buffer-enable-undo)
    (goto-char (point-min))
!   (message "Creating customization setup...done"))
  
  ;;; The Tree Browser.
  
--- 1564,1570 ----
      (widget-setup)
      (buffer-enable-undo)
      (goto-char (point-min))
!     (message "Creating customization setup...done")))
  
  ;;; The Tree Browser.
  
***************
*** 2150,2155 ****
--- 2176,2185 ----
                  (insert " ")
                  (push (widget-create-child-and-convert
                         widget 'custom-group-link
+                          :button-face 'widget-link-face
+                          :button-prefix ""
+                          :button-suffix ""
+                          :mouse-face 'highlight
                         :tag (custom-unlispify-tag-name symbol)
                         symbol)
                        buttons)
***************
*** 2165,2171 ****
             (when links
               (insert "\nParent documentation: ")
               (while links
!                (push (widget-create-child-and-convert widget (car links))
                       buttons)
                 (setq links (cdr links))
                 (cond ((null links)
--- 2195,2207 ----
             (when links
               (insert "\nParent documentation: ")
               (while links
!                (push (widget-create-child-and-convert
!                       widget (car links)
!                       :button-face 'widget-link-face
!                       :button-prefix ""
!                       :button-suffix ""
!                       :mouse-face 'highlight
!                       )
                       buttons)
                 (setq links (cdr links))
                 (cond ((null links)

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))

2005-12-15  Lennart Borgman  <address@hidden>

        * cus-edit.el (custom-buffer-create-internal): Rewording of
        header. Underlined links.
        (custom-add-parent-links): Underlined links.

        * wid-edit.el (widget-links-face): New face.
        (widget-specify-button): Use :mouse-face-get.
        (widget-default): Added :mouse-face-get.
        (widget-default-mouse-face-get): New function.
        (widget-documentation-string-value-create): Underlined face and
        new labels for Hide Rest and More.