(calc-init-extensions): Remove keybinding assignments for `calc-yank'.

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0650081f20..a4e95eff1c7 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  Martin Rudalics  <rudalics@gmx.at>
 
         * emacs-lisp/find-func.el (find-function-search-for-symbol):
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 8c52305a46b..e836bc3544f 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -91,8 +91,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)