emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master a0aef7c: Improve test of error message when Emacs c


From: Eli Zaretskii
Subject: [Emacs-diffs] master a0aef7c: Improve test of error message when Emacs cannot be suspended
Date: Sat, 5 Aug 2017 05:01:20 -0400 (EDT)

branch: master
commit a0aef7cd02154ebf616c894475e6ca72243b9094
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 lisp/term/ns-win.el | 2 +-
 lisp/term/x-win.el  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 4df5f0a..8848360 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 532d039..dd42dda 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.")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]