User: aidan
Date: 06/08/07 00:14:14
Modified: xemacs/lisp ChangeLog frame.el keydefs.el
Log:
gnuclient bug on Ben's part.
Revision Changes Path
1.757 +12 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -p -r1.756 -r1.757
--- ChangeLog 2006/08/04 22:55:04 1.756
+++ ChangeLog 2006/08/06 22:14:08 1.757
＠＠ -1,3 +1,15 ＠＠
+2006-08-07 Aidan Kehoe <kehoea(a)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(a)parhasard.net>
* lisp.el (forward-sexp):
1.26 +12 -2 XEmacs/xemacs/lisp/frame.el
Index: frame.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/frame.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- frame.el 2005/11/13 07:39:28 1.25
+++ frame.el 2006/08/06 22:14:10 1.26
＠＠ -1548,7 +1548,12 ＠＠ all frames that were visible, and iconif
(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 ＠＠ all frames that were visible, and iconif
;; 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))
1.19 +1 -1 XEmacs/xemacs/lisp/keydefs.el
Index: keydefs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/keydefs.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- keydefs.el 2003/04/28 16:18:23 1.18
+++ keydefs.el 2006/08/06 22:14:10 1.19
＠＠ -183,7 +183,7 ＠＠ Keymap for characters following C-c.")
;; 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)
