[Emacs-diffs] Changes to emacs/lisp/emulation/edt-mapper.el,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/12/15 16:24:04

Index: edt-mapper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/edt-mapper.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- edt-mapper.el       6 Nov 2006 02:35:03 -0000       1.17
+++ edt-mapper.el       15 Dec 2006 16:24:04 -0000      1.18
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006 Free Software Foundation, Inc.
 
-;; Author: Kevin Gallagher <address@hidden>
-;; Maintainer: Kevin Gallagher <address@hidden>
+;; Author: Kevin Gallagher <address@hidden>
+;; Maintainer: Kevin Gallagher <address@hidden>
 ;; 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.")