summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2008-11-07 14:52:02 +0000
committerJuanma Barranquero <lekktu@gmail.com>2008-11-07 14:52:02 +0000
commit69135f12970865d9d78dd4054f06afbce40c56c0 (patch)
treea14f2decae8bdeba3fe67fce7bd6534fb04243bf /lisp
parente589455f844c3eac609749f4a7bc014f140d09b4 (diff)
downloademacs-69135f12970865d9d78dd4054f06afbce40c56c0.tar.gz
* frame.el (make-frame-on-display): Use `string-match-p'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ae59c620a1..9508ebe96e0 100644
--- 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 ddd4aea88b9..316ab36cae7 100644
--- 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)