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

[Jay Belanger]

Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.68 emacs/lisp/calc/calc.el:1.69
*** emacs/lisp/calc/calc.el:1.68        Mon Nov 14 20:13:46 2005
--- emacs/lisp/calc/calc.el     Mon Nov 28 22:12:59 2005
***************
*** 816,826 ****
  ;; Verify that Calc is running on the right kind of system.
  (defvar calc-emacs-type-lucid (not (not (string-match "Lucid" 
emacs-version))))
  
- ;; 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
- ;; do this before Calc is even loaded, so that M-# can auto-load Calc.
- (or (global-key-binding "\e#") (global-set-key "\e#" 'calc-dispatch))
- 
  ;; Set up the autoloading linkage.
  (let ((name (and (fboundp 'calc-dispatch)
                   (eq (car-safe (symbol-function 'calc-dispatch)) 'autoload)
--- 816,821 ----
***************
*** 1046,1059 ****
               ( ?x . calc-quit )
               ( ?y . calc-copy-to-buffer )
               ( ?z . calc-user-invocation )
-              ( ?= . calc-embedded-update-formula )
               ( ?\' . calc-embedded-new-formula )
               ( ?\` . calc-embedded-edit )
               ( ?: . calc-grab-sum-down )
               ( ?_ . calc-grab-sum-across )
               ( ?0 . calc-reset )
               ( ?# . calc-same-interface )
!              ( ?? . calc-dispatch-help ) ))
      map))
  
  ;;;; (Autoloads here)
--- 1041,1060 ----
               ( ?x . calc-quit )
               ( ?y . calc-copy-to-buffer )
               ( ?z . calc-user-invocation )
               ( ?\' . calc-embedded-new-formula )
               ( ?\` . calc-embedded-edit )
               ( ?: . calc-grab-sum-down )
               ( ?_ . calc-grab-sum-across )
               ( ?0 . calc-reset )
+              ( ?? . calc-dispatch-help )
               ( ?# . calc-same-interface )
!              ( ?& . calc-same-interface )
!              ( ?\\ . calc-same-interface )
!              ( ?= . calc-same-interface )
!              ( ?* . calc-same-interface )
!              ( ?/ . calc-same-interface )
!              ( ?+ . calc-same-interface )
!              ( ?- . calc-same-interface ) ))
      map))
  
  ;;;; (Autoloads here)
***************
*** 1095,1101 ****
      report-calc-bug)))
  
  
! ;;;###autoload (global-set-key "\e#" 'calc-dispatch)
  
  ;;;###autoload
  (defun calc-dispatch (&optional arg)
--- 1096,1102 ----
      report-calc-bug)))
  
  
! ;;;###autoload (define-key ctl-x-map "*" 'calc-dispatch)
  
  ;;;###autoload
  (defun calc-dispatch (&optional arg)
***************
*** 3534,3540 ****
  (defun calc-user-invocation ()
    (interactive)
    (unless calc-invocation-macro
!     (error "Use `Z I' inside Calc to define a `M-# Z' keyboard macro"))
    (execute-kbd-macro calc-invocation-macro nil))
  
  ;;; User-programmability.
--- 3535,3541 ----
  (defun calc-user-invocation ()
    (interactive)
    (unless calc-invocation-macro
!     (error "Use `Z I' inside Calc to define a `C-x * Z' keyboard macro"))
    (execute-kbd-macro calc-invocation-macro nil))
  
  ;;; User-programmability.