diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 10 |
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. */ |
| 663 | static int cannot_suspend; | 663 | static int cannot_suspend; |
| 664 | |||
| 665 | extern 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'. */ |