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

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/01/14 02:29:56

Modified files:
        lisp           : ChangeLog minibuffer.el 

Log message:
        * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
          MESSAGEs with internal square brackets (i.e., " this [test] message").
          Use `string-match-p'.
          (completion--make-envvar-table, completion--file-name-table)
          (completion-pcm--string->pattern, completion-pcm--all-completions)
          (completion-pcm--filename-try-filter): Use `string-match-p'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15099&r2=1.15100
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.68&r2=1.69

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15099
retrieving revision 1.15100
diff -u -b -r1.15099 -r1.15100
--- ChangeLog   14 Jan 2009 00:39:15 -0000      1.15099
+++ ChangeLog   14 Jan 2009 02:29:52 -0000      1.15100
@@ -1,3 +1,12 @@
+2009-01-14  Juanma Barranquero  <address@hidden>
+
+       * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
+       MESSAGEs with internal square brackets (i.e., " this [test] message").
+       Use `string-match-p'.
+       (completion--make-envvar-table, completion--file-name-table)
+       (completion-pcm--string->pattern, completion-pcm--all-completions)
+       (completion-pcm--filename-try-filter): Use `string-match-p'.
+
 2009-01-14  Juri Linkov  <address@hidden>
 
        * progmodes/bug-reference.el (bug-reference-fontify): Check for

Index: minibuffer.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- minibuffer.el       9 Jan 2009 04:44:20 -0000       1.68
+++ minibuffer.el       14 Jan 2009 02:29:56 -0000      1.69
@@ -250,7 +250,7 @@
 If ARGS are provided, then pass MESSAGE through `format'."
   ;; Clear out any old echo-area message to make way for our new thing.
   (message nil)
-  (setq message (if (and (null args) (string-match "\\[.+\\]" message))
+  (setq message (if (and (null args) (string-match-p "\\` *\\[.+\\]\\'" 
message))
                     ;; Make sure we can put-text-property.
                     (copy-sequence message)
                   (concat " [" message "]")))
@@ -949,7 +949,7 @@
 
 (defun completion--make-envvar-table ()
   (mapcar (lambda (enventry)
-            (substring enventry 0 (string-match "=" enventry)))
+            (substring enventry 0 (string-match-p "=" enventry)))
           process-environment))
 
 (defconst completion--embedded-envvar-re
@@ -985,7 +985,7 @@
     ;; FIXME: Actually, this is not always right in the presence of
     ;; envvars, but there's not much we can do, I think.
     (let ((start (length (file-name-directory string)))
-          (end (string-match "/" (cdr action))))
+          (end (string-match-p "/" (cdr action))))
       (list* 'boundaries start end)))
 
    (t
@@ -1359,7 +1359,7 @@
           (p 0)
           (p0 0))
 
-      (while (setq p (string-match completion-pcm--delim-wild-regex string p))
+      (while (setq p (string-match-p completion-pcm--delim-wild-regex string 
p))
         (push (substring string p0 p) pattern)
         (if (eq (aref string p) ?*)
             (progn
@@ -1415,7 +1415,7 @@
          compl
        (let ((poss ()))
          (dolist (c compl)
-           (when (string-match regex c) (push c poss)))
+           (when (string-match-p regex c) (push c poss)))
          poss)))))
 
 (defun completion-pcm--hilit-commonality (pattern completions)
@@ -1614,7 +1614,7 @@
                       (regexp-opt completion-ignored-extensions)
                       "\\)\\'")))
       (dolist (f all)
-        (unless (string-match re f) (push f try)))
+        (unless (string-match-p re f) (push f try)))
       (or try all))))