* comint.el (comint-replace-by-expanded-history-before-point):

[gnu-emacs] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index 6d5862ce292c7444b34292e516319e2ab8ef8b2d..6a53e0d3f747a32ca7a4090e34b876be41e8e5a8 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/types.h>
 #include <sys/file.h>  /* Must be after sys/types.h for USG*/
 #include <ctype.h>
+#include <setjmp.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -802,10 +803,7 @@ a new string, without any text properties, is returned.  */)
          name = Fintern (make_string (start, length_byte), Qnil);
 
        do_remap:
-         /* 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);
+         tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);
 
          if (VECTORP (tem) && XVECTOR (tem)->size > 1
              && EQ (AREF (tem, 0), Qremap) && SYMBOLP (AREF (tem, 1))