summaryrefslogtreecommitdiff
path: root/lisp/term/x-win.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2008-08-28 21:16:05 +0000
committerChong Yidong <cyd@stupidchicken.com>2008-08-28 21:16:05 +0000
commit54da3bdf47b0ea777d3aa93b64f37987a69d0840 (patch)
treeb8e69213ea214e7683b1bbc0bbeb1bd140dd454a /lisp/term/x-win.el
parent793fd7146e7f9924e74de52736543c5903b0a68e (diff)
downloademacs-54da3bdf47b0ea777d3aa93b64f37987a69d0840.tar.gz
(x-win-suspend-error): Don't signal error if there are no X frames
active.
Diffstat (limited to 'lisp/term/x-win.el')
-rw-r--r--lisp/term/x-win.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index a8813aeb917..2770fad84e6 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1441,7 +1441,9 @@ The value nil is the same as this list:
;;; Window system initialization.
(defun x-win-suspend-error ()
- (error "Suspending an Emacs running under X makes no sense"))
+ ;; 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")))
(defvar x-initialized nil
"Non-nil if the X window system has been initialized.")