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)