upstream

3 files changed, 26 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 71bfec1f061..81448982563 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-26  Kenichi Handa  <handa@m17n.org>
+
+        * dispextern.h (struct glyph): Fix previous change.  Change the
+        bit length of glyphless.ch to 25 (Bug#11082).
+
+2012-03-26  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (Vselection_inhibit_update_commands): New variable.
+        (command_loop_1): Use it; inhibit selection update for
+        handle-select-window too (Bug#8996).
+
 2012-03-25  Fabrice Popineau  <fabrice.popineau@supelec.fr>
 
         * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific
diff --git a/src/dispextern.h b/src/dispextern.h
index af5a3e836d7..e45d4b1e558 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -461,7 +461,7 @@ struct glyph
       /* Length of acronym or hexadecimal code string (at most 8).  */
       unsigned len : 4;
       /* Character to display.  Actually we need only 22 bits.  */
-      unsigned ch : 22;
+      unsigned ch : 25;
     } glyphless;
 
     /* Used to compare all bit-fields above in one step.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index 6417d97ece3..359e6cd692e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -241,6 +241,7 @@ Lisp_Object internal_last_event_frame;
 Time last_event_timestamp;
 
 static Lisp_Object Qx_set_selection, Qhandle_switch_frame;
+static Lisp_Object Qhandle_select_window;
 Lisp_Object QPRIMARY;
 
 static Lisp_Object Qself_insert_command;
@@ -1650,7 +1651,8 @@ command_loop_1 (void)
                       ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly)
                       : (!NILP (Vselect_active_regions)
                          && !NILP (Vtransient_mark_mode)))
-                  && !EQ (Vthis_command, Qhandle_switch_frame))
+                  && NILP (Fmemq (Vthis_command,
+                                  Vselection_inhibit_update_commands)))
                 {
                   EMACS_INT beg =
                     XINT (Fmarker_position (BVAR (current_buffer, mark)));
@@ -11669,6 +11671,7 @@ syms_of_keyboard (void)
   DEFSYM (Qx_set_selection, "x-set-selection");
   DEFSYM (QPRIMARY, "PRIMARY");
   DEFSYM (Qhandle_switch_frame, "handle-switch-frame");
+  DEFSYM (Qhandle_select_window, "handle-select-window");
 
   DEFSYM (Qinput_method_function, "input-method-function");
   DEFSYM (Qinput_method_exit_on_first_char, "input-method-exit-on-first-char");
@@ -12305,6 +12308,16 @@ text in the region before modifying the buffer.  The next
 `deactivate-mark' call uses this to set the window selection.  */);
   Vsaved_region_selection = Qnil;
 
+  DEFVAR_LISP ("selection-inhibit-update-commands",
+               Vselection_inhibit_update_commands,
+               doc: /* List of commands which should not update the selection.
+Normally, if `select-active-regions' is non-nil and the mark remains
+active after a command (i.e. the mark was not deactivated), the Emacs
+command loop sets the selection to the text in the region.  However,
+if the command is in this list, the selection is not updated.  */);
+  Vselection_inhibit_update_commands
+    = list2 (Qhandle_switch_frame, Qhandle_select_window);
+
   DEFVAR_LISP ("debug-on-event",
                Vdebug_on_event,
                doc: /* Enter debugger on this event.  When Emacs