# HG changeset patch
# User aidan
# Date 1184588763 0
# Node ID aa22980554d9c86731b99fccc20231883bd8960a
# Parent  10c99e4eefaed9d1878c136a0bada7c560ee5ac0
[xemacs-hg @ 2007-07-16 12:26:00 by aidan]
Do the XFree86 startup heuristics for xorg, Cygwin too.

diff -r 10c99e4eefae -r aa22980554d9 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jul 15 21:51:42 2007 +0000
+++ b/lisp/ChangeLog	Mon Jul 16 12:26:03 2007 +0000
@@ -1,3 +1,8 @@
+2007-07-16  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* x-init.el (x-initialize-keyboard):
+	Treat Cygwin and X.org as XFree86 on startup. 
+
 2007-06-19  Ron Isaacson  <Ron.Isaacson@morganstanley.com>
 
 	* frame.el (other-frame): Stop other-frame cycling through all frames.
diff -r 10c99e4eefae -r aa22980554d9 lisp/x-init.el
--- a/lisp/x-init.el	Sun Jul 15 21:51:42 2007 +0000
+++ b/lisp/x-init.el	Mon Jul 16 12:26:03 2007 +0000
@@ -232,7 +232,7 @@
 	       (string-equal "X Consortium" vendor))
            ;; Ok, we think this could be a Sun keyboard.  Run the Sun code.
 	   (x-win-init-sun))
-          ((string-match "XFree86" vendor)
+          ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor)
            ;; Those XFree86 people do some weird keysym stuff, too.
 	   (x-win-init-xfree86)))))