Disallow suspend-emacs under NS

* term/ns-win.el (ns-suspend-error): New function.
(ns-initialize-window-system): Add ns-suspend-error to
suspend-hook.

Fixes: debbugs:16612

2 files changed, 16 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01ea5766445..03d09cc8aaf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * term/ns-win.el (ns-suspend-error): New function.
+        (ns-initialize-window-system): Add ns-suspend-error to
+        suspend-hook (Bug#16612).
+
 2014-02-02  Daniel Colascione  <dancol@dancol.org>
 
         * progmodes/cc-defs.el (c-find-assignment-for-mode): Make loading cc-mode silent.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index ba6519f3c09..d91b594671f 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -863,6 +863,12 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
      (t
       nil))))
 
+(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")))
+
+
 ;; Set some options to be as Nextstep-like as possible.
 (setq frame-title-format t
       icon-title-format t)
@@ -944,6 +950,10 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   (ns-set-resource nil "ApplePressAndHoldEnabled" "NO")
 
   (x-apply-session-resources)
+
+  ;; Don't let Emacs suspend under NS.
+  (add-hook 'suspend-hook 'ns-suspend-error)
+
   (setq ns-initialized t))
 
 ;; Any display name is OK.