[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el [lexbind] |
Date: |
Mon, 25 Oct 2004 00:42:55 -0400 |
Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.13.2.5 emacs/lisp/calc/calc.el:1.13.2.6
*** emacs/lisp/calc/calc.el:1.13.2.5 Mon Oct 25 04:19:45 2004
--- emacs/lisp/calc/calc.el Mon Oct 25 04:22:24 2004
***************
*** 656,667 ****
;; Verify that Calc is running on the right kind of system.
- (defconst calc-emacs-type-epoch (and (fboundp 'epoch::version)
epoch::version))
- (defvar calc-emacs-type-19 (not (or calc-emacs-type-epoch
- (string-lessp emacs-version "19"))))
(defvar calc-emacs-type-lucid (not (not (string-match "Lucid"
emacs-version))))
- (defvar calc-emacs-type-gnu19 (and calc-emacs-type-19
- (not calc-emacs-type-lucid)))
;; Set up the standard keystroke (M-#) to run the Calculator, if that key
;; has not yet been bound to anything. For best results, the user should
--- 656,662 ----
***************
*** 827,834 ****
(if (eq bind 'undefined)
'undefined 'calcDigit-nondigit))))
calc-mode-map)
! (let ((cmap (if calc-emacs-type-19 (nth 1 calc-mode-map) calc-mode-map))
! (dmap (if calc-emacs-type-19 (nth 1 map) map))
(i 0))
(while (< i 128)
(aset dmap i
--- 822,829 ----
(if (eq bind 'undefined)
'undefined 'calcDigit-nondigit))))
calc-mode-map)
! (let ((cmap (nth 1 calc-mode-map))
! (dmap (nth 1 map))
(i 0))
(while (< i 128)
(aset dmap i
***************
*** 998,1006 ****
(use-global-map map)
(use-local-map nil)
(read-key-sequence
! (if (commandp (key-binding (if calc-emacs-type-19
! (vector (cdr key))
! (char-to-string (cdr key)))))
"" prompt2)))
(use-global-map glob)
(use-local-map loc)))))
--- 993,999 ----
(use-global-map map)
(use-local-map nil)
(read-key-sequence
! (if (commandp (key-binding (vector (cdr key))))
"" prompt2)))
(use-global-map glob)
(use-local-map loc)))))
***************
*** 3425,3435 ****
(let ((key (event-to-character event t t)))
(or key optkey (error "Expected a plain keystroke"))
(cons key event))))
- (calc-emacs-type-gnu19
- (let ((key (read-event)))
- (cons key key)))
(t
! (let ((key (read-char)))
(cons key key)))))
(defun calc-unread-command (&optional input)
--- 3418,3425 ----
(let ((key (event-to-character event t t)))
(or key optkey (error "Expected a plain keystroke"))
(cons key event))))
(t
! (let ((key (read-event)))
(cons key key)))))
(defun calc-unread-command (&optional input)