summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/calc/calc-ext.el2
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efd8601309f..8887b086923 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-01 Jay Belanger <jay.p.belanger@gmail.com>
+
+ * calc/calc.el: Autoload `calc-yank'.
+ (calc-mode-map): Add keybindings for `calc-yank'.
+ * calc/calc-ext.el (calc-init-extensions): Remove keybinding
+ assignments for `calc-yank'.
+
2008-03-31 Dan Nicolaescu <dann@ics.uci.edu>
* vc.el (vc-status-add-entry): Assume ENTRY is a list, not a cons.
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index b47279003c6..753b3a188ed 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -136,8 +136,6 @@
(define-key calc-mode-map "\M-k" 'calc-copy-as-kill)
(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 "\C-y" 'calc-yank)
- (define-key calc-mode-map [mouse-2] 'calc-yank)
(define-key calc-mode-map "\C-_" 'calc-undo)
(define-key calc-mode-map "\C-xu" 'calc-undo)
(define-key calc-mode-map "\M-\C-m" 'calc-last-args)