* frame.el (make-frame-on-display): Use `string-match-p'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ae59c620a189819acb78b8c780bc24f96835742..9508ebe96e0c1c5dfcabb9fc3e3c1fde7e568c1f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-07  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frame.el (make-frame-on-display): Use `string-match-p'.
+
 2008-11-07  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/cc-defs.el (cl-macroexpand-all): Fix declaration.

diff --git a/lisp/frame.el b/lisp/frame.el
index ddd4aea88b998a63d1ce2b59e867aa3c3bcbeabf..316ab36cae7aba0673780e76af1cd53f79881451 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -620,7 +620,7 @@ The optional argument PARAMETERS specifies additional frame parameters."
         ;; On Windows, ignore DISPLAY.
         (make-frame parameters))
        (t
-        (unless (string-match "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'" display)
+        (unless (string-match-p "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'" display)
           (error "Invalid display, not HOST:SERVER or HOST:SERVER.SCREEN"))
         (when (and (boundp 'x-initialized) (not x-initialized))
           (setq x-display-name display)