 @@ -1,14 +1,14 @@
-/*	$NetBSD: search.c,v 1.24 2010/04/15 00:57:33 christos Exp $	*/
+/*	$NetBSD: search.c,v 1.25 2011/07/28 00:46:26 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: search.c,v 1.24 2010/04/15 00:57:33 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.25 2011/07/28 00:46:26 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * search.c: History and character search functions
  */
 #include <stdlib.h>
 #if defined(REGEX)
 #include <regex.h>
 #elif defined(REGEXP)
 #include <regexp.h>
 #endif
 #include "el.h"
 @@ -244,89 +244,89 @@ ce_inc_search(EditLine *el, int dir)
 		    cp < &el->el_search.patbuf[el->el_search.patlen];
 		    *el->el_line.lastchar++ = *cp++)
 			continue;
 		*el->el_line.lastchar = '\0';
 		re_refresh(el);
 		if (FUN(el,getc)(el, &ch) != 1)
 			return (ed_end_of_file(el, 0));
 		switch (el->el_map.current[(unsigned char) ch]) {
 		case ED_INSERT:
 		case ED_DIGIT:
 			if (el->el_search.patlen >= EL_BUFSIZ - LEN)
-				term_beep(el);
+				terminal_beep(el);
 			else {
 				el->el_search.patbuf[el->el_search.patlen++] =
 				    ch;
 				*el->el_line.lastchar++ = ch;
 				*el->el_line.lastchar = '\0';
 				re_refresh(el);
+			}
 			break;
 		case EM_INC_SEARCH_NEXT:
 			newdir = ED_SEARCH_NEXT_HISTORY;
 			redo++;
 			break;
 		case EM_INC_SEARCH_PREV:
 			newdir = ED_SEARCH_PREV_HISTORY;
 			redo++;
 			break;
 		case EM_DELETE_PREV_CHAR:
 		case ED_DELETE_PREV_CHAR:
 			if (el->el_search.patlen > LEN)
 				done++;
 			else
-				term_beep(el);
+				terminal_beep(el);
 			break;
 		default:
 			switch (ch) {
 			case 0007:	/* ^G: Abort */
 				ret = CC_ERROR;
 				done++;
 				break;
 			case 0027:	/* ^W: Append word */
 			/* No can do if globbing characters in pattern */
 				for (cp = &el->el_search.patbuf[LEN];; cp++)
 				    if (cp >= &el->el_search.patbuf[
 					el->el_search.patlen]) {
 					el->el_line.cursor +=
 					    el->el_search.patlen - LEN - 1;
 					cp = c__next_word(el->el_line.cursor,
 					    el->el_line.lastchar, 1,
 					    ce__isword);
 					while (el->el_line.cursor < cp &&
 					    *el->el_line.cursor != '\n') {
 						if (el->el_search.patlen >=
 						    EL_BUFSIZ - LEN) {
-							term_beep(el);
+							terminal_beep(el);
 							break;
+						}
 						el->el_search.patbuf[el->el_search.patlen++] =
 						    *el->el_line.cursor;
 						*el->el_line.lastchar++ =
 						    *el->el_line.cursor++;
+					}
 					el->el_line.cursor = ocursor;
 					*el->el_line.lastchar = '\0';
 					re_refresh(el);
 					break;
 				    } else if (isglob(*cp)) {
-					    term_beep(el);
+					    terminal_beep(el);
 					    break;
+				    }
 				break;
 			default:	/* Terminate and execute cmd */
 				endcmd[0] = ch;
 				FUN(el,push)(el, endcmd);
 				/* FALLTHROUGH */
 			case 0033:	/* ESC: Terminate */
 				ret = CC_REFRESH;
 				done++;
 				break;
 @@ -391,27 +391,27 @@ ce_inc_search(EditLine *el, int dir)
 					if (ret != CC_ERROR) {
 						el->el_line.cursor = newdir ==
 						    ED_SEARCH_PREV_HISTORY ?
 						    el->el_line.lastchar :
 						    el->el_line.buffer;
 						(void) ce_search_line(el,
 						    newdir);
+					}
+				}
 				el->el_search.patlen -= LEN;
 				el->el_search.patbuf[el->el_search.patlen] =
 				    '\0';
 				if (ret == CC_ERROR) {
-					term_beep(el);
+					terminal_beep(el);
 					if (el->el_history.eventno !=
 					    ohisteventno) {
 						el->el_history.eventno =
 						    ohisteventno;
 						if (hist_get(el) == CC_ERROR)
 							return (CC_ERROR);
+					}
 					el->el_line.cursor = ocursor;
 					pchar = '?';
 				} else {
 					pchar = ':';
+				}
+			}