(help-add-fundoc-usage): Use %S only for output of `help-make-usage'.

(help-highlight-arguments): Skip function name before searching for
arguments.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d958cc0457f7532430cb431a8bbaba4521c172e7..43e7b47eb6138f6a3129b6e909c744fee6356436 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-22  Juanma Barranquero  <lektu@terra.es>
+
+       * help-fns.el (help-add-fundoc-usage): Use %S only for output of
+       `help-make-usage'.
+       (help-highlight-arguments): Skip function name before searching
+       for arguments.
+
 2004-05-21  Juanma Barranquero  <lektu@terra.es>
 
        * allout.el (allout-chart-subtree, allout-rebullet-topic-grunt):

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e0692119a218ae49eafd7efddd5c9b58b885d367..e7e09a431bdf4de2c9ce30d60858296bcfd7de35 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -181,14 +181,14 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"."
   (unless (stringp docstring) (setq docstring "Not documented"))
   (if (or (string-match "\n\n(fn\\(\\( .*\\)?)\\)\\'" docstring) (eq arglist t))
       docstring
-    (format "%s%s%S" docstring
+    (concat docstring
            (if (string-match "\n?\n\\'" docstring)
                (if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "")
              "\n\n")
            (if (and (stringp arglist)
                     (string-match "\\`([^ ]+\\(.*\\))\\'" arglist))
                (concat "(fn" (match-string 1 arglist) ")")
-             (help-make-usage 'fn arglist)))))
+             (format "%S" (help-make-usage 'fn arglist))))))
 
 (defun help-function-arglist (def)
   ;; Handle symbols aliased to other symbols.
@@ -275,6 +275,7 @@ else ARG is returned in uppercase normal."
             (next (not (or args (looking-at "\\["))))
             (opt nil))
         ;; Make a list of all arguments
+        (skip-chars-forward "^ ")
         (while next
           (or opt (not (looking-at " &")) (setq opt t))
           (if (not (re-search-forward " \\([\\[(]*\\)\\([^] &)\.]+\\)" nil t))