Mercurial > emacs

comparison src/doc.c @ 57441:4c881805ff35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fsubstitute_command_keys): Ignore remappings unless there are no ordinary bindings.
author Kim F. Storm <storm@cua.dk>
date Mon, 11 Oct 2004 22:36:35 +0000
parents efd6af30bde2
children 0a4c356f307b ff0e824afa37
comparison
equal deleted inserted replaced
57440:c73d8ac83f10 57441:4c881805ff35
774 774
775 /* Save STRP in IDX. */ 775 /* Save STRP in IDX. */
776 idx = strp - SDATA (string); 776 idx = strp - SDATA (string);
777 tem = Fintern (make_string (start, length_byte), Qnil); 777 tem = Fintern (make_string (start, length_byte), Qnil);
778 778
779 /* Ignore remappings unless there are no ordinary bindings. */
780 tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qt);
781 if (NILP (tem))
782 tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil);
783
779 /* Note the Fwhere_is_internal can GC, so we have to take 784 /* Note the Fwhere_is_internal can GC, so we have to take
780 relocation of string contents into account. */ 785 relocation of string contents into account. */
781 tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil);
782 strp = SDATA (string) + idx; 786 strp = SDATA (string) + idx;
783 start = SDATA (string) + start_idx; 787 start = SDATA (string) + start_idx;
784 788
785 /* Disregard menu bar bindings; it is positively annoying to 789 /* Disregard menu bar bindings; it is positively annoying to
786 mention them when there's no menu bar, and it isn't terribly 790 mention them when there's no menu bar, and it isn't terribly