head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.54 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.52 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.50 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.48 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.46 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 buildlink2-base:1.7 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.5 netbsd-1-4-PATCH001:1.5 netbsd-1-4-RELEASE:1.4 netbsd-1-3-PATCH003:1.4 netbsd-1-3-PATCH002:1.3; locks; strict; comment @# @; 1.7 date 2001.08.06.14.20.47; author jlam; state dead; branches; next 1.6; 1.6 date 2000.07.19.09.31.45; author jlam; state Exp; branches; next 1.5; 1.5 date 99.07.13.00.56.13; author jlam; state Exp; branches; next 1.4; 1.4 date 98.08.07.10.40.28; author agc; state Exp; branches; next 1.3; 1.3 date 98.04.21.08.36.13; author hubertf; state Exp; branches; next 1.2; 1.2 date 98.03.19.13.02.19; author agc; state Exp; branches; next 1.1; 1.1 date 98.03.08.01.40.39; author agc; state Exp; branches; next ; desc @@ 1.7 log @Update readline to 4.2. Major changes from version 4.1: * bug fixes * improve linking with C++ code + a new file, rltypedefs.h, contains the new typedefs for function pointers + several minor additions to the API to customize look of readline + more complete documentation for public functions and variables @ text @$NetBSD: patch-aa,v 1.6 2000/07/19 09:31:45 jlam Exp $ --- display.c.orig Thu Sep 16 11:19:40 1999 +++ display.c Sun Jul 16 22:30:13 2000 @@@@ -688,7 +688,7 @@@@ putc ('\r', rl_outstream); #else if (term_cr) - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); #endif _rl_output_some_chars (local_prompt, nleft); _rl_last_c_pos = nleft; @@@@ -945,7 +945,7 @@@@ #if defined (__MSDOS__) putc ('\r', rl_outstream); #else - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); #endif _rl_output_some_chars (local_prompt, lendiff); _rl_last_c_pos = lendiff; @@@@ -1168,7 +1168,7 @@@@ #if defined (__MSDOS__) putc ('\r', rl_outstream); #else - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); #endif /* !__MSDOS__ */ _rl_last_c_pos = 0; } @@@@ -1187,7 +1187,7 @@@@ #if defined (HACK_TERMCAP_MOTION) if (term_forward_char) for (i = _rl_last_c_pos; i < new; i++) - tputs (term_forward_char, 1, _rl_output_character_function); + tputs (term_forward_char, 1, (void *)_rl_output_character_function); else for (i = _rl_last_c_pos; i < new; i++) putc (data[i], rl_outstream); @@@@ -1218,7 +1218,7 @@@@ #if defined (__MSDOS__) putc ('\r', rl_outstream); #else - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); #endif _rl_last_c_pos = 0; } @@@@ -1226,7 +1226,7 @@@@ { /* delta < 0 */ if (term_up && *term_up) for (i = 0; i < -delta; i++) - tputs (term_up, 1, _rl_output_character_function); + tputs (term_up, 1, (void *)_rl_output_character_function); } _rl_last_v_pos = to; /* Now TO is here */ @@@@ -1437,7 +1437,7 @@@@ int count; { if (term_clreol) - tputs (term_clreol, 1, _rl_output_character_function); + tputs (term_clreol, 1, (void *)_rl_output_character_function); else if (count) space_to_eol (count); } @@@@ -1460,7 +1460,7 @@@@ _rl_clear_screen () { if (term_clrpag) - tputs (term_clrpag, 1, _rl_output_character_function); + tputs (term_clrpag, 1, (void *)_rl_output_character_function); else crlf (); } @@@@ -1476,7 +1476,7 @@@@ { char *buffer; buffer = tgoto (term_IC, 0, count); - tputs (buffer, 1, _rl_output_character_function); + tputs (buffer, 1, (void *)_rl_output_character_function); _rl_output_some_chars (string, count); } else @@@@ -1485,14 +1485,14 @@@@ /* If we have to turn on insert-mode, then do so. */ if (term_im && *term_im) - tputs (term_im, 1, _rl_output_character_function); + tputs (term_im, 1, (void *)_rl_output_character_function); /* If there is a special command for inserting characters, then use that first to open up the space. */ if (term_ic && *term_ic) { for (i = count; i--; ) - tputs (term_ic, 1, _rl_output_character_function); + tputs (term_ic, 1, (void *)_rl_output_character_function); } /* Print the text. */ @@@@ -1501,7 +1501,7 @@@@ /* If there is a string to turn off insert mode, we had best use it now. */ if (term_ei && *term_ei) - tputs (term_ei, 1, _rl_output_character_function); + tputs (term_ei, 1, (void *)_rl_output_character_function); } } @@@@ -1517,13 +1517,13 @@@@ { char *buffer; buffer = tgoto (term_DC, count, count); - tputs (buffer, count, _rl_output_character_function); + tputs (buffer, count, (void *)_rl_output_character_function); } else { if (term_dc && *term_dc) while (count--) - tputs (term_dc, 1, _rl_output_character_function); + tputs (term_dc, 1, (void *)_rl_output_character_function); } } @@@@ -1570,7 +1570,7 @@@@ #if defined (__MSDOS__) putc ('\r', rl_outstream); #else - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); #endif _rl_last_c_pos = 0; } @@@@ -1620,7 +1620,7 @@@@ #if defined (__MSDOS__) putc ('\r', rl_outstream); #else - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); #endif _rl_last_c_pos = 0; #if defined (__MSDOS__) @@@@ -1628,11 +1628,11 @@@@ putc ('\r', rl_outstream); #else if (term_clreol) - tputs (term_clreol, 1, _rl_output_character_function); + tputs (term_clreol, 1, (void *)_rl_output_character_function); else { space_to_eol (screenwidth); - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); } #endif if (_rl_last_v_pos > 0) @ 1.6 log @Update readline to 4.1. Closes PR#10615 by Damon Brodie. Relevant changes from 4.0: e. The history library tries to truncate the history file only if it is a regular file. f. A bug that caused _rl_dispatch to address negative array indices on systems with signed chars was fixed. g. rl-yank-nth-arg now leaves the history position the same as when it was called. m. The quoted-insert code will now insert tty special chars like ^C. n. A bug was fixed that caused the display code to reference memory before the start of the prompt string. p. A bug was fixed in readline's signal handling that could cause infinite recursion in signal handlers. q. A bug was fixed that caused the point to be less than zero when rl_forward was given a very large numeric argument. r. The vi-mode code now gets characters via the application-settable value of rl_getc_function rather than calling rl_getc directly. t. Fixed a bug in the redisplay code for lines with more than 256 line breaks. u. A bug was fixed which caused invisible character markers to not be stripped from the prompt string if the terminal was in no-echo mode. v. Readline no longer tries to get the variables it needs for redisplay from the termcap entry if the calling application has specified its own redisplay function. Readline treats the terminal as `dumb' in this case. w. Fixes to the SIGWINCH code so that a multiple-line prompt with escape sequences is redrawn correctly. b. Parentheses matching is now always compiled into readline, and enabled or disabled when the value of the `blink-matching-paren' variable is changed. e. history-search-{forward,backward} now leave the point at the end of the line when the string to search for is empty, like {reverse,forward}-search-history. f. history-search-{forward,backward} now leave the last history line found in the readline buffer if the second or subsequent search fails. g. New function for use by applications: rl_on_new_line_with_prompt, used when an application displays the prompt itself before calling readline(). h. New variable for use by applications: rl_already_prompted. An application that displays the prompt itself before calling readline() must set this to a non-zero value. i. A new variable, rl_gnu_readline_p, always 1. The intent is that an application can verify whether or not it is linked with the `real' readline library or some substitute. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @ * Update "devel/readline" to 4.0. * Libtoolize library build. @ text @d3 5 a7 5 --- display.c.orig Thu Dec 17 15:36:30 1998 +++ display.c Tue Jul 6 05:21:00 1999 @@@@ -652,7 +652,7 @@@@ _rl_last_c_pos <= last_invisible && local_prompt) { d11 1 d14 4 a17 5 } @@@@ -899,7 +899,7 @@@@ term_cr && lendiff > visible_length && _rl_last_c_pos > 0 && od > lendiff && _rl_last_c_pos < last_invisible) { d20 1 d23 1 a23 2 } @@@@ -1069,7 +1069,7 @@@@ d32 2 a33 2 @@@@ -1090,7 +1090,7 @@@@ d41 4 a44 4 @@@@ -1127,14 +1127,14 @@@@ { for (i = 0; i < delta; i++) putc ('\n', rl_outstream); d47 1 d50 1 a50 1 else d57 1 a57 1 #endif /* !__GO32__ */ d59 2 a60 1 @@@@ -1346,7 +1346,7 @@@@ a61 1 #if !defined (__GO32__) a65 1 #endif /* !__GO32__ */ d67 3 a69 1 @@@@ -1371,7 +1371,7 @@@@ a70 1 #if !defined (__GO32__) a74 1 #endif /* !__GO32__ */ d76 2 a77 1 @@@@ -1402,7 +1402,7 @@@@ d86 1 a86 1 @@@@ -1411,14 +1411,14 @@@@ d103 1 a103 1 @@@@ -1427,7 +1427,7 @@@@ a109 1 #endif /* !__GO32__ */ d111 2 a112 1 @@@@ -1456,13 +1456,13 @@@@ a125 1 #endif /* !__GO32__ */ d127 5 a131 4 @@@@ -1503,7 +1503,7 @@@@ { if (term_cr) { d134 1 d137 4 a140 5 } @@@@ -1518,14 +1518,14 @@@@ the right thing happens if we have wrapped to a new screen line. */ if (term_cr) { d143 1 d145 4 d158 1 a159 1 _rl_move_vert (0); @ 1.4 log @Add NetBSD RCS Ids. @ text @d3 3 a5 3 --- display.c.old Sat Jan 10 16:57:37 1998 +++ display.c Sat Jan 10 17:06:06 1998 @@@@ -622,7 +622,7 @@@@ d14 1 a14 1 @@@@ -869,7 +869,7 @@@@ d23 1 a23 1 @@@@ -1039,7 +1039,7 @@@@ d32 10 a41 1 @@@@ -1097,14 +1097,14 @@@@ d58 1 a58 1 @@@@ -1316,7 +1316,7 @@@@ d67 1 a67 1 @@@@ -1341,7 +1341,7 @@@@ d76 1 a76 1 @@@@ -1372,7 +1372,7 @@@@ d85 1 a85 1 @@@@ -1381,14 +1381,14 @@@@ d102 1 a102 1 @@@@ -1397,7 +1397,7 @@@@ d111 1 a111 1 @@@@ -1426,13 +1426,13 @@@@ d127 1 a127 1 @@@@ -1473,7 +1473,7 @@@@ d136 1 a136 1 @@@@ -1488,14 +1488,14 @@@@ @ 1.3 log @Update to V2.2 @ text @d1 2 @ 1.2 log @Jaromir Dolecek's readline package (PR 4915) is better than the one in tree, so take the necessary elements from Jaromir's package: + build and install libhistory + build and install shared history and readline libraries. + install readline and history info pages with the correct names Preserve change from the original package: + don't assume that the Makefile SHELL is Bourne shell - set it explicitly, so that Bourne shell scripts aren't run by the csh(1) @ text @a142 39 --- terminal.c.old Sat Jan 10 17:13:57 1998 +++ terminal.c Sat Jan 10 17:14:48 1998 @@@@ -460,7 +460,7 @@@@ #if !defined (__GO32__) if (term_backspace) for (i = 0; i < count; i++) - tputs (term_backspace, 1, _rl_output_character_function); + tputs (term_backspace, 1, (void *)_rl_output_character_function); else #endif /* !__GO32__ */ for (i = 0; i < count; i++) @@@@ -495,7 +495,7 @@@@ case VISIBLE_BELL: if (visible_bell) { - tputs (visible_bell, 1, _rl_output_character_function); + tputs (visible_bell, 1, (void *)_rl_output_character_function); break; } /* FALLTHROUGH */ @@@@ -530,7 +530,7 @@@@ _rl_enable_meta_key () { if (term_has_meta && term_mm) - tputs (term_mm, 1, outchar); + tputs (term_mm, 1, (void *)outchar); } void @@@@ -538,7 +538,7 @@@@ int on; { if (on && term_ks) - tputs (term_ks, 1, outchar); + tputs (term_ks, 1, (void *)outchar); else if (!on && term_ke) - tputs (term_ke, 1, outchar); + tputs (term_ke, 1, (void *)outchar); } @ 1.1 log @Initial import of the GNU readline library (version 2.1) into the NetBSD packages collection. This is because some other packages play dirty and muck about with the internals of the readline structures, so our libedit-based emulation won't suffice for that. A pity. @ text @d1 74 a74 7 --- Makefile.in 1998/03/06 21:40:55 1.1 +++ Makefile.in 1998/03/06 21:41:04 @@@@ -34,6 +34,7 @@@@ RM = rm -f CP = cp MV = mv +SHELL = /bin/sh d76 4 a79 13 prefix = @@prefix@@ exec_prefix = @@exec_prefix@@ @@@@ -191,10 +192,10 @@@@ done -$(MV) $(libdir)/libreadline.a $(libdir)/libreadline.old $(INSTALL_DATA) libreadline.a $(libdir)/libreadline.a - -test -n "$(RANLIB)" && -$(RANLIB) -t $(libdir)/libreadline.a + -test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libreadline.a -( if test -d doc ; then \ cd doc && \ - ${MAKE} ${MFLAGS} infodir=$(infodir) INSTALL_DATA=$(INSTALL_DATA) $@@; \ + ${MAKE} ${MFLAGS} infodir=$(infodir) INSTALL_DATA="$(INSTALL_DATA)" $@@; \ fi ) d81 8 a88 5 installdirs: $(srcdir)/support/mkdirs --- doc/Makefile.in 1998/03/06 22:28:22 1.1 +++ doc/Makefile.in 1998/03/06 22:28:55 @@@@ -10,6 +10,7 @@@@ man3dir = $(mandir)/man3 d90 80 a169 4 RM = rm -f +SHELL = /bin/sh TEXINPUTDIR = $(srcdir) d171 11 @