Commit b432b442 authored by Andrew Choi's avatar Andrew Choi

2002-06-17 Andrew Choi <akochoi@shaw.ca>

        * macterm.c (XTread_socket): If Vmac_command_key_is_meta is nil,
        test Mac command key as <ALT> key.
parent b8fc5a9c
2002-06-17 Andrew Choi <akochoi@shaw.ca>
* macterm.c (XTread_socket): If Vmac_command_key_is_meta is nil,
test Mac command key as <ALT> key.
2002-06-17 Stefan Monnier <monnier@cs.yale.edu> 2002-06-17 Stefan Monnier <monnier@cs.yale.edu>
* window.c (Fset_window_configuration): Lisp_Object/int mixup. * window.c (Fset_window_configuration): Lisp_Object/int mixup.
...@@ -12,6 +17,9 @@ ...@@ -12,6 +17,9 @@
2002-06-17 Andrew Choi <akochoi@shaw.ca> 2002-06-17 Andrew Choi <akochoi@shaw.ca>
* macterm.c (XTread_socket): If Vmac_command_key_is_meta is nil,
test Mac command key as <ALT> key.
* mac.c (do_applescript): Call initialize_applescript if necessary * mac.c (do_applescript): Call initialize_applescript if necessary
when first called. Dispose of result_desc only when there is no error. when first called. Dispose of result_desc only when there is no error.
(Fdo_applescript): Use %d format specifier instead of %ld. (Fdo_applescript): Use %d format specifier instead of %ld.
......
...@@ -12616,11 +12616,17 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) ...@@ -12616,11 +12616,17 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
the_modifiers |= shift_modifier; the_modifiers |= shift_modifier;
if (er.modifiers & controlKey) if (er.modifiers & controlKey)
the_modifiers |= ctrl_modifier; the_modifiers |= ctrl_modifier;
/* use option or command key as meta depending on value of /* Use option or command key as meta depending on value of
mac-command-key-is-meta */ mac-command-key-is-meta. */
if (er.modifiers if (er.modifiers
& (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey)) & (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey))
the_modifiers |= meta_modifier; the_modifiers |= meta_modifier;
/* If the Mac option key is meta, then make Emacs recognize
the Mac command key as alt. */
if (NILP (Vmac_command_key_is_meta) && (er.modifiers & cmdKey))
the_modifiers |= alt_modifier;
bufp->modifiers = the_modifiers; bufp->modifiers = the_modifiers;
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment