--- ./shlib/Makefile.in Thu Jan 24 10:15:02 2002 +++ ../readline-4.3/./shlib/Makefile.in Mon Nov 25 17:29:47 2002 @@ -147,11 +147,11 @@ $(SHARED_READLINE): $(SHARED_OBJ) $(RM) $@ - $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) + $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(READLINE_SHLIBS) $(SHLIB_LIBS) $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so $(RM) $@ - $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS) + $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(HISTORY_SHLIBS) $(SHLIB_LIBS) # Since tilde.c is shared between readline and bash, make sure we compile # it with the right flags when it's built as part of readline --- ./bind.c Thu Jan 24 11:15:52 2002 +++ ../readline-4.3/./bind.c Mon Nov 25 17:30:55 2002 @@ -311,7 +311,7 @@ mapped to something, `abc' to be mapped to something else, and the function bound to `a' to be executed when the user types `abx', leaving `bx' in the input queue. */ - if (k.function /* && k.type == ISFUNC */) + if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR)) { map[ANYOTHERKEY] = k; k.function = 0; --- ./examples/Makefile.in Thu Jan 24 10:16:05 2002 +++ ../readline-4.3/./examples/Makefile.in Tue Dec 3 09:58:06 2002 @@ -49,8 +49,8 @@ ${RM} $@ $(CC) $(CCFLAGS) -c $< -EXECUTABLES = fileman rltest rl rlcat rlversion histexamp -OBJECTS = fileman.o rltest.o rl.o rlversion.o histexamp.o +EXECUTABLES = fileman rltest rl rlcat rlversion histexamp +OBJECTS = $(EXECUTABLES:=.o) all: $(EXECUTABLES) everything: all rlfe --- ./readline.c Wed Mar 13 17:10:46 2002 +++ ../readline-4.3/./readline.c Mon Nov 25 17:30:56 2002 @@ -684,6 +684,7 @@ } #if defined (VI_MODE) if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && + key != ANYOTHERKEY && _rl_vi_textmod_command (key)) _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); #endif