[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/doc.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/doc.c [emacs-unicode-2] |
Date: |
Fri, 22 Oct 2004 06:22:53 -0400 |
Index: emacs/src/doc.c
diff -c emacs/src/doc.c:1.101.2.6 emacs/src/doc.c:1.101.2.7
*** emacs/src/doc.c:1.101.2.6 Thu Oct 14 08:49:57 2004
--- emacs/src/doc.c Fri Oct 22 10:13:37 2004
***************
*** 774,801 ****
/* Save STRP in IDX. */
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;
- /* Disregard menu bar bindings; it is positively annoying to
- mention them when there's no menu bar, and it isn't terribly
- useful even when there is a menu bar. */
- if (!NILP (tem))
- {
- firstkey = Faref (tem, make_number (0));
- if (EQ (firstkey, Qmenu_bar))
- tem = Qnil;
- }
-
if (NILP (tem)) /* but not on any keys */
{
int offset = bufp - buf;
--- 774,791 ----
/* Save STRP in IDX. */
idx = strp - SDATA (string);
! name = Fintern (make_string (start, length_byte), Qnil);
/* Ignore remappings unless there are no ordinary bindings. */
! tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qt);
if (NILP (tem))
! tem = Fwhere_is_internal (name, 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;
if (NILP (tem)) /* but not on any keys */
{
int offset = bufp - buf;