[Emacs-diffs] Changes to emacs/src/doc.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/doc.c
diff -c emacs/src/doc.c:1.101.2.5 emacs/src/doc.c:1.101.2.6
*** emacs/src/doc.c:1.101.2.5   Tue Jun 29 16:46:01 2004
--- emacs/src/doc.c     Thu Oct 14 08:49:57 2004
***************
*** 776,784 ****
          idx = strp - SDATA (string);
          tem = Fintern (make_string (start, length_byte), Qnil);
  
          /* Note the Fwhere_is_internal can GC, so we have to take
             relocation of string contents into account.  */
-         tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil);
          strp = SDATA (string) + idx;
          start = SDATA (string) + start_idx;
  
--- 776,788 ----
          idx = strp - SDATA (string);
          tem = Fintern (make_string (start, length_byte), Qnil);
  
+         /* Ignore remappings unless there are no ordinary bindings. */
+         tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qt);
+         if (NILP (tem))
+           tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil);
+ 
          /* Note the Fwhere_is_internal can GC, so we have to take
             relocation of string contents into account.  */
          strp = SDATA (string) + idx;
          start = SDATA (string) + start_idx;