diff options
| author | Miles Bader <[email protected]> | 2004-10-14 08:50:09 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2004-10-14 08:50:09 +0000 |
| commit | 91900dd736dc0ab57a38da1fa9daa5ddde487bfb (patch) | |
| tree | f592b350cad8a3a6bd196722bb553469c5781c1a /src/doc.c | |
| parent | 2beba76dd5f6e3f1fcf9cba8b66e465ae9e20519 (diff) | |
| parent | ebbeed623cb9902e520fc67d6d271e222e16867f (diff) | |
Revision: [email protected]/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-594
- [email protected]/emacs--cvs-trunk--0--patch-598
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-599
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-600
- [email protected]/emacs--cvs-trunk--0--patch-602
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-603
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-604
- [email protected]/emacs--cvs-trunk--0--patch-609
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-610
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-611
- [email protected]/emacs--cvs-trunk--0--patch-614
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-615
Merge from gnus--rel--5.10
* [email protected]/gnus--rel--5.10--patch-42
Update from CVS
* [email protected]/gnus--rel--5.10--patch-43
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-44
- [email protected]/gnus--rel--5.10--patch-46
Update from CVS
* [email protected]/gnus--rel--5.10--patch-47
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-48
Update from CVS
* [email protected]/gnus--rel--5.10--patch-49
Add {arch}/=commit-merge-make-log
* [email protected]/gnus--rel--5.10--patch-50
{arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -776,9 +776,13 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int 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. */ - tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil); strp = SDATA (string) + idx; start = SDATA (string) + start_idx; |