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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/06/12 03:51:20

Index: edt.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/edt.el,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- edt.el      6 May 2008 03:27:57 -0000       1.63
+++ edt.el      12 Jun 2008 03:51:20 -0000      1.64
@@ -315,15 +315,17 @@
 (defconst edt-window-system (if (featurep 'emacs) window-system (console-type))
   "Indicates window system \(in GNU Emacs\) or console type \(in XEmacs\).")
 
-(defconst edt-xserver (if (eq edt-window-system 'x)
-                         (if (featurep 'xemacs)
+(declare-function x-server-vendor "xfns.c" (&optional terminal))
+
+(defconst edt-xserver (when (eq edt-window-system 'x)
                              ;; 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.
+                       (if (featurep 'xemacs)
                              (replace-in-string (x-server-vendor) "[ /]" "-")
-                           (subst-char-in-string ?/ ?- (subst-char-in-string ? 
 ?- (x-server-vendor))))
-                       nil)
+                         (replace-regexp-in-string "[ /]" "-"
+                                                   (x-server-vendor))))
   "Indicates X server vendor name, if applicable.")
 
 (defvar edt-keys-file nil