diff lisp/emacs-lisp/eldoc.el @ 91041:bdb3fe0ba9fa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: [e-mail]/emacs--unicode--0--patch-257

--- a/lisp/emacs-lisp/eldoc.el	Thu Oct 11 16:14:00 2007 +0000
+++ b/lisp/emacs-lisp/eldoc.el	Thu Oct 11 16:22:07 2007 +0000
@@ -109,7 +109,7 @@
 ;;; No user options below here.
 
 (defvar eldoc-message-commands-table-size 31
-  "This is used by eldoc-add-command to initialize eldoc-message-commands
+  "This is used by `eldoc-add-command' to initialize `eldoc-message-commands'
 as an obarray.
 It should probably never be necessary to do so, but if you
 choose to increase the number of buckets, you must do so before loading
@@ -121,7 +121,7 @@
   "Commands after which it is appropriate to print in the echo area.
 Eldoc does not try to print function arglists, etc. after just any command,
 because some commands print their own messages in the echo area and these
-functions would instantly overwrite them.  But self-insert-command as well
+functions would instantly overwrite them.  But `self-insert-command' as well
 as most motion commands are good candidates.
 This variable contains an obarray of symbols; do not manipulate it
 directly.  Instead, use `eldoc-add-command' and `eldoc-remove-command'.")
@@ -137,7 +137,7 @@
 (defvar eldoc-timer nil "eldoc's timer object.")
 
 (defvar eldoc-current-idle-delay eldoc-idle-delay
-  "idle time delay currently in use by timer.
+  "Idle time delay currently in use by timer.
 This is used to determine if `eldoc-idle-delay' is changed by the user.")
 
 
@@ -474,13 +474,14 @@
       (format "(%s)" arglist)))
 
 (defun eldoc-function-argstring-format (argstring)
-  "Apply `eldoc-argument-case' to each word in argstring.
+  "Apply `eldoc-argument-case' to each word in ARGSTRING.
 The words \"&rest\", \"&optional\" are returned unchanged."
   (mapconcat (lambda (s)
 	       (if (member s '("&optional" "&rest"))
 		   s
 		 (funcall eldoc-argument-case s)))
-	     (split-string argstring) " "))
+	     (split-string argstring "[][ ()]+" t) " "))
+
 
 ;; When point is in a sexp, the function args are not reprinted in the echo
 ;; area after every possible interactive command because some of them print