/[emacs]/emacs/lisp/calc/calc-ext.el
ViewVC logotype

Diff of /emacs/lisp/calc/calc-ext.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.13.4.1 by handa, Fri Apr 16 12:50:11 2004 UTC revision 1.13.4.2 by miles, Fri Oct 22 10:13:34 2004 UTC
# Line 640  Line 640 
640               (define-key calc-mode-map (format "u%c" x) 'calc-quick-units)))               (define-key calc-mode-map (format "u%c" x) 'calc-quick-units)))
641            "0123456789")            "0123456789")
642    
  (or calc-emacs-type-19 (progn  
643    (let ((i ?A))    (let ((i ?A))
644      (while (and (<= i ?z) (vectorp calc-mode-map))      (while (<= i ?z)
645        (if (eq (car-safe (aref calc-mode-map i)) 'keymap)        (if (eq (car-safe (aref (nth 1 calc-mode-map) i)) 'keymap)
646            (aset calc-mode-map i            (aset (nth 1 calc-mode-map) i
647                  (cons 'keymap (cons (cons ?\e (aref calc-mode-map i))                  (cons 'keymap (cons (cons ?\e (aref (nth 1 calc-mode-map) i))
648                                      (cdr (aref calc-mode-map i))))))                                      (cdr (aref (nth 1 calc-mode-map) i))))))
649        (setq i (1+ i))))        (setq i (1+ i))))
650      
651    (setq calc-alg-map (copy-sequence calc-mode-map)    (setq calc-alg-map (copy-keymap calc-mode-map)
652          calc-alg-esc-map (copy-sequence esc-map))          calc-alg-esc-map (copy-keymap esc-map))
653    (let ((i 32))    (let ((i 32))
654      (while (< i 127)      (while (< i 127)
655        (or (memq i '(?' ?` ?= ??))        (or (memq i '(?' ?` ?= ??))
656            (aset calc-alg-map i 'calc-auto-algebraic-entry))            (aset (nth 1 calc-alg-map) i 'calc-auto-algebraic-entry))
657        (or (memq i '(?# ?x ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))        (or (memq i '(?# ?x ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
658            (aset calc-alg-esc-map i (aref calc-mode-map i)))            (aset (nth 1 calc-alg-esc-map) i (aref (nth 1 calc-mode-map) i)))
659        (setq i (1+ i))))        (setq i (1+ i))))
660    (define-key calc-alg-map "\e" calc-alg-esc-map)    (define-key calc-alg-map "\e" calc-alg-esc-map)
661    (define-key calc-alg-map "\e\t" 'calc-roll-up)    (define-key calc-alg-map "\e\t" 'calc-roll-up)
662    (define-key calc-alg-map "\e\C-m" 'calc-last-args-stub)    (define-key calc-alg-map "\e\C-m" 'calc-last-args-stub)
663    (define-key calc-alg-map "\e\177" 'calc-pop-above)    (define-key calc-alg-map "\e\177" 'calc-pop-above)
  ))  
664    
665    ;; The following is a relic for backward compatability only.    ;; The following is a relic for backward compatability only.
666    ;; The calc-define property list is now the recommended method.    ;; The calc-define property list is now the recommended method.
# Line 1395  calc-kill calc-kill-region calc-yank)))) Line 1393  calc-kill calc-kill-region calc-yank))))
1393                         (and (>= last-command-char 0) (< last-command-char ? )                         (and (>= last-command-char 0) (< last-command-char ? )
1394                              (not (memq last-command-char '(?\e)))))                              (not (memq last-command-char '(?\e)))))
1395                     (calc-wrapper))  ; clear flags if not a Calc command.                     (calc-wrapper))  ; clear flags if not a Calc command.
1396                 (if calc-emacs-type-19                 (setq last-command-event (cdr event))
                    (setq last-command-event (cdr event)))  
1397                 (if (or (not (integerp last-command-char))                 (if (or (not (integerp last-command-char))
1398                         (eq last-command-char ?-))                         (eq last-command-char ?-))
1399                     (calc-unread-command)                     (calc-unread-command)

Legend:
Removed from v.1.13.4.1  
changed lines
  Added in v.1.13.4.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26