summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-ext.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2559c7c5ae..6da4500d266 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-21 Štěpán Němec <stepnem@gmail.com> (tiny change)
+
+ * calc/calc-ext.el (calc-init-extensions): Map all `undo'
+ keybindings to `calc-undo'.
+
2011-01-20 Stefan Monnier <monnier@iro.umontreal.ca>
Don't mess with *temp*.
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 7042c407907..6fbccaad0b9 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -136,8 +136,7 @@
(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 "\C-_" 'calc-undo)
- (define-key calc-mode-map "\C-xu" 'calc-undo)
+ (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)