4 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e973fcd6d56..ba8fd13fd16 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
 2011-01-21  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc/calc-prog.el
-          calc/calc-graph.el
-          calc/calc-map.el: Change `arglist' to `math-arglist' throughout.
+        * calc/calc-undo.el (calc-undo): Autoload it.
+        * calc/calc-ext.el (calc-init-extensions): Remove keybindings
+        and autoload for `calc-undo'.
+        * calc/calc.el (calc-mode-map): Add keybindings for `calc-undo'.
+        * calc/calc-prog.el:
+        * calc/calc-graph.el:
+        * calc/calc-map.el: Change `arglist' to `math-arglist' throughout.
 
 2011-01-21  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
 
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 6fbccaad0b9..0da423a8eac 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -136,7 +136,6 @@
   (define-key calc-mode-map "\C-w" 'calc-kill-region)
   (define-key calc-mode-map "\M-w" 'calc-copy-region-as-kill)
   (define-key calc-mode-map "\M-\C-w" 'kill-ring-save)
-  (define-key calc-mode-map [remap undo] 'calc-undo)
   (define-key calc-mode-map "\M-\C-m" 'calc-last-args)
 
   (define-key calc-mode-map "a" nil)
@@ -1155,7 +1154,7 @@ calc-trail-kill calc-trail-last calc-trail-marker calc-trail-next
 calc-trail-out calc-trail-previous calc-trail-scroll-left
 calc-trail-scroll-right calc-trail-yank)
 
- ("calc-undo" calc-last-args calc-redo calc-undo)
+ ("calc-undo" calc-last-args calc-redo)
 
  ("calc-units" calc-autorange-units calc-base-units
 calc-convert-temperature calc-convert-units calc-define-unit
diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el
index 508385be399..4d01cb31f38 100644
--- a/lisp/calc/calc-undo.el
+++ b/lisp/calc/calc-undo.el
@@ -32,6 +32,7 @@
 
 ;;; Undo.
 
+;;;###autoload
 (defun calc-undo (n)
   (interactive "p")
   (when calc-executing-macro
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 0006fb0f33f..d99f164e974 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1061,6 +1061,7 @@ Used by `calc-user-invocation'.")
     (define-key map "\C-j" 'calc-over)
     (define-key map "\C-y" 'calc-yank)
     (define-key map [mouse-2] 'calc-yank)
+    (define-key map [remap undo] 'calc-undo)
 
     (mapc (lambda (x) (define-key map (char-to-string x) 'undefined))
           "lOW")