summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-08-05 12:00:31 +0300
committerEli Zaretskii <eliz@gnu.org>2017-08-05 12:00:31 +0300
commita0aef7cd02154ebf616c894475e6ca72243b9094 (patch)
tree8f1a42687d8e6a0fb446c6f5cc1a7a6b16eaab82 /lisp/term
parent8a577e9468136c7bbcb1627917c4b8c124547f6c (diff)
downloademacs-a0aef7cd02154ebf616c894475e6ca72243b9094.tar.gz
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)
Diffstat (limited to 'lisp/term')
-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.")
(defun ns-suspend-error ()
;; Don't allow suspending if any of the frames are NS frames.
(if (memq 'ns (mapcar 'window-system (frame-list)))
- (error "Cannot suspend Emacs while running under NS")))
+ (error "Cannot suspend Emacs while an NS GUI frame exists")))
;; 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'."
This returns an error if any Emacs frames are X frames."
;; Don't allow suspending if any of the frames are X frames.
(if (memq 'x (mapcar #'window-system (frame-list)))
- (error "Cannot suspend Emacs while running under X")))
+ (error "Cannot suspend Emacs while an X GUI frame exists")))
(defvar x-initialized nil
"Non-nil if the X window system has been initialized.")