[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el,v |
Date: |
Mon, 29 Oct 2007 15:33:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 07/10/29 15:33:06
Index: calc/calc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- calc/calc.el 27 Oct 2007 20:24:52 -0000 1.92
+++ calc/calc.el 29 Oct 2007 15:32:33 -0000 1.93
@@ -821,9 +821,6 @@
(defvar calc-embedded-mode-hook nil
"Hook run when starting embedded mode.")
-;; Verify that Calc is running on the right kind of system.
-(defvar calc-emacs-type-lucid (not (not (string-match "Lucid" emacs-version))))
-
;; Set up the autoloading linkage.
(let ((name (and (fboundp 'calc-dispatch)
(eq (car-safe (symbol-function 'calc-dispatch)) 'autoload)
@@ -968,7 +965,7 @@
(defvar calc-digit-map
(let ((map (make-keymap)))
- (if calc-emacs-type-lucid
+ (if (featurep 'xemacs)
(map-keymap (function
(lambda (keys bind)
(define-key map keys
@@ -999,7 +996,7 @@
(define-key calc-mode-map x 'calc-pop)
(define-key calc-mode-map
(if (vectorp x)
- (if calc-emacs-type-lucid
+ (if (featurep 'xemacs)
(if (= (length x) 1)
(vector (if (consp (aref x 0))
(cons 'meta (aref x 0))
@@ -2109,13 +2106,13 @@
(calc-prev-char nil)
(calc-prev-prev-char nil)
(calc-buffer (current-buffer))
- (buf (if calc-emacs-type-lucid
+ (buf (if (featurep 'xemacs)
(catch 'calc-foo
(catch 'execute-kbd-macro
(throw 'calc-foo
(read-from-minibuffer
"Calc: " "" calc-digit-map)))
- (error "Lucid Emacs requires RET after %s"
+ (error "XEmacs requires RET after %s"
"digit entry in kbd macro"))
(let ((old-esc (lookup-key global-map "\e")))
(unwind-protect
@@ -3646,7 +3643,7 @@
;;; Functions needed for Lucid Emacs support.
(defun calc-read-key (&optional optkey)
- (cond (calc-emacs-type-lucid
+ (cond ((featurep 'xemacs)
(let ((event (next-command-event)))
(let ((key (event-to-character event t t)))
(or key optkey (error "Expected a plain keystroke"))
@@ -3664,7 +3661,7 @@
(defun calc-clear-unread-commands ()
(if (featurep 'xemacs)
- (calc-emacs-type-lucid (setq unread-command-event nil))
+ (setq unread-command-event nil)
(setq unread-command-events nil)))
(when calc-always-load-extensions