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

[Glenn Morris]

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

Index: edt-mapper.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/edt-mapper.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- edt-mapper.el       7 Jun 2008 02:44:49 -0000       1.26
+++ edt-mapper.el       12 Jun 2008 03:52:16 -0000      1.27
@@ -97,37 +97,23 @@
 ;;; Code:
 
 ;;;
-;;;  Make sure we're running Emacs version 19, or higher.
-;;;
-
-(cond
- ((string-lessp emacs-version "19")
-  (insert "
-
-    Whoa!  This isn't going to work...
-
-    You must run edt-mapper.el under Emacs version 19 or higher.
-
-    Press any key to exit.  ")
-  (sit-for 600)
-  (kill-emacs t)))
-
-;;;
 ;;;  Decide Emacs Variant, GNU Emacs or XEmacs (aka Lucid Emacs).
 ;;;  Determine Window System, and X Server Vendor (if appropriate).
 ;;;
 (defconst edt-window-system (if (featurep 'xemacs) (console-type) 
window-system)
   "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.")