[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/eldoc.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/01/24 11:35:00

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: eldoc.el 

Log message:
        * emacs-lisp/eldoc.el (eldoc-function-argstring-format):
          Revert 2007-09-26 change; use `string-match-p' to check for &keywords.
          (eldoc-get-fnsym-args-string, eldoc-highlight-function-argument):
          Use `string-match-p'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15166&r2=1.15167
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/eldoc.el?cvsroot=emacs&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15166
retrieving revision 1.15167
diff -u -b -r1.15166 -r1.15167
--- ChangeLog   24 Jan 2009 10:39:34 -0000      1.15166
+++ ChangeLog   24 Jan 2009 11:34:57 -0000      1.15167
@@ -1,3 +1,10 @@
+2009-01-24  Juanma Barranquero  <address@hidden>
+
+       * emacs-lisp/eldoc.el (eldoc-function-argstring-format):
+       Revert 2007-09-26 change; use `string-match-p' to check for &keywords.
+       (eldoc-get-fnsym-args-string, eldoc-highlight-function-argument):
+       Use `string-match-p'.
+
 2009-01-24  Ulf Jasper  <address@hidden>
 
        * net/newst-treeview.el (newsticker--treeview-first-feed): New.

Index: emacs-lisp/eldoc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/eldoc.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- emacs-lisp/eldoc.el 17 Jan 2009 20:01:17 -0000      1.56
+++ emacs-lisp/eldoc.el 24 Jan 2009 11:35:00 -0000      1.57
@@ -300,7 +300,7 @@
           ;; Remove any enclosing (), since e-function-argstring adds them.
           (string-match "\\`[^ )]* ?" args)
           (setq args (substring args (match-end 0)))
-          (if (string-match ")\\'" args)
+          (if (string-match-p ")\\'" args)
               (setq args (substring args 0 -1))))
          (t
           (setq args (help-function-arglist sym))))
@@ -338,7 +338,7 @@
                     ;; All the rest arguments are the same.
                     (setq index 1))
                    ((string= argument "&optional"))
-                   ((string-match "\\.\\.\\.$" argument)
+                   ((string-match-p "\\.\\.\\.$" argument)
                     (setq index 0))
                    (t
                     (setq index (1- index))))))
@@ -491,10 +491,10 @@
   "Apply `eldoc-argument-case' to each word in ARGSTRING.
 The words \"&rest\", \"&optional\" are returned unchanged."
   (mapconcat (lambda (s)
-              (if (member s '("&optional" "&rest"))
+              (if (string-match-p "\\`(?&\\(?:optional\\|rest\\))?\\'" s)
                   s
                 (funcall eldoc-argument-case s)))
-            (split-string argstring "[][ ()]+" t) " "))
+            (split-string argstring) " "))
 
 
 ;; When point is in a sexp, the function args are not reprinted in the echo