Add 2010 to copyright years.

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

diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index f1d18314f6940df18cb19c99fb512c8871ef3e14..e4dc5f5a88b41a78f2f3127e9db99952247907b0 100644 (file)
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -1,7 +1,7 @@
 ;;; calc-keypd.el --- mouse-capable keypad input 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, 2010 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -297,8 +297,7 @@
              (setq win (split-window win (+ width 7) t))
              (set-window-buffer win calcbuf))
          (if (or t  ; left-side keypad not yet fully implemented
-                 (< (save-excursion
-                      (set-buffer (window-buffer old-win))
+                 (< (with-current-buffer (window-buffer old-win)
                       (current-column))
                     (/ (window-width) 2)))
              (setq win (split-window old-win (- (window-width old-win)
@@ -382,7 +381,7 @@
          (delete-region (point-min) (point))
          (if calc-keypad-input
              (insert "Calc: " calc-keypad-input "\n")
-           (insert "----+-----Calc " calc-version " -----+----"
+           (insert "----+----+--Calc---+----+----"
                    (int-to-string (1+ calc-keypad-menu))
                    "\n")))))
   (setq calc-keypad-prev-input calc-keypad-input))
@@ -547,8 +546,7 @@
 (defun calc-keypad-right-click (event)
   "Handle a right-button mouse click in Calc Keypad window."
   (interactive "e")
-  (save-excursion
-    (set-buffer calc-keypad-buffer)
+  (with-current-buffer calc-keypad-buffer
     (calc-keypad-menu)))
 
 (defun calc-keypad-middle-click (event)
@@ -608,7 +606,7 @@
                                   negative-argument))
                       (and prefix (string-match "\\`\e?[-0-9]\\'" keys)))
                   (progn
-                    (setq last-command-char (aref keys (1- (length keys))))
+                    (setq last-command-event (aref keys (1- (length keys))))
                     (command-execute cmd)
                     (setq flush 'not-any-more
                           prefix t