(read_key_sequence): When converting upcase fn key to

downcase, update fkey and keytran so `backspace' gets translated.

(read_avail_input): Don't signal SIGHUP in batch mode.

diff --git a/src/keyboard.c b/src/keyboard.c
index ad257324d8939a09abaf9e096945f4170a9f703e..5f747183ce60ab91c8746fa8c9469d2b6d575d5e 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6718,7 +6718,12 @@ read_avail_input (expected)
        /* ??? Is it really right to send the signal just to this process
           rather than to the whole process group?
           Perhaps on systems with FIONREAD Emacs is alone in its group.  */
-       kill (getpid (), SIGHUP);
+       {
+         if (! noninteractive)
+           kill (getpid (), SIGHUP);
+         else
+           n_to_read = 0;
+       }
       if (n_to_read == 0)
        return 0;
       if (n_to_read > sizeof cbuf)
@@ -9421,6 +9426,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
 
              keybuf[t - 1] = new_key;
              mock_input = max (t, mock_input);
+             fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1;
+             keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1;
 
              goto replay_sequence;
            }