CVS update by aidan xemacs/lisp ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/07/16 14:26:06

  Modified:    xemacs/lisp ChangeLog x-init.el
Log:
Do the XFree86 startup heuristics for xorg, Cygwin too.

Revision  Changes    Path
1.811     +5 -0      XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -p -r1.810 -r1.811
--- ChangeLog	2007/06/29 09:44:42	1.810
+++ ChangeLog	2007/07/16 12:26:00	1.811
@@ -1,3 +1,8 @@
+2007-07-16  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* x-init.el (x-initialize-keyboard):
+	Treat Cygwin and X.org as XFree86 on startup. 
+
 2007-06-19  Ron Isaacson  <Ron.Isaacson at morganstanley.com>
 
 	* frame.el (other-frame): Stop other-frame cycling through all frames.



1.19      +1 -1      XEmacs/xemacs/lisp/x-init.el

Index: x-init.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-init.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- x-init.el	2006/06/25 17:27:29	1.18
+++ x-init.el	2007/07/16 12:26:03	1.19
@@ -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)))))