Refill some copyright headers.

[bpt/emacs.git] / lisp / calc / calc-keypd.el

diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index a940794..47297c6 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, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010, 2011  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)
@@ -391,9 +390,7 @@
   (interactive)
   (unless (eq major-mode 'calc-keypad-mode)
     (error "Must be in *Calc Keypad* buffer for this command"))
-  (let* ((row (save-excursion
-               (beginning-of-line)
-               (count-lines (point-min) (point))))
+  (let* ((row (count-lines (point-min) (point-at-bol)))
         (y (/ row 2))
         (x (/ (current-column) (if (>= y 4) 6 5)))
         radix frac inv
@@ -547,8 +544,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 +604,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
@@ -621,5 +617,4 @@
 
 (provide 'calc-keypd)
 
-;; arch-tag: 4ba0d360-2bb6-40b8-adfa-eb373765b3f9
 ;;; calc-keypd.el ends here