(help-arg-highlighting-function, help-argument-name): Delete.

(help-default-arg-highlight): New function.
(help-do-arg-highlighting): Use it.

2 files changed, 16 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74c6984c682..a03b43cfad6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-13  Juanma Barranquero  <lektu@terra.es>
+
+        * help-fns.el (help-arg-highlighting-function)
+        (help-argument-name): Delete.
+        (help-default-arg-highlight): New function.
+        (help-do-arg-highlighting): Use it.
+
 2004-05-13  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * calendar/appt.el (appt-disp-window): Use
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e006a7f4714..e0692119a21 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -237,16 +237,14 @@ KIND should be `var' for a variable or `subr' for a subroutine."
             (concat "src/" file)
           file)))))
 
-(defface help-argument-name '((t (:slant italic)))
-  "Face to highlight function arguments in *Help* buffers.
-You can customize this face.  For more extensive customization,
-see variable `help-arg-highlighting-function'.")
-
-(defvar help-arg-highlighting-function
-  #'(lambda (arg) (propertize (downcase arg) 'face 'help-argument-name))
-  "Function to call to highlight function arguments in *Help* buffers.
-The function receives the argument to highlight, as a string.
-It must return the string with the desired highlighting (properties).")
+(defun help-default-arg-highlight (arg)
+  "Default function to highlight arguments in *Help* buffers.
+It returns ARG in lowercase italics, if the display supports it;
+else ARG is returned in uppercase normal."
+  (let ((attrs '(:slant italic)))
+    (if (display-supports-face-attributes-p attrs)
+        (propertize (downcase arg) 'face attrs)
+      arg)))
 
 (defun help-do-arg-highlight (doc args)
   (with-syntax-table (make-syntax-table emacs-lisp-mode-syntax-table)
@@ -264,7 +262,7 @@ It must return the string with the desired highlighting (properties).")
                            "\\(?:es\\|s\\|th\\)?"  ; for ARGth, ARGs
                            "\\(?:-[a-z-]+\\)?"     ; for ARG-xxx
                            "\\>")                  ; end of word
-                   (funcall help-arg-highlighting-function arg)
+                   (help-default-arg-highlight arg)
                    doc t t 1))))
     doc))