Mercurial > emacs
changeset 74641:11fae7eadf2d
Replace `/' with a `-', to fix a problem on Cygwin.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 15 Dec 2006 16:24:04 +0000 |
| parents | 29deb6f55604 |
| children | ee3e5cf45b69 |
| files | lisp/emulation/edt-mapper.el lisp/emulation/edt.el |
| diffstat | 2 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emulation/edt-mapper.el Fri Dec 15 16:11:08 2006 +0000 +++ b/lisp/emulation/edt-mapper.el Fri Dec 15 16:24:04 2006 +0000 @@ -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.")
--- a/lisp/emulation/edt.el Fri Dec 15 16:11:08 2006 +0000 +++ b/lisp/emulation/edt.el Fri Dec 15 16:24:04 2006 +0000 @@ -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 @@ (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.")