[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el |
Date: |
Tue, 19 Oct 2004 10:28:45 -0400 |
Index: emacs/lisp/calc/calc-ext.el
diff -c emacs/lisp/calc/calc-ext.el:1.16 emacs/lisp/calc/calc-ext.el:1.17
*** emacs/lisp/calc/calc-ext.el:1.16 Fri Mar 26 15:29:41 2004
--- emacs/lisp/calc/calc-ext.el Tue Oct 19 14:21:31 2004
***************
*** 640,668 ****
(define-key calc-mode-map (format "u%c" x) 'calc-quick-units)))
"0123456789")
- (or calc-emacs-type-19 (progn
(let ((i ?A))
! (while (and (<= i ?z) (vectorp calc-mode-map))
! (if (eq (car-safe (aref calc-mode-map i)) 'keymap)
! (aset calc-mode-map i
! (cons 'keymap (cons (cons ?\e (aref calc-mode-map i))
! (cdr (aref calc-mode-map i))))))
(setq i (1+ i))))
!
! (setq calc-alg-map (copy-sequence calc-mode-map)
! calc-alg-esc-map (copy-sequence esc-map))
(let ((i 32))
(while (< i 127)
(or (memq i '(?' ?` ?= ??))
! (aset calc-alg-map i 'calc-auto-algebraic-entry))
(or (memq i '(?# ?x ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
! (aset calc-alg-esc-map i (aref calc-mode-map i)))
(setq i (1+ i))))
(define-key calc-alg-map "\e" calc-alg-esc-map)
(define-key calc-alg-map "\e\t" 'calc-roll-up)
(define-key calc-alg-map "\e\C-m" 'calc-last-args-stub)
(define-key calc-alg-map "\e\177" 'calc-pop-above)
- ))
;; The following is a relic for backward compatability only.
;; The calc-define property list is now the recommended method.
--- 640,666 ----
(define-key calc-mode-map (format "u%c" x) 'calc-quick-units)))
"0123456789")
(let ((i ?A))
! (while (<= i ?z)
! (if (eq (car-safe (aref (nth 1 calc-mode-map) i)) 'keymap)
! (aset (nth 1 calc-mode-map) i
! (cons 'keymap (cons (cons ?\e (aref (nth 1 calc-mode-map) i))
! (cdr (aref (nth 1 calc-mode-map) i))))))
(setq i (1+ i))))
!
! (setq calc-alg-map (copy-keymap calc-mode-map)
! calc-alg-esc-map (copy-keymap esc-map))
(let ((i 32))
(while (< i 127)
(or (memq i '(?' ?` ?= ??))
! (aset (nth 1 calc-alg-map) i 'calc-auto-algebraic-entry))
(or (memq i '(?# ?x ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
! (aset (nth 1 calc-alg-esc-map) i (aref (nth 1 calc-mode-map) i)))
(setq i (1+ i))))
(define-key calc-alg-map "\e" calc-alg-esc-map)
(define-key calc-alg-map "\e\t" 'calc-roll-up)
(define-key calc-alg-map "\e\C-m" 'calc-last-args-stub)
(define-key calc-alg-map "\e\177" 'calc-pop-above)
;; The following is a relic for backward compatability only.
;; The calc-define property list is now the recommended method.
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el,
Jay Belanger <=