diff options
author | Chet Ramey <chet.ramey@case.edu> | 2011-11-23 18:48:31 -0500 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-23 18:48:31 -0500 |
commit | 7ea38d677dc0ce50dfcbfc43150919579627b274 (patch) | |
tree | ceedaf5f6593963b78697f920020eb61a82e5f0b | |
parent | db4c00d880b67af735af9b18835ae900f5be9e53 (diff) | |
download | readline-7ea38d677dc0ce50dfcbfc43150919579627b274.tar.gz |
Readline-2.2.1 import
-rw-r--r-- | CHANGES | 20 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | display.c | 7 | ||||
-rw-r--r-- | doc/Makefile.in | 12 | ||||
-rw-r--r-- | parens.c | 2 |
5 files changed, 39 insertions, 6 deletions
@@ -1,3 +1,22 @@ +This document details the changes between this version, readline-2.2.1, +and the previous version, readline-2.2. + +1. Changes to Readline + +a. The `make install' target was corrected so that it did not move the + newly-installed libreadline.a to libhistory.old + +b. The `make install' target for the documentation will now install the + info files from the source directory if they do not appear in the + build directory, since they are shipped in the readline tar file. + +c. Fixed a problem with redisplay that showed up when the prompt string was + longer than the screen width and the prompt contained invisible characters. + +d. Fixed a problem with the paren matching code -- the blink was far too + short (it's specified in microseconds, not milliseconds, Chet!). + +------------------------------------------------------------------------------ This document details the changes between this version, readline-2.2, and the previous version, readline-2.1. @@ -63,4 +82,3 @@ g. The key sequence translation code now understands printf-style backslash may be used in key sequence definitions or macro values. h. An `$include' inputrc file parser directive has been added. - diff --git a/Makefile.in b/Makefile.in index f4db3bb..63ac038 100644 --- a/Makefile.in +++ b/Makefile.in @@ -196,14 +196,14 @@ examples: force force: -install: installdirs libreadline.a +install: installdirs $(STATIC_LIBS) for f in ${INSTALLED_HEADERS}; do \ $(INSTALL_DATA) $(srcdir)/$$f $(includedir)/readline ; \ done -$(MV) $(libdir)/libreadline.a $(libdir)/libreadline.old $(INSTALL_DATA) libreadline.a $(libdir)/libreadline.a -test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libreadline.a - -$(MV) $(libdir)/libreadline.a $(libdir)/libhistory.old + -$(MV) $(libdir)/libhistory.a $(libdir)/libhistory.old $(INSTALL_DATA) libhistory.a $(libdir)/libhistory.a -test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libhistory.a -( if test -d doc ; then \ @@ -423,7 +423,14 @@ rl_redisplay () contents of the command line? */ while (lpos >= screenwidth) { +#if 0 temp = ((newlines + 1) * screenwidth) - ((newlines == 0) ? wrap_offset : 0); +#else + /* XXX - possible fix from Darin Johnson <darin@acuson.com> 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 --git a/doc/Makefile.in b/doc/Makefile.in index 63da1be..2eabb41 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -113,8 +113,16 @@ installdirs: $(top_srcdir)/support/mkdirs -$(SHELL) $(top_srcdir)/support/mkdirs $(infodir) $(man3dir) install: installdirs info - ${INSTALL_DATA} readline.info $(infodir)/readline.info - ${INSTALL_DATA} history.info $(infodir)/history.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 ; \ install-info --dir-file=$(infodir)/dir $(infodir)/history.info ; \ @@ -102,7 +102,7 @@ rl_insert_close (count, invoking_key) FD_ZERO (&readfds); FD_SET (fileno (rl_instream), &readfds); timer.tv_sec = 0; - timer.tv_usec = 500; + timer.tv_usec = 500000; orig_point = rl_point; rl_point = match_point; |