(eldoc-function-argstring-format): Deal with the case that special

&keywords are at the beginning or end of the argument list.
Also add some (incomplete) support for non-standard arglists.

2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83526a50b8f..b09604eb0bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2007-09-26  Juanma Barranquero  <lekktu@gmail.com>
 
+        * emacs-lisp/eldoc.el (eldoc-function-argstring-format):
+        Deal with the case that special &keywords are at the beginning or
+        end of the argument list.  Also add some (incomplete) support for
+        non-standard arglists.
+
+2007-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
         * emacs-lisp/eldoc.el (eldoc-message-commands-table-size)
         (eldoc-message-commands, eldoc-current-idle-delay)
         (eldoc-function-argstring-format): Fix typos in docstrings.
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 10eb821d4e7..7807fc763a4 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -480,7 +480,8 @@ The words \"&rest\", \"&optional\" are returned unchanged."
                (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