# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1132820441 0
# Node ID cb7a3d50315346d1bad73d913444e39c0d1b3073
# Parent  f7f6ee6060c8a64004a0fd3782634ff6cb235a9e
*** empty log message ***

diff -r f7f6ee6060c8 -r cb7a3d503153 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Nov 24 08:20:16 2005 +0000
+++ b/lisp/ChangeLog	Thu Nov 24 08:20:41 2005 +0000
@@ -1,3 +1,7 @@
+2005-11-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el: Make modifier `ctrl' an alias of `control'.
+
 2005-11-24  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-speedbar-auto-raise): New function
diff -r f7f6ee6060c8 -r cb7a3d503153 man/ChangeLog
--- a/man/ChangeLog	Thu Nov 24 08:20:16 2005 +0000
+++ b/man/ChangeLog	Thu Nov 24 08:20:41 2005 +0000
@@ -1,3 +1,12 @@
+2005-11-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macos.texi (Mac Input): Remove description of
+	mac-command-key-is-meta.  Add descriptions of
+	mac-control-modifier, mac-command-modifier, and
+	mac-option-modifier.
+	(Mac International): Fix description of conversion of clipboard	data.
+	(Mac Font Specs): Add example of font customization by face attributes.
+
 2005-11-22  Nick Roberts  <nickrob@snap.net.nz>
 
 	* building.texi (Watch Expressions): Expand description.
diff -r f7f6ee6060c8 -r cb7a3d503153 src/ChangeLog
--- a/src/ChangeLog	Thu Nov 24 08:20:16 2005 +0000
+++ b/src/ChangeLog	Thu Nov 24 08:20:41 2005 +0000
@@ -1,3 +1,14 @@
+2005-11-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (Qcontrol): Rename from Qctrl.  All uses changed.
+	(syms_of_macterm): Staticpro Qcontrol, Qmeta, Qalt, Qhyper,
+	Qsuper, and Qmodifier_value.
+	(Vmac_control_modifier, Vmac_option_modifier)
+	(Vmac_command_modifier, Vmac_function_modifier)
+	(Vmac_emulate_three_button_mouse, Vmac_wheel_button_is_mouse_2)
+	(Vmac_pass_command_to_system, Vmac_pass_control_to_system)
+	(Vmac_charset_info_alist): Doc fixes.
+
 2005-11-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* emacs.c (main) [MAC_OSX]: Change working directory to home