# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1295585677 21600
# Node ID 23a54fb18e67cfd66ffaea28ffde20eb45797831
# Parent  f7e256e5ea88d7ecd9597b474b097a962d13b3c1
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'.

diff -r f7e256e5ea88 -r 23a54fb18e67 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 21 04:16:57 2011 +0000
+++ b/lisp/ChangeLog	Thu Jan 20 22:54:37 2011 -0600
@@ -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 -r f7e256e5ea88 -r 23a54fb18e67 lisp/calc/calc-ext.el
--- a/lisp/calc/calc-ext.el	Fri Jan 21 04:16:57 2011 +0000
+++ b/lisp/calc/calc-ext.el	Thu Jan 20 22:54:37 2011 -0600
@@ -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-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 -r f7e256e5ea88 -r 23a54fb18e67 lisp/calc/calc-undo.el
--- a/lisp/calc/calc-undo.el	Fri Jan 21 04:16:57 2011 +0000
+++ b/lisp/calc/calc-undo.el	Thu Jan 20 22:54:37 2011 -0600
@@ -32,6 +32,7 @@
 
 ;;; Undo.
 
+;;;###autoload
 (defun calc-undo (n)
   (interactive "p")
   (when calc-executing-macro
diff -r f7e256e5ea88 -r 23a54fb18e67 lisp/calc/calc.el
--- a/lisp/calc/calc.el	Fri Jan 21 04:16:57 2011 +0000
+++ b/lisp/calc/calc.el	Thu Jan 20 22:54:37 2011 -0600
@@ -1061,6 +1061,7 @@
     (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")