From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 5 Aug 2017 09:00:31 +0000 (+0300)
Subject: Improve test of error message when Emacs cannot be suspended
X-Git-Tag: emacs-26.0.90~517^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0aef7cd02154ebf616c894475e6ca72243b9094;p=emacs.git

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)
---

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.")