[Emacs-diffs] Changes to emacs/lisp/calc/calc.el,v

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       08/09/02 08:49:02

Index: calc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- calc.el     14 Aug 2008 18:35:08 -0000      1.115
+++ calc.el     2 Sep 2008 08:49:01 -0000       1.116
@@ -1096,11 +1096,17 @@
 (defvar calc-dispatch-map
   (let ((map (make-keymap)))
     (mapc (lambda (x)
-            (define-key map (char-to-string (car x)) (cdr x))
-            (when (string-match "abcdefhijklnopqrstuwxyz"
-                                (char-to-string (car x)))
-              (define-key map (char-to-string (- (car x) ?a -1)) (cdr x)))
-            (define-key map (format "\e%c" (car x)) (cdr x)))
+           (let* ((x-chr (car x))
+                  (x-str (char-to-string x-chr))
+                  (x-def (cdr x)))
+             (define-key map x-str x-def)
+             (when (string-match "[a-z]" x-str)
+               ;; Map upper case char to same definition.
+               (define-key map (upcase x-str) x-def)
+               (unless (string-match "[gmv]" x-str)
+                 ;; Map control prefixed char to same definition.
+                 (define-key map (vector (list 'control x-chr)) x-def)))
+             (define-key map (format "\e%c" x-chr) x-def)))
           '( ( ?a . calc-embedded-activate )
              ( ?b . calc-big-or-small )
              ( ?c . calc )