Mercurial > emacs
diff lisp/echistory.el @ 91040:14c4a6aac623
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 11 Oct 2007 16:14:00 +0000 |
| parents | f55f9811f5d7 65663fcd2caa |
| children | 606f2d163a64 |
line wrap: on
line diff
--- a/lisp/echistory.el Thu Oct 11 01:51:15 2007 +0000 +++ b/lisp/echistory.el Thu Oct 11 16:14:00 2007 +0000 @@ -66,7 +66,7 @@ (define-key electric-history-map "\C-c" nil) (define-key electric-history-map "\C-c\C-c" 'Electric-history-quit) (define-key electric-history-map "\C-]" 'Electric-history-quit) - (define-key electric-history-map "\C-z" 'suspend-emacs) + (define-key electric-history-map "\C-z" 'suspend-frame) (define-key electric-history-map (char-to-string help-char) 'Helper-help) (define-key electric-history-map "?" 'Helper-describe-bindings) (define-key electric-history-map "\e>" 'end-of-buffer)