# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1235640911 -32400
# Node ID f1bb4cc3144a3a4b1f9431cbaa3adc9938357354
# Parent  4527fc976aa383f67a80cfdd760da45e8ce45a14# Parent  a9f83990e6bf2c423b10d6e8f9b5fc0c14ae3831
Merge: fixup ChangeLogs.

diff -r a9f83990e6bf -r f1bb4cc3144a man/ChangeLog
--- a/man/ChangeLog	Sun Feb 22 19:57:28 2009 +0000
+++ b/man/ChangeLog	Thu Feb 26 18:35:11 2009 +0900
@@ -1,3 +1,12 @@
+2009-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q3.0.12): New node for Meta key on Mac.
+	(Top):
+	(Editing):
+	(Q3.0.11):
+	(Q3.1.1):
+	Fix up Next/Prev/Menu references.
+
 2009-02-04  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* xemacs/xemacs.texi (Top): 
diff -r a9f83990e6bf -r f1bb4cc3144a man/xemacs-faq.texi
--- a/man/xemacs-faq.texi	Sun Feb 22 19:57:28 2009 +0000
+++ b/man/xemacs-faq.texi	Thu Feb 26 18:35:11 2009 +0900
@@ -341,6 +341,7 @@
 * Q3.0.9::    HP Alt key as Meta.
 * Q3.0.10::   Why does edt emulation not work?
 * Q3.0.11::   How can I emulate VI and use it as my default mode?
+* Q3.0.12::   Mac Alt/Option key as Meta.
 
 3.1: The Mouse
 * Q3.1.1::    How can I turn off Mouse pasting?
@@ -4607,6 +4608,7 @@
 * Q3.0.9::    HP Alt key as Meta.
 * Q3.0.10::   Why does edt emulation not work?
 * Q3.0.11::   How can I emulate VI and use it as my default mode?
+* Q3.0.12::   Mac Alt/Option key as Meta.
 
 3.1: The Mouse
 * Q3.1.1::    How can I turn off Mouse pasting?
@@ -4876,7 +4878,7 @@
 (global-set-key [(control h)] 'help-for-help)
 @end lisp
 
-@node Q3.0.11, Q3.1.1, Q3.0.10, Editing
+@node Q3.0.11, Q3.0.12, Q3.0.10, Editing
 @unnumberedsubsec Q3.0.11: How can I emulate VI and use it as my default mode?
 
 Our recommended VI emulator is viper. To make viper-mode the default,
@@ -4893,9 +4895,32 @@
 it, otherwise some minor modes may not get viper-ized.
 @end quotation
 
+@node Q3.0.12, Q3.1.1, Q3.0.11, Editing
+@unnumberedsubsec Q3.0.12: Mac Alt/Option key as Meta.
+
+Due to the Apple Command key being Meta, I can't use XEmacs on OS X.
+
+Didier Verna suggests:
+
+I use an X version of XEmacs on a Mac every day.  You have to tweak the
+keyboard configuration a bit but that's all.
+
+Here's my Xmodmap file on Darwin:
+
+@example
+clear mod1
+clear mod2
+keycode 66 = Meta_L
+keycode 63 = Mode_switch
+add mod1 = Meta_L
+@end example
+
+This leaves the command key alone and uses alt/option for Meta.
+
+
 @unnumberedsec 3.1: The Mouse
 
-@node Q3.1.1, Q3.1.2, Q3.0.11, Editing
+@node Q3.1.1, Q3.1.2, Q3.0.12, Editing
 @unnumberedsubsec Q3.1.1: How can I turn off Mouse pasting?
 
 I keep hitting the middle mouse button by accident and getting stuff
diff -r a9f83990e6bf -r f1bb4cc3144a src/ChangeLog
--- a/src/ChangeLog	Sun Feb 22 19:57:28 2009 +0000
+++ b/src/ChangeLog	Thu Feb 26 18:35:11 2009 +0900
@@ -1,3 +1,7 @@
+2009-02-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* eval.c (skip_debugger): Fix typo in preceding comment.
+
 2009-02-11  Jerry James  <james@xemacs.org>
 
 	* number-gmp.c (bigfloat_to_string): Fix broken string conversion.
diff -r a9f83990e6bf -r f1bb4cc3144a src/eval.c
--- a/src/eval.c	Sun Feb 22 19:57:28 2009 +0000
+++ b/src/eval.c	Thu Feb 26 18:35:11 2009 +0900
@@ -600,7 +600,7 @@
 
 /* Return 1 if an error with condition-symbols CONDITIONS,
    and described by SIGNAL-DATA, should skip the debugger
-   according to debugger-ignore-errors.  */
+   according to debug-ignored-errors.  */
 
 static int
 skip_debugger (Lisp_Object conditions, Lisp_Object data)