Mercurial > emacs
comparison lisp/simple.el @ 83224:7a0245dd1848
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 06 Nov 2004 17:52:02 +0000 |
parents | 4056279af756 d50014ac219f |
children | 3ec251523b3e |
comparison
equal
deleted
inserted
replaced
83223:4056279af756 | 83224:7a0245dd1848 |
---|---|
1 ;;; simple.el --- basic editing commands for Emacs | 1 ;;; simple.el --- basic editing commands for Emacs |
2 | 2 |
3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 99, | 3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 99, |
4 ;; 2000, 01, 02, 03, 04 | 4 ;; 2000, 01, 02, 03, 2004 |
5 ;; Free Software Foundation, Inc. | 5 ;; Free Software Foundation, Inc. |
6 | 6 |
7 ;; Maintainer: FSF | 7 ;; Maintainer: FSF |
8 ;; Keywords: internal | 8 ;; Keywords: internal |
9 | 9 |
3918 "Signal a `quit' condition. | 3918 "Signal a `quit' condition. |
3919 During execution of Lisp code, this character causes a quit directly. | 3919 During execution of Lisp code, this character causes a quit directly. |
3920 At top-level, as an editor command, this simply beeps." | 3920 At top-level, as an editor command, this simply beeps." |
3921 (interactive) | 3921 (interactive) |
3922 (deactivate-mark) | 3922 (deactivate-mark) |
3923 (if (fboundp 'kmacro-keyboard-quit) | |
3924 (kmacro-keyboard-quit)) | |
3923 (setq defining-kbd-macro nil) | 3925 (setq defining-kbd-macro nil) |
3924 (signal 'quit nil)) | 3926 (signal 'quit nil)) |
3925 | 3927 |
3926 (define-key global-map "\C-g" 'keyboard-quit) | 3928 (define-key global-map "\C-g" 'keyboard-quit) |
3927 | 3929 |