Commit 6687ffc7 authored by Eli Zaretskii's avatar Eli Zaretskii

Replace `/' with a `-', to fix a problem on Cygwin.

parent 09e5121d
......@@ -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.")
......
......@@ -3,8 +3,8 @@
;; Copyright (C) 1986, 1992, 1993, 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.
......@@ -339,8 +339,12 @@ This means that an edt-user.el file was found in the user's `load-path'.")
(defconst edt-xserver (if (eq edt-window-system 'x)
(if edt-x-emacs19-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.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment