From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 28 Aug 2008 21:16:05 +0000 (+0000)
Subject: (x-win-suspend-error): Don't signal error if there are no X frames
X-Git-Tag: emacs-pretest-23.0.90~3194
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54da3bdf47b0ea777d3aa93b64f37987a69d0840;p=emacs.git

(x-win-suspend-error): Don't signal error if there are no X frames
active.
---

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