Mercurial > emacs
comparison src/callint.c @ 93607:42db50d02ca0
(Fcall_interactively): Handle temporary region even when
shift-select-mode is off.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 03 Apr 2008 16:36:47 +0000 |
parents | 5dd7fdf8c27e |
children | 8971ddf55736 |
comparison
equal
deleted
inserted
replaced
93606:f720f3524c72 | 93607:42db50d02ca0 |
---|---|
34 extern char *index P_ ((const char *, int)); | 34 extern char *index P_ ((const char *, int)); |
35 #endif | 35 #endif |
36 | 36 |
37 extern Lisp_Object Qcursor_in_echo_area; | 37 extern Lisp_Object Qcursor_in_echo_area; |
38 extern Lisp_Object Qfile_directory_p; | 38 extern Lisp_Object Qfile_directory_p; |
39 extern Lisp_Object Qonly; | |
39 | 40 |
40 Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus; | 41 Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus; |
41 Lisp_Object Qcall_interactively; | 42 Lisp_Object Qcall_interactively; |
42 Lisp_Object Vcommand_history; | 43 Lisp_Object Vcommand_history; |
43 | 44 |
452 string++; | 453 string++; |
453 } | 454 } |
454 else if (*string == '^') | 455 else if (*string == '^') |
455 { | 456 { |
456 if (! NILP (Vshift_select_mode)) | 457 if (! NILP (Vshift_select_mode)) |
457 call0 (Qhandle_shift_selection); | 458 call1 (Qhandle_shift_selection, Qnil); |
459 /* Even if shift-select-mode is off, temporarily active | |
460 regions could be set using the mouse, and should be | |
461 deactivated. */ | |
462 else if (CONSP (Vtransient_mark_mode) | |
463 && EQ (XCAR (Vtransient_mark_mode), Qonly)) | |
464 call1 (Qhandle_shift_selection, Qt); | |
458 string++; | 465 string++; |
459 } | 466 } |
460 else break; | 467 else break; |
461 } | 468 } |
462 | 469 |