aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1993-05-19 14:26:34 +0000
committerRichard M. Stallman1993-05-19 14:26:34 +0000
commita8ee7ef92842f293dd9731a6d119531997386cf2 (patch)
tree27d6c2e26b7d93a7a8a217207beda01390a16c0d /src
parent4554406a819666ce6487ceb1b0b1c5d668d41dc8 (diff)
downloademacs-a8ee7ef92842f293dd9731a6d119531997386cf2.tar.gz
emacs-a8ee7ef92842f293dd9731a6d119531997386cf2.zip
(Fcurrent_input_mode): Return META as 3-way flag.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index bc990170e8b..733a944ff33 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4496,7 +4496,8 @@ Second arg FLOW non-nil means use ^S/^Q flow control for output to terminal\n\
4496Third arg META t means accept 8-bit input (for a Meta key).\n\ 4496Third arg META t means accept 8-bit input (for a Meta key).\n\
4497 META nil means ignore the top bit, on the assumption it is parity.\n\ 4497 META nil means ignore the top bit, on the assumption it is parity.\n\
4498 Otherwise, accept 8-bit input and don't use the top bit for Meta.\n\ 4498 Otherwise, accept 8-bit input and don't use the top bit for Meta.\n\
4499Optional fourth arg QUIT if non-nil specifies character to use for quitting.") 4499Optional fourth arg QUIT if non-nil specifies character to use for quitting.\n\
4500See also `current-input-mode'.")
4500 (interrupt, flow, meta, quit) 4501 (interrupt, flow, meta, quit)
4501 Lisp_Object interrupt, flow, meta, quit; 4502 Lisp_Object interrupt, flow, meta, quit;
4502{ 4503{
@@ -4543,18 +4544,20 @@ The value is a list of the form (INTERRUPT FLOW META QUIT), where\n\
4543 nil, Emacs is using CBREAK mode.\n\ 4544 nil, Emacs is using CBREAK mode.\n\
4544 FLOW is non-nil if Emacs uses ^S/^Q flow control for output to the\n\ 4545 FLOW is non-nil if Emacs uses ^S/^Q flow control for output to the\n\
4545 terminal; this does not apply if Emacs uses interrupt-driven input.\n\ 4546 terminal; this does not apply if Emacs uses interrupt-driven input.\n\
4546 META is non-nil if Emacs is accepting 8-bit input; otherwise, Emacs\n\ 4547 META is t if accepting 8-bit input with 8th bit as Meta flag.\n\
4547 clears the eighth bit of every input character.\n\ 4548 META nil means ignoring the top bit, on the assumption it is parity.\n\
4549 META is neither t nor nil if accepting 8-bit input and using\n\
4550 all 8 bits as the character code.\n\
4548 QUIT is the character Emacs currently uses to quit.\n\ 4551 QUIT is the character Emacs currently uses to quit.\n\
4549The elements of this list correspond to the arguments of\n\ 4552The elements of this list correspond to the arguments of\n\
4550set-input-mode.") 4553`set-input-mode'.")
4551 () 4554 ()
4552{ 4555{
4553 Lisp_Object val[4]; 4556 Lisp_Object val[4];
4554 4557
4555 val[0] = interrupt_input ? Qt : Qnil; 4558 val[0] = interrupt_input ? Qt : Qnil;
4556 val[1] = flow_control ? Qt : Qnil; 4559 val[1] = flow_control ? Qt : Qnil;
4557 val[2] = meta_key ? Qt : Qnil; 4560 val[2] = meta_key == 2 ? make_number (0) : meta_key == 1 ? Qt : Qnil;
4558 XSETINT (val[3], quit_char); 4561 XSETINT (val[3], quit_char);
4559 4562
4560 return Flist (val, sizeof (val) / sizeof (val[0])); 4563 return Flist (val, sizeof (val) / sizeof (val[0]));