X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7..b8657d829a50110930decf87545ca2a19ff991c1:/lisp/calc/calc-keypd.el

diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index cc10d9e993..d5021e6880 100644
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -1,6 +1,6 @@
 ;;; calc-keypd.el --- mouse-capable keypad input for Calc
 
-;; Copyright (C) 1990-1993, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -349,8 +349,7 @@
 			 (if (> (length (car key)) cwid)
 			     (substring (car key) 0 cwid)
 			   (car key))))
-		 (wid (length name))
-		 (pad (- cwid (/ wid 2))))
+		 (wid (length name)))
 	    (insert (make-string (/ (- cwid wid) 2) 32)
 		    name
 		    (make-string (/ (- cwid wid -1) 2) 32)
@@ -399,7 +398,6 @@
 		      inv calc-inverse-flag)
 		calc-hyperbolic-flag))
 	 (invhyp t)
-	 (menu (symbol-value (nth calc-keypad-menu calc-keypad-menus)))
 	 (input calc-keypad-input)
 	 (iexpon (and input
 		      (or (string-match "\\*[0-9]+\\.\\^" input)
@@ -535,19 +533,22 @@
 
 (defun calc-keypad-left-click (event)
   "Handle a left-button mouse click in Calc Keypad window."
+  ;; FIXME: Why not use "@e" instead to select the buffer?
   (interactive "e")
   (with-current-buffer calc-keypad-buffer
     (goto-char (posn-point (event-start event)))
     (calc-keypad-press)))
 
-(defun calc-keypad-right-click (event)
+(defun calc-keypad-right-click (_event)
   "Handle a right-button mouse click in Calc Keypad window."
+  ;; FIXME: Why not use "@e" instead to select the buffer?
   (interactive "e")
   (with-current-buffer calc-keypad-buffer
     (calc-keypad-menu)))
 
-(defun calc-keypad-middle-click (event)
+(defun calc-keypad-middle-click (_event)
   "Handle a middle-button mouse click in Calc Keypad window."
+  ;; FIXME: Why not use "@e" instead to select the buffer?
   (interactive "e")
   (with-current-buffer calc-keypad-buffer
     (calc-keypad-menu-back)))
@@ -588,7 +589,6 @@
 (defun calc-keypad-execute ()
   (interactive)
   (let* ((prompt "Calc keystrokes: ")
-	 (flush 'x-flush-mouse-queue)
 	 (prefix nil)
 	 keys cmd)
     (save-excursion
@@ -605,10 +605,9 @@
 		   (progn
 		     (setq last-command-event (aref keys (1- (length keys))))
 		     (command-execute cmd)
-		     (setq flush 'not-any-more
-			   prefix t
+		     (setq prefix t
 			   prompt (concat prompt (key-description keys) " ")))
-		 (eq cmd flush)))))  ; skip mouse-up event
+		 nil))))  ; skip mouse-up event
     (message "")
     (if (commandp cmd)
 	(command-execute cmd)