Mercurial > emacs

diff src/macterm.c @ 45888:61b39d1554ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e17ed720205d
children afcf154bf656
line wrap: on
line diff
--- 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;
 				
 	{