diff -Nrc2 readline-2.2/Makefile.in readline-2.2.1/Makefile.in
*** readline-2.2/Makefile.in Fri Apr 3 11:23:01 1998
--- readline-2.2.1/Makefile.in Fri Jul 17 11:00:54 1998
***************
*** 197,201 ****
force:
! install: installdirs libreadline.a
for f in ${INSTALLED_HEADERS}; do \
$(INSTALL_DATA) $(srcdir)/$$f $(includedir)/readline ; \
--- 197,201 ----
force:
! install: installdirs $(STATIC_LIBS)
for f in ${INSTALLED_HEADERS}; do \
$(INSTALL_DATA) $(srcdir)/$$f $(includedir)/readline ; \
***************
*** 204,208 ****
$(INSTALL_DATA) libreadline.a $(libdir)/libreadline.a
-test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libreadline.a
! -$(MV) $(libdir)/libreadline.a $(libdir)/libhistory.old
$(INSTALL_DATA) libhistory.a $(libdir)/libhistory.a
-test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libhistory.a
--- 204,208 ----
$(INSTALL_DATA) libreadline.a $(libdir)/libreadline.a
-test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libreadline.a
! -$(MV) $(libdir)/libhistory.a $(libdir)/libhistory.old
$(INSTALL_DATA) libhistory.a $(libdir)/libhistory.a
-test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libhistory.a
diff -Nrc2 readline-2.2/display.c readline-2.2.1/display.c
*** readline-2.2/display.c Mon Aug 4 15:54:23 1997
--- readline-2.2.1/display.c Fri Jul 17 11:02:49 1998
***************
*** 424,428 ****
--- 424,435 ----
while (lpos >= screenwidth)
{
+ #if 0
temp = ((newlines + 1) * screenwidth) - ((newlines == 0) ? wrap_offset : 0);
+ #else
+ /* XXX - possible fix from Darin Johnson <
[email protected]> for prompt
+ string with invisible characters that is longer than the screen
+ width. */
+ temp = ((newlines + 1) * screenwidth) + ((newlines == 0) ? wrap_offset : 0);
+ #endif
inv_lbreaks[++newlines] = temp;
lpos -= screenwidth;
diff -Nrc2 readline-2.2/doc/Makefile.in readline-2.2.1/doc/Makefile.in
*** readline-2.2/doc/Makefile.in Thu Apr 16 10:19:44 1998
--- readline-2.2.1/doc/Makefile.in Fri Jul 17 11:02:36 1998
***************
*** 114,119 ****
install: installdirs info
! ${INSTALL_DATA} readline.info $(infodir)/readline.info
! ${INSTALL_DATA} history.info $(infodir)/history.info
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
install-info --dir-file=$(infodir)/dir $(infodir)/readline.info ; \
--- 114,127 ----
install: installdirs info
! if test -f readline.info; then \
! ${INSTALL_DATA} readline.info $(infodir)/readline.info; \
! else \
! ${INSTALL_DATA} $(srcdir)/readline.info $(infodir)/readline.info; \
! fi
! if test -f history.info; then \
! ${INSTALL_DATA} history.info $(infodir)/history.info; \
! else \
! ${INSTALL_DATA} $(srcdir)/history.info $(infodir)/history.info; \
! fi
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
install-info --dir-file=$(infodir)/dir $(infodir)/readline.info ; \
diff -Nrc2 readline-2.2/parens.c readline-2.2.1/parens.c
*** readline-2.2/parens.c Fri Feb 20 16:38:30 1998
--- readline-2.2.1/parens.c Fri Jul 17 11:03:08 1998
***************
*** 103,107 ****
FD_SET (fileno (rl_instream), &readfds);
timer.tv_sec = 0;
! timer.tv_usec = 500;
orig_point = rl_point;
--- 103,107 ----
FD_SET (fileno (rl_instream), &readfds);
timer.tv_sec = 0;
! timer.tv_usec = 500000;
orig_point = rl_point;
