diff options
| author | Chong Yidong | 2008-08-28 21:16:05 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-08-28 21:16:05 +0000 |
| commit | 54da3bdf47b0ea777d3aa93b64f37987a69d0840 (patch) | |
| tree | b8e69213ea214e7683b1bbc0bbeb1bd140dd454a | |
| parent | 793fd7146e7f9924e74de52736543c5903b0a68e (diff) | |
| download | emacs-54da3bdf47b0ea777d3aa93b64f37987a69d0840.tar.gz emacs-54da3bdf47b0ea777d3aa93b64f37987a69d0840.zip | |
(x-win-suspend-error): Don't signal error if there are no X frames
active.
| -rw-r--r-- | lisp/term/x-win.el | 4 |
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: | |||
| 1441 | ;;; Window system initialization. | 1441 | ;;; Window system initialization. |
| 1442 | 1442 | ||
| 1443 | (defun x-win-suspend-error () | 1443 | (defun x-win-suspend-error () |
| 1444 | (error "Suspending an Emacs running under X makes no sense")) | 1444 | ;; Don't allow suspending if any of the frames are X frames. |
| 1445 | (if (memq 'x (mapcar 'window-system (frame-list))) | ||
| 1446 | (error "Cannot suspend Emacs while running under X"))) | ||
| 1445 | 1447 | ||
| 1446 | (defvar x-initialized nil | 1448 | (defvar x-initialized nil |
| 1447 | "Non-nil if the X window system has been initialized.") | 1449 | "Non-nil if the X window system has been initialized.") |