Merge branch 'master' into win32-x64-working

Conflicts: src/do_name.c src/trap.c src/zap.c win/X11/winmenu.c
2015-04-12 10:35:00 -04:00
parent c03a37c440 7da3ed32e1
commit 83a7513c13
25 changed files with 1084 additions and 144 deletions
--- a/win/X11/winmenu.c
+++ b/win/X11/winmenu.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5	winmenu.c	$NHDT-Date: 1427881480 2015/04/01 09:44:40 $  $NHDT-Branch: master $:$NHDT-Revision: 1.5 $ */
+/* NetHack 3.5	winmenu.c	$NHDT-Date: 1428828477 2015/04/12 08:47:57 $  $NHDT-Branch: master $:$NHDT-Revision: 1.7 $ */
 /*	SCCS Id: @(#)winmenu.c	3.5	1996/08/15	*/
 /* Copyright (c) Dean Luick, 1992				  */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -248,9 +248,13 @@ menu_key(w, event, params, num_params)
 	    return;
 	} else if (ch == MENU_SEARCH) {		/* search */
 	    if (menu_info->how == PICK_ANY || menu_info->how == PICK_ONE) {
-		char buf[BUFSZ];
-		X11_getlin("Search for:", buf);
-		if (!*buf || *buf == '\033') return;
+		char buf[BUFSZ+2], tmpbuf[BUFSZ];
+
+		X11_getlin("Search for:", tmpbuf);
+		if (!*tmpbuf || *tmpbuf == '\033') return;
+		/* convert "string" into "*string*" for use with pmatch() */
+		Sprintf(buf, "*%s*", tmpbuf);
+
 		if (menu_info->how == PICK_ANY) {
 		    invert_match(wp, buf);
 		    return;
@@ -394,10 +398,12 @@ menu_search(w, client_data, call_data)
 {
    struct xwindow *wp = (struct xwindow *) client_data;
    struct menu_info_t *menu_info = wp->menu_information;
+    char buf[BUFSZ+2], tmpbuf[BUFSZ];

-    char buf[BUFSZ];
-    X11_getlin("Search for:", buf);
-    if (!*buf || *buf == '\033') return;
+    X11_getlin("Search for:", tmpbuf);
+    if (!*tmpbuf || *tmpbuf == '\033') return;
+    /* convert "string" into "*string*" for use with pmatch() */
+    Sprintf(buf, "*%s*", tmpbuf);

    if (menu_info->how == PICK_ANY)
 	invert_match(wp, buf);
@@ -478,7 +484,7 @@ invert_all(wp)
 static void
 invert_match(wp, match)
    struct xwindow *wp;
-    char *match;
+    char *match;	/* wildcard pattern for pmatch() */
 {
    x11_menu_item *curr;
    int count;
@@ -487,7 +493,7 @@ invert_match(wp, match)
    reset_menu_count(wp->menu_information);
    for (count = 0, curr = wp->menu_information->curr_menu.base; curr;
 						curr = curr->next, count++)
-	if (curr->identifier.a_void != 0 && strstri(curr->str, match)) {
+	if (curr->identifier.a_void != 0 && pmatchi(match, curr->str)) {
 	    invert_line(wp, curr, count, -1L);
 	    changed = TRUE;
 	}
@@ -502,7 +508,7 @@ invert_match(wp, match)
 static void
 select_match(wp, match)
    struct xwindow *wp;
-    char *match;
+    char *match;	/* wildcard pattern for pmatch() */
 {
    x11_menu_item *curr;
    int count;
@@ -510,11 +516,12 @@ select_match(wp, match)
    reset_menu_count(wp->menu_information);
    for (count = 0, curr = wp->menu_information->curr_menu.base; curr;
 						curr = curr->next, count++)
-	if (curr->identifier.a_void != 0 && strstri(curr->str, match)) {
+	if (curr->identifier.a_void != 0 && pmatchi(match, curr->str)) {
 	    if (!curr->selected) {
 		invert_line(wp, curr, count, -1L);
 #ifndef USE_FWF
-		XawListChange(wp->w, wp->menu_information->curr_menu.list_pointer,
+		XawListChange(wp->w,
+			      wp->menu_information->curr_menu.list_pointer,
 			      0, 0, True);
 #endif
 	    }
--- a/win/share/objects.txt
+++ b/win/share/objects.txt
@@ -7006,7 +7006,26 @@ P = (108, 145, 182)
  MMMMMMMJJJAAMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 368 (papyrus / Book of the Dead)
+# tile 368 (paperback / novel)
+{
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMEEEEMMMMMMMM
+  MMMMEEEEEEMMMMMM
+  MMMEEEEEEEEEEMMM
+  MMMEEEEEEEEEBMMM
+  MMEEEEEEEEEEOAMM
+  MMEEEEEEEEEBOAAM
+  MEEEEEEEEEEOEAMM
+  MEEEEEEEEEBOAAMM
+  MEOOEEEEEEOEAMMM
+  MMEEOOOEEBOAAMMM
+  MMMMEEEOOOEAMMMM
+  MMMMMMMEEEAAMMMM
+  MMMMMMMMMMMMMMMM
+}
+# tile 369 (papyrus / Book of the Dead)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7025,7 +7044,7 @@ P = (108, 145, 182)
  MMMMMMMAAAMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 369 (glass / light)
+# tile 370 (glass / light)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7044,7 +7063,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 370 (balsa / secret door detection)
+# tile 371 (balsa / secret door detection)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7063,7 +7082,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 371 (crystal / enlightenment)
+# tile 372 (crystal / enlightenment)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7082,7 +7101,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 372 (maple / create monster)
+# tile 373 (maple / create monster)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7101,7 +7120,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 373 (pine / wishing)
+# tile 374 (pine / wishing)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7120,7 +7139,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 374 (oak / nothing)
+# tile 375 (oak / nothing)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7139,7 +7158,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 375 (ebony / striking)
+# tile 376 (ebony / striking)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7158,7 +7177,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 376 (marble / make invisible)
+# tile 377 (marble / make invisible)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7177,7 +7196,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 377 (tin / slow monster)
+# tile 378 (tin / slow monster)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7196,7 +7215,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 378 (brass / speed monster)
+# tile 379 (brass / speed monster)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7215,7 +7234,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 379 (copper / undead turning)
+# tile 380 (copper / undead turning)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7234,7 +7253,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 380 (silver / polymorph)
+# tile 381 (silver / polymorph)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7253,7 +7272,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 381 (platinum / cancellation)
+# tile 382 (platinum / cancellation)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7272,7 +7291,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 382 (iridium / teleportation)
+# tile 383 (iridium / teleportation)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7291,7 +7310,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 383 (zinc / opening)
+# tile 384 (zinc / opening)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7310,7 +7329,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 384 (aluminum / locking)
+# tile 385 (aluminum / locking)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7329,7 +7348,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 385 (uranium / probing)
+# tile 386 (uranium / probing)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7348,7 +7367,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 386 (iron / digging)
+# tile 387 (iron / digging)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7367,7 +7386,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 387 (steel / magic missile)
+# tile 388 (steel / magic missile)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7386,7 +7405,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 388 (hexagonal / fire)
+# tile 389 (hexagonal / fire)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7405,7 +7424,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 389 (short / cold)
+# tile 390 (short / cold)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7424,7 +7443,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 390 (runed / sleep)
+# tile 391 (runed / sleep)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7443,7 +7462,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 391 (long / death)
+# tile 392 (long / death)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMNOM
@@ -7462,7 +7481,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 392 (curved / lightning)
+# tile 393 (curved / lightning)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMNOMMMMMMM
@@ -7481,7 +7500,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 393 (forked)
+# tile 394 (forked)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7500,7 +7519,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 394 (spiked)
+# tile 395 (spiked)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7519,7 +7538,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 395 (jeweled)
+# tile 396 (jeweled)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7538,7 +7557,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 396 (gold piece)
+# tile 397 (gold piece)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7557,7 +7576,7 @@ P = (108, 145, 182)
  MMMMMMMMMHAMMMMM
  MMMMMMMMMMMHAMMM
 }
-# tile 397 (white / dilithium crystal)
+# tile 398 (white / dilithium crystal)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7576,7 +7595,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 398 (white / diamond)
+# tile 399 (white / diamond)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7595,7 +7614,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 399 (red / ruby)
+# tile 400 (red / ruby)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7614,7 +7633,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 400 (orange / jacinth)
+# tile 401 (orange / jacinth)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7633,7 +7652,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 401 (blue / sapphire)
+# tile 402 (blue / sapphire)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7652,7 +7671,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 402 (black / black opal)
+# tile 403 (black / black opal)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7671,7 +7690,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 403 (green / emerald)
+# tile 404 (green / emerald)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7690,7 +7709,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 404 (green / turquoise)
+# tile 405 (green / turquoise)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7709,7 +7728,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 405 (yellow / citrine)
+# tile 406 (yellow / citrine)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7728,7 +7747,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 406 (green / aquamarine)
+# tile 407 (green / aquamarine)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7747,7 +7766,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 407 (yellowish brown / amber)
+# tile 408 (yellowish brown / amber)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7766,7 +7785,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 408 (yellowish brown / topaz)
+# tile 409 (yellowish brown / topaz)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7785,7 +7804,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 409 (black / jet)
+# tile 410 (black / jet)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7804,7 +7823,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 410 (white / opal)
+# tile 411 (white / opal)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7823,7 +7842,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 411 (yellow / chrysoberyl)
+# tile 412 (yellow / chrysoberyl)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7842,7 +7861,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 412 (red / garnet)
+# tile 413 (red / garnet)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7861,7 +7880,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 413 (violet / amethyst)
+# tile 414 (violet / amethyst)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7880,7 +7899,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 414 (red / jasper)
+# tile 415 (red / jasper)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7899,7 +7918,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 415 (violet / fluorite)
+# tile 416 (violet / fluorite)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7918,7 +7937,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 416 (black / obsidian)
+# tile 417 (black / obsidian)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7937,7 +7956,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 417 (orange / agate)
+# tile 418 (orange / agate)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7956,7 +7975,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 418 (green / jade)
+# tile 419 (green / jade)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7975,7 +7994,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 419 (white / worthless piece of white glass)
+# tile 420 (white / worthless piece of white glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -7994,7 +8013,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 420 (blue / worthless piece of blue glass)
+# tile 421 (blue / worthless piece of blue glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8013,7 +8032,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 421 (red / worthless piece of red glass)
+# tile 422 (red / worthless piece of red glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8032,7 +8051,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 422 (yellowish brown / worthless piece of yellowish brown glass)
+# tile 423 (yellowish brown / worthless piece of yellowish brown glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8051,7 +8070,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 423 (orange / worthless piece of orange glass)
+# tile 424 (orange / worthless piece of orange glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8070,7 +8089,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 424 (yellow / worthless piece of yellow glass)
+# tile 425 (yellow / worthless piece of yellow glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8089,7 +8108,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 425 (black / worthless piece of black glass)
+# tile 426 (black / worthless piece of black glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8108,7 +8127,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 426 (green / worthless piece of green glass)
+# tile 427 (green / worthless piece of green glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8127,7 +8146,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 427 (violet / worthless piece of violet glass)
+# tile 428 (violet / worthless piece of violet glass)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8146,7 +8165,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 428 (gray / luckstone)
+# tile 429 (gray / luckstone)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8165,7 +8184,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 429 (gray / loadstone)
+# tile 430 (gray / loadstone)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8184,7 +8203,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 430 (gray / touchstone)
+# tile 431 (gray / touchstone)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8203,7 +8222,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 431 (gray / flint)
+# tile 432 (gray / flint)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8222,7 +8241,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 432 (rock)
+# tile 433 (rock)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8241,7 +8260,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 433 (boulder)
+# tile 434 (boulder)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8260,7 +8279,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 434 (statue)
+# tile 435 (statue)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMJJMMMMMM
@@ -8279,7 +8298,7 @@ P = (108, 145, 182)
  MMMMMJJJJJJAAMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 435 (heavy iron ball)
+# tile 436 (heavy iron ball)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8298,7 +8317,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 436 (iron chain)
+# tile 437 (iron chain)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8317,7 +8336,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMPPMPA
  MMMMMMMMMMMMAAMM
 }
-# tile 437 (splash of venom / blinding venom)
+# tile 438 (splash of venom / blinding venom)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
@@ -8336,7 +8355,7 @@ P = (108, 145, 182)
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
 }
-# tile 438 (splash of venom / acid venom)
+# tile 439 (splash of venom / acid venom)
 {
  MMMMMMMMMMMMMMMM
  MMMMMMMMMMMMMMMM
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5	wintty.c	$NHDT-Date: 1428394244 2015/04/07 08:10:44 $  $NHDT-Branch: master $:$NHDT-Revision: 1.84 $ */
+/* NetHack 3.5	wintty.c	$NHDT-Date: 1428828474 2015/04/12 08:47:54 $  $NHDT-Branch: master $:$NHDT-Revision: 1.85 $ */
 /* NetHack 3.5	wintty.c	$Date: 2012/01/22 06:27:09 $  $Revision: 1.66 $ */
 /* Copyright (c) David Cohrs, 1991				  */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1664,20 +1664,24 @@ struct WinDesc *cw;
 		    tty_nhbell();
 		    break;
 		} else {
-		    char searchbuf[BUFSZ], tmpbuf[BUFSZ];
+		    char searchbuf[BUFSZ+2], tmpbuf[BUFSZ];
 		    boolean on_curr_page = FALSE;
 		    int lineno = 0;
+
 		    tty_getlin("Search for:", tmpbuf);
 		    if (!tmpbuf[0] || tmpbuf[0] == '\033') break;
 		    Sprintf(searchbuf, "*%s*", tmpbuf);
+
 		    for (curr = cw->mlist; curr; curr = curr->next) {
 			if (on_curr_page) lineno++;
 			if (curr == page_start)
 			    on_curr_page = TRUE;
 			else if (curr == page_end)
 			    on_curr_page = FALSE;
-			if (curr->identifier.a_void && pmatch(searchbuf, curr->str)) {
-			    toggle_menu_curr(window, curr, lineno, on_curr_page, counting, count);
+			if (curr->identifier.a_void
+			    && pmatchi(searchbuf, curr->str)) {
+			    toggle_menu_curr(window, curr, lineno,
+					     on_curr_page, counting, count);
 			    if (cw->how == PICK_ONE) {
 				finished = TRUE;
 				break;