(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83526a50b8f232867030b359e0621650cefa7463..b09604eb0bb38516c0638fa82a916b8ec047b81f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+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)

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 10eb821d4e784a29964cffcce040df06843346ae..7807fc763a408f7a50d97f0f986c5ba6c16fe34e 100644 (file)
--- 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) " "))
+
 \f
 ;; 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