[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/doc.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/doc.c |
Date: |
Mon, 11 Oct 2004 18:45:57 -0400 |
Index: emacs/src/doc.c
diff -c emacs/src/doc.c:1.106 emacs/src/doc.c:1.107
*** emacs/src/doc.c:1.106 Wed Jun 23 17:00:06 2004
--- emacs/src/doc.c Mon Oct 11 22:36:35 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;
- [Emacs-diffs] Changes to emacs/src/doc.c,
Kim F . Storm <=