diff options
| author | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
| commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
| tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /lisp/emulation/edt-mapper.el | |
| parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
| parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
| download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.bz2 emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'lisp/emulation/edt-mapper.el')
| -rw-r--r-- | lisp/emulation/edt-mapper.el | 12 |
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.") |