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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/08 22:07:57

Index: calc/calc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- calc/calc.el        1 Apr 2008 02:06:44 -0000       1.106
+++ calc/calc.el        8 Apr 2008 22:07:54 -0000       1.107
@@ -1001,10 +1001,7 @@
 (mapc (lambda (v) (or (boundp v) (set v nil)))
       calc-local-var-list)
 
-(defvar calc-mode-map nil
-  "The key map for Calc.")
-
-(or calc-mode-map
+(defvar calc-mode-map
     (let ((map (make-keymap)))
       (suppress-keymap map t)
       (define-key map "+" 'calc-plus)
@@ -1041,12 +1038,12 @@
                     ":\\|!()[]<>{},;=~`\C-k\M-k\C-w\M-w\C-y\C-_"))
       (mapc (lambda (x) (define-key map (char-to-string x) 'calcDigit-start))
             "_0123456789.#@")
-      (setq calc-mode-map map)))
+    map)
+  "The key map for Calc.")
+
 
-(defvar calc-digit-map nil
-  "The key map for entering Calc digits.")
 
-(or calc-digit-map
+(defvar calc-digit-map
     (let ((map (make-keymap)))
       (if (featurep 'xemacs)
           (map-keymap (function
@@ -1070,7 +1067,8 @@
       (define-key map "'" 'calcDigit-algebraic)
       (define-key map "`" 'calcDigit-edit)
       (define-key map "\C-g" 'abort-recursive-edit)
-      (setq calc-digit-map map)))
+    map)
+  "The key map for entering Calc digits.")
 
 (mapc (lambda (x)
        (condition-case err
@@ -1096,10 +1094,7 @@
                  '("\C-d"))
        '("\177" "\C-d")))
 
-(defvar calc-dispatch-map nil
-  "The key map for starting Calc.")
-
-(or calc-dispatch-map
+(defvar calc-dispatch-map
     (let ((map (make-keymap)))
       (mapc (lambda (x)
               (define-key map (char-to-string (car x)) (cdr x))
@@ -1146,48 +1141,12 @@
                ( ?/ . calc-same-interface )
                ( ?+ . calc-same-interface )
                ( ?- . calc-same-interface ) ))
-      (setq calc-dispatch-map map)))
-
-;;;; (Autoloads here)
-(mapc
- (lambda (x) (dolist (func (cdr x)) (autoload func (car x))))
-    '(
-
- ("calc-aent" calc-alg-digit-entry calc-alg-entry
-    calc-check-user-syntax calc-do-alg-entry calc-do-calc-eval
-    calc-do-quick-calc calc-match-user-syntax math-build-parse-table
-    math-find-user-tokens math-read-expr-list math-read-exprs math-read-if
-    math-read-token math-remove-dashes math-read-preprocess-string)
-
- ("calc-embed" calc-do-embedded-activate)
-
- ("calc-misc"
-    calc-do-handle-whys calc-do-refresh calc-num-prefix-name
-    calc-record-list calc-record-why calc-report-bug calc-roll-down-stack
-    calc-roll-up-stack calc-temp-minibuffer-message calcFunc-floor
-    calcFunc-inv calcFunc-trunc math-concat math-constp math-div2
-    math-div2-bignum math-do-working math-evenp math-fixnatnump
-    math-fixnump math-floor math-imod math-ipow math-looks-negp math-mod
-    math-negp math-posp math-pow math-read-radix-digit math-reject-arg
-    math-trunc math-zerop)))
-
-(mapc
- (lambda (x) (dolist (cmd (cdr x)) (autoload cmd (car x) nil t)))
-    '(
-
- ("calc-aent" calc-algebraic-entry calc-auto-algebraic-entry
-    calcDigit-algebraic calcDigit-edit)
-
- ("calc-misc" another-calc calc-big-or-small calc-dispatch-help
-    calc-help calc-info calc-info-goto-node calc-info-summary calc-inv
-    calc-last-args-stub
-    calc-missing-key calc-mod calc-other-window calc-over calc-percent
-    calc-pop-above calc-power calc-roll-down calc-roll-up
-    calc-shift-Y-prefix-help calc-tutorial calcDigit-letter
-    report-calc-bug)
+    map)
+  "The key map for starting Calc.")
 
- ("calc-yank" calc-yank)))
 
+;;;; (Autoloads here)
+(load "calc-loaddefs.el" nil t)
 
 ;;;###autoload (define-key ctl-x-map "*" 'calc-dispatch)