Mercurial > emacs
comparison src/keyboard.c @ 83162:dbcd0af66869
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Make sure image types are initialized for lookup too
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-412
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-413
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-414
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-415
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-417
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-418
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-419
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-202
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 24 Jun 2004 07:44:13 +0000 |
parents | 38500c0c86ab 8715315bd4ab |
children | 69ebc75cb461 |
comparison
equal
deleted
inserted
replaced
83161:8d62eda26760 | 83162:dbcd0af66869 |
---|---|
668 | 668 |
669 /* Nonzero means don't try to suspend even if the operating system seems | 669 /* Nonzero means don't try to suspend even if the operating system seems |
670 to support it. */ | 670 to support it. */ |
671 static int cannot_suspend; | 671 static int cannot_suspend; |
672 | 672 |
673 extern Lisp_Object Qidentity, Qonly; | |
674 | |
673 /* Install the string STR as the beginning of the string of echoing, | 675 /* Install the string STR as the beginning of the string of echoing, |
674 so that it serves as a prompt for the next character. | 676 so that it serves as a prompt for the next character. |
675 Also start echoing. */ | 677 Also start echoing. */ |
676 | 678 |
677 void | 679 void |
1807 } | 1809 } |
1808 else if (current_buffer != prev_buffer || MODIFF != prev_modiff) | 1810 else if (current_buffer != prev_buffer || MODIFF != prev_modiff) |
1809 call1 (Vrun_hooks, intern ("activate-mark-hook")); | 1811 call1 (Vrun_hooks, intern ("activate-mark-hook")); |
1810 } | 1812 } |
1811 | 1813 |
1814 /* Setting transient-mark-mode to `only' is a way of | |
1815 turning it on for just one command. */ | |
1816 if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks)) | |
1817 { | |
1818 if (EQ (Vtransient_mark_mode, Qidentity)) | |
1819 Vtransient_mark_mode = Qnil; | |
1820 if (EQ (Vtransient_mark_mode, Qonly)) | |
1821 Vtransient_mark_mode = Qidentity; | |
1822 } | |
1823 | |
1812 finalize: | 1824 finalize: |
1813 | 1825 |
1814 if (current_buffer == prev_buffer | 1826 if (current_buffer == prev_buffer |
1815 && last_point_position != PT | 1827 && last_point_position != PT |
1816 && NILP (Vdisable_point_adjustment) | 1828 && NILP (Vdisable_point_adjustment) |