(custom-buffer-create-internal): Use a help-echo function to be more

specific.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28ca33a91360e473a2dc42baf6e4cceea30fcca7..32a049e182f4d84983db77427bd367901e05ea70 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-16  Dave Love  <fx@gnu.org>
+
+       * cus-edit.el (custom-buffer-create-internal): Use a help-echo
+       function to be more specific.
+
+       * wid-edit.el (widget-specify-field, widget-specify-button): Allow
+       non-string help-echo.
+       (widget-types-convert-widget): Defsubst it.
+       (widget-echo-help): Try to cope with a help-echo function of two
+       possible sorts.
+
 2000-07-15  Jason Rumney  <jasonr@gnu.org>
 
        * w32-fns.el (w32-enable-italics, w32-charset-to-codepage-alist):

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index c05c0d05666d30ee6f50fe682f434068a1ca88e3..0c5588ac8f4aea23704ea7d105e37244f32fcb02 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1295,7 +1295,16 @@ Un-customize all values in this buffer.  They get their standard settings."
   (widget-insert "   ")
   (widget-create 'push-button
                 :tag "Finish"
-                :help-echo "Bury or kill the buffer."
+                :help-echo
+                (lambda (&rest ignore)
+                  (concat (cond
+                           ((eq custom-buffer-done-function
+                                'custom-bury-buffer)
+                            "Bury")
+                           ((eq custom-buffer-done-function 'kill-buffer)
+                            "Kill")
+                           (t "Finish with"))              
+                          " the buffer."))
                 :action #'Custom-buffer-done)
   (widget-insert "\n\n")
   (message "Creating customization items...")