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.

2 files changed, 16 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f8a4818d8d2..76f09a4712c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/macterm.c b/src/macterm.c
index f3258cbb7fe..dacc63ffe96 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12616,11 +12616,17 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
           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;
                                 
         {