Mercurial > emacs
changeset 45888:61b39d1554ee
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.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Tue, 18 Jun 2002 04:41:13 +0000 |
| parents | 8aa6e4d588ce |
| children | 0d2a977d3d32 |
| files | src/ChangeLog src/macterm.c |
| diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jun 17 22:22:03 2002 +0000 +++ b/src/ChangeLog Tue Jun 18 04:41:13 2002 +0000 @@ -1,3 +1,8 @@ +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> * window.c (Fset_window_configuration): Lisp_Object/int mixup. @@ -12,6 +17,9 @@ 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 when first called. Dispose of result_desc only when there is no error. (Fdo_applescript): Use %d format specifier instead of %ld.
--- a/src/macterm.c Mon Jun 17 22:22:03 2002 +0000 +++ b/src/macterm.c Tue Jun 18 04:41:13 2002 +0000 @@ -12616,11 +12616,17 @@ the_modifiers |= shift_modifier; if (er.modifiers & controlKey) the_modifiers |= ctrl_modifier; - /* use option or command key as meta depending on value of - mac-command-key-is-meta */ + /* Use option or command key as meta depending on value of + mac-command-key-is-meta. */ if (er.modifiers & (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey)) 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; {