* view.el (view-recenter): Allow recenter to compute window height

[gnu-emacs] / lisp / calc / calc-ext.el

diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index dbaf9fd47ad2d3e57302fd448a2d95ba07e345bd..d97cd7971ea650c0ac67daf44a134dc07fcc1dff 100644 (file)
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1,7 +1,7 @@
 ;;; calc-ext.el --- various extension functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -134,6 +134,7 @@
   (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 "\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 "\M-\C-m" 'calc-last-args)
@@ -1146,7 +1147,7 @@ calc-store-times calc-subscript calc-unstore)
 
  ("calc-stuff" calc-clean calc-clean-num calc-flush-caches
 calc-less-recursion-depth calc-more-recursion-depth calc-num-prefix
-calc-version calc-why)
+calc-why)
 
  ("calc-trail" calc-trail-backward calc-trail-first calc-trail-forward
 calc-trail-in calc-trail-isearch-backward calc-trail-isearch-forward
@@ -1445,26 +1446,26 @@ calc-kill calc-kill-region calc-yank))))
         (if (boundp 'overriding-terminal-local-map)
             (setq overriding-terminal-local-map calc-fancy-prefix-map)
           (let ((event (calc-read-key t)))
-            (if (eq (setq last-command-char (car event)) ?\C-u)
+            (if (eq (setq last-command-event (car event)) ?\C-u)
                 (universal-argument)
-              (if (or (not (integerp last-command-char))
-                      (and (>= last-command-char 0) (< last-command-char ? )
-                           (not (memq last-command-char '(?\e)))))
+              (if (or (not (integerp last-command-event))
+                      (and (>= last-command-event 0) (< last-command-event ? )
+                           (not (memq last-command-event '(?\e)))))
                   (calc-wrapper))  ; clear flags if not a Calc command.
                (setq last-command-event (cdr event))
-              (if (or (not (integerp last-command-char))
-                      (eq last-command-char ?-))
+              (if (or (not (integerp last-command-event))
+                      (eq last-command-event ?-))
                   (calc-unread-command)
                 (digit-argument n))))))))
 
 (defun calc-fancy-prefix-other-key (arg)
   (interactive "P")
   (if (and
-       (not (eq last-command-char 'tab))
-       (not (eq last-command-char 'M-tab))
-       (or (not (integerp last-command-char))
-           (and (>= last-command-char 0) (< last-command-char ? )
-                (not (eq last-command-char meta-prefix-char)))))
+       (not (eq last-command-event 'tab))
+       (not (eq last-command-event 'M-tab))
+       (or (not (integerp last-command-event))
+           (and (>= last-command-event 0) (< last-command-event ? )
+                (not (eq last-command-event meta-prefix-char)))))
      (calc-wrapper))  ; clear flags if not a Calc command.
   (setq prefix-arg arg)
   (calc-unread-command)