Merge branch 'NetHack-3.6'
This commit is contained in:
@@ -661,7 +661,7 @@ curses_message_win_getline(const char *prompt, char *answer, int buffer)
|
||||
goto alldone;
|
||||
case '\177': /* DEL/Rubout */
|
||||
case KEY_DC: /* delete-character */
|
||||
case '\b': /* ^H (Backspace: '\011') */
|
||||
case '\b': /* ^H (Backspace: '\010') */
|
||||
case KEY_BACKSPACE:
|
||||
if (len < 1) {
|
||||
len = 1;
|
||||
@@ -887,7 +887,7 @@ boolean restoring_msghist;
|
||||
static int stash_count;
|
||||
static nhprev_mesg *stash_head = 0;
|
||||
#ifdef DUMPLOG
|
||||
extern unsigned saved_pline_index; /* pline.c */
|
||||
/* extern unsigned g.saved_pline_index; */ /* pline.c */
|
||||
#endif
|
||||
|
||||
if (restoring_msghist && !initd) {
|
||||
@@ -899,8 +899,8 @@ boolean restoring_msghist;
|
||||
last_mesg = (nhprev_mesg *) 0; /* no need to remember the tail */
|
||||
initd = TRUE;
|
||||
#ifdef DUMPLOG
|
||||
/* this suffices; there's no need to scrub saved_pline[] pointers */
|
||||
saved_pline_index = 0;
|
||||
/* this suffices; there's no need to scrub g.saved_pline[] pointers */
|
||||
g.saved_pline_index = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -792,6 +792,13 @@ curses_convert_keys(int key)
|
||||
|
||||
/* Handle arrow keys */
|
||||
switch (key) {
|
||||
case KEY_BACKSPACE:
|
||||
/* we can't distinguish between a separate backspace key and
|
||||
explicit Ctrl+H intended to rush to the left; without this,
|
||||
a value for ^H greater than 255 is passed back to core's
|
||||
readchar() and stripping the value down to 0..255 yields ^G! */
|
||||
ret = C('H');
|
||||
break;
|
||||
case KEY_LEFT:
|
||||
if (iflags.num_pad) {
|
||||
ret = '4';
|
||||
|
||||
Reference in New Issue
Block a user