1 files changed, 2 insertions, 0 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index 326677339ae..b6fcf8ab7fe 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -414,6 +414,8 @@ These supersede the values given in `default-frame-alist'."
   "Make a frame on display DISPLAY.
 The optional second argument PARAMETERS specifies additional frame parameters."
   (interactive "sMake frame on display: ")
+  (or (string-match "\\`[^:]+:[0-9]+\\(:[0-9]+\\)?\\'" display)
+      (error "Invalid display, not HOST:SERVER or HOST:SERVER:SCREEN"))
   (make-frame (cons (cons 'display display) parameters)))
 
 (defun make-frame-command ()