[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emulation/edt-mapper.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emulation/edt-mapper.el,v |
Date: |
Sun, 21 Oct 2007 17:22:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 07/10/21 17:22:06
Index: emulation/edt-mapper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/edt-mapper.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- emulation/edt-mapper.el 26 Jul 2007 05:26:49 -0000 1.20
+++ emulation/edt-mapper.el 21 Oct 2007 17:22:03 -0000 1.21
@@ -118,17 +118,17 @@
;;; Decide Emacs Variant, GNU Emacs or XEmacs (aka Lucid Emacs).
;;; Determine Window System, and X Server Vendor (if appropriate).
;;;
-(defconst edt-x-emacs-p (string-match "XEmacs" emacs-version)
+(defconst (featurep 'xemacs) (string-match "XEmacs" emacs-version)
"Non-nil if we are running XEmacs version 19, or higher.")
-(defconst edt-emacs-variant (if edt-x-emacs-p "xemacs" "gnu")
+(defconst edt-emacs-variant (if (featurep 'xemacs) "xemacs" "gnu")
"Indicates Emacs variant: GNU Emacs or XEmacs \(aka Lucid Emacs\).")
-(defconst edt-window-system (if edt-x-emacs-p (console-type) window-system)
+(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 edt-x-emacs-p
+ (if (featurep 'xemacs)
;; The Cygwin window manager has a `/' in its
;; name, which breaks the generated file name of
;; the custom key map file. Replace `/' with a
@@ -245,7 +245,7 @@
;;; function-key-map.
;;;
(cond
- (edt-x-emacs-p
+ ((featurep 'xemacs)
(setq edt-return-seq (read-key-sequence "Hit carriage-return <CR> to
continue "))
(setq edt-return (concat "[" (format "%s" (event-key (aref edt-return-seq
0))) "]")))
(t
@@ -327,8 +327,10 @@
;;;
;;; Key mapping functions
;;;
-(defun edt-lucid-map-key (ident descrip)
+(defun edt-map-key (ident descrip)
(interactive)
+ (if (featurep 'xemacs)
+ (progn
(setq edt-key-seq (read-key-sequence (format "Press %s%s: " ident descrip)))
(setq edt-key (concat "[" (format "%s" (event-key (aref edt-key-seq 0)))
"]"))
(cond ((not (equal edt-key edt-return))
@@ -340,11 +342,7 @@
(t
(set-buffer "Keys")
(insert (format " (\"%s\" . \"\" )\n" ident))
- (set-buffer "Directions")))
- edt-key)
-
-(defun edt-gnu-map-key (ident descrip)
- (interactive)
+ (set-buffer "Directions"))))
(setq edt-key (read-key-sequence (format "Press %s%s: " ident descrip)))
(cond ((not (equal edt-key edt-return))
(set-buffer "Keys")
@@ -357,10 +355,9 @@
(t
(set-buffer "Keys")
(insert (format " (\"%s\" . \"\" )\n" ident))
- (set-buffer "Directions")))
+ (set-buffer "Directions"))))
edt-key)
-(fset 'edt-map-key (if edt-x-emacs-p 'edt-lucid-map-key 'edt-gnu-map-key))
(set-buffer "Keys")
(insert "
;;
@@ -494,7 +491,7 @@
;;;
;;; Restore function-key-map.
;;;
-(if (and edt-window-system (not edt-x-emacs-p))
+(if (and edt-window-system (not (featurep 'xemacs)))
(setq function-key-map edt-save-function-key-map))
(setq EDT-key-name "")
(while (not
- [Emacs-diffs] Changes to emacs/lisp/emulation/edt-mapper.el,v,
Dan Nicolaescu <=