summaryrefslogtreecommitdiff
path: root/lisp/emulation/edt-mapper.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emulation/edt-mapper.el')
-rw-r--r--lisp/emulation/edt-mapper.el12
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index cee60c6ec8e..53bb8e63d33 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -3,8 +3,8 @@
;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
-;; Author: Kevin Gallagher <kevingal@onramp.net>
-;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
+;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
+;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
;; Keywords: emulations
;; This file is part of GNU Emacs.
@@ -129,8 +129,12 @@
(defconst edt-xserver (if (eq edt-window-system 'x)
(if edt-x-emacs-p
- (replace-in-string (x-server-vendor) "[ _]" "-")
- (subst-char-in-string ? ?- (x-server-vendor)))
+ ;; The Cygwin window manager has a `/' in its
+ ;; name, which breaks the generated file name of
+ ;; the custom key map file. Replace `/' with a
+ ;; `-' to work around that.
+ (replace-in-string (x-server-vendor) "[ /]" "-")
+ (subst-char-in-string ?/ ?- (subst-char-in-string ? ?- (x-server-vendor))))
nil)
"Indicates X server vendor name, if applicable.")