aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2017-08-05 12:00:31 +0300
committerEli Zaretskii2017-08-05 12:00:31 +0300
commita0aef7cd02154ebf616c894475e6ca72243b9094 (patch)
tree8f1a42687d8e6a0fb446c6f5cc1a7a6b16eaab82
parent8a577e9468136c7bbcb1627917c4b8c124547f6c (diff)
downloademacs-a0aef7cd02154ebf616c894475e6ca72243b9094.tar.gz
emacs-a0aef7cd02154ebf616c894475e6ca72243b9094.zip
Improve test of error message when Emacs cannot be suspended
* lisp/term/x-win.el (x-win-suspend-error): * lisp/term/ns-win.el (ns-suspend-error): Improve the error message. (Bug#27901)
-rw-r--r--lisp/term/ns-win.el2
-rw-r--r--lisp/term/x-win.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 4df5f0abe21..88483606550 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -774,7 +774,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
774(defun ns-suspend-error () 774(defun ns-suspend-error ()
775 ;; Don't allow suspending if any of the frames are NS frames. 775 ;; Don't allow suspending if any of the frames are NS frames.
776 (if (memq 'ns (mapcar 'window-system (frame-list))) 776 (if (memq 'ns (mapcar 'window-system (frame-list)))
777 (error "Cannot suspend Emacs while running under NS"))) 777 (error "Cannot suspend Emacs while an NS GUI frame exists")))
778 778
779 779
780;; Set some options to be as Nextstep-like as possible. 780;; Set some options to be as Nextstep-like as possible.
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 532d0395cf4..dd42dda106f 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1182,7 +1182,7 @@ as returned by `x-server-vendor'."
1182This returns an error if any Emacs frames are X frames." 1182This returns an error if any Emacs frames are X frames."
1183 ;; Don't allow suspending if any of the frames are X frames. 1183 ;; Don't allow suspending if any of the frames are X frames.
1184 (if (memq 'x (mapcar #'window-system (frame-list))) 1184 (if (memq 'x (mapcar #'window-system (frame-list)))
1185 (error "Cannot suspend Emacs while running under X"))) 1185 (error "Cannot suspend Emacs while an X GUI frame exists")))
1186 1186
1187(defvar x-initialized nil 1187(defvar x-initialized nil
1188 "Non-nil if the X window system has been initialized.") 1188 "Non-nil if the X window system has been initialized.")