aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2008-04-02 20:22:37 +0000
committerChong Yidong2008-04-02 20:22:37 +0000
commit12679e05b0301b602857fccb2e0837e5dd40d6b3 (patch)
tree2b213080fc46945e06117ab20f377742f07a32bf /src
parentd6b4106c61cd56d785697fb6f5fdc092ddeee38f (diff)
downloademacs-12679e05b0301b602857fccb2e0837e5dd40d6b3.tar.gz
emacs-12679e05b0301b602857fccb2e0837e5dd40d6b3.zip
Restore support for the values `identity' and `only' for transient
mark mode, since it can't hurt. Update comments.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 526586f17f2..54a626268a2 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -661,6 +661,8 @@ static int store_user_signal_events P_ ((void));
661/* Nonzero means don't try to suspend even if the operating system seems 661/* Nonzero means don't try to suspend even if the operating system seems
662 to support it. */ 662 to support it. */
663static int cannot_suspend; 663static int cannot_suspend;
664
665extern Lisp_Object Qidentity, Qonly;
664 666
665/* Install the string STR as the beginning of the string of echoing, 667/* Install the string STR as the beginning of the string of echoing,
666 so that it serves as a prompt for the next character. 668 so that it serves as a prompt for the next character.
@@ -1967,6 +1969,14 @@ command_loop_1 ()
1967 1969
1968 if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks)) 1970 if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
1969 { 1971 {
1972 /* In Emacs 22, setting transient-mark-mode to `only' was a
1973 way of turning it on for just one command. This usage is
1974 obsolete, but support it anyway. */
1975 if (EQ (Vtransient_mark_mode, Qidentity))
1976 Vtransient_mark_mode = Qnil;
1977 else if (EQ (Vtransient_mark_mode, Qonly))
1978 Vtransient_mark_mode = Qidentity;
1979
1970 if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode)) 1980 if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
1971 { 1981 {
1972 /* We could also call `deactivate'mark'. */ 1982 /* We could also call `deactivate'mark'. */