# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1085191015 0
# Node ID 813de71608a62fa1c52ec5394ead7e76ad90a10f
# Parent  623ab06bb37b6b1c72adece81098a742d14ff9e9
(help-add-fundoc-usage): Use %S only for output of `help-make-usage'.
(help-highlight-arguments): Skip function name before searching for
arguments.

diff -r 623ab06bb37b -r 813de71608a6 lisp/help-fns.el
--- a/lisp/help-fns.el	Sat May 22 01:52:56 2004 +0000
+++ b/lisp/help-fns.el	Sat May 22 01:56:55 2004 +0000
@@ -181,14 +181,14 @@
   (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 @@
             (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))