--- a/lisp/ChangeLog	Sun Aug 06 21:51:02 2006 +0000
+++ b/lisp/ChangeLog	Sun Aug 06 22:14:10 2006 +0000
@@ -1,3 +1,15 @@
+2006-08-07  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* frame.el (suspend-or-iconify-emacs):
+	* frame.el (suspend-emacs-or-iconify-frame):
+	Elaborate on what the functions do, hopefully preventing
+	misunderstandings in the future. 
+	
+	* keydefs.el (global-tty-map):
+	"\C-z" is suspend-or-iconify-emacs on the TTY, not
+	suspend-emacs.  Fixes problems that arose where pressing C-z in a
+	gnuclient fram suspended the whole process. 
+	
 2006-08-05  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* lisp.el (forward-sexp):

--- a/lisp/frame.el	Sun Aug 06 21:51:02 2006 +0000
+++ b/lisp/frame.el	Sun Aug 06 22:14:10 2006 +0000
@@ -1548,7 +1548,12 @@
     (setq iconification-data (cdr iconification-data))))
 
 (defun suspend-or-iconify-emacs ()
-  "Call iconify-emacs if using a window system, otherwise suspend Emacs."
+  "Call iconify-emacs if using a window system, otherwise suspend.
+
+`suspend' here can mean different things; if the current TTY console was
+created by gnuclient, that console is suspended, and the related devices and
+frames are removed from the display.  Otherwise the Emacs process as a whole
+is suspended--that is, the traditional Unix suspend takes place.  "
   (interactive)
   (cond ((device-on-window-system-p)
 	 (iconify-emacs))
@@ -1564,7 +1569,12 @@
 ;; different things depending on window-system.  We can't do the same,
 ;; because we allow simultaneous X and TTY consoles.
 (defun suspend-emacs-or-iconify-frame ()
-  "Iconify the selected frame if using a window system, otherwise suspend Emacs."
+  "Iconify the selected frame if using a window system, otherwise suspend.
+
+`suspend' here can mean different things; if the current TTY console was
+created by gnuclient, the console is suspended, and the related devices and
+frames are removed from the display.  Otherwise the Emacs process as a whole
+is suspended--that is, the traditional Unix suspend takes place.  "
   (interactive)
   (cond ((device-on-window-system-p)
 	 (iconify-frame))

--- a/lisp/keydefs.el	Sun Aug 06 21:51:02 2006 +0000
+++ b/lisp/keydefs.el	Sun Aug 06 22:14:10 2006 +0000
@@ -183,7 +183,7 @@
 
 ;; FSFmacs keyboard.c
 
-(define-key global-tty-map "\C-z" 'suspend-emacs)
+(define-key global-tty-map "\C-z" 'suspend-or-iconify-emacs)
 (define-key global-window-system-map "\C-z" 'zap-up-to-char)
 (define-key global-window-system-map '(control Z) 'iconify-frame)
 (define-key global-map "\C-x\C-z" 'suspend-or-iconify-emacs)