Merge from origin/emacs-25

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

diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index cc10d9e993c426db6204d012a693cf7338c1e5ef..31688626dd883c17c478738e9bd4866c376df6c8 100644 (file)
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -1,9 +1,8 @@
 ;;; calc-keypd.el --- mouse-capable keypad input for Calc
 
-;; Copyright (C) 1990-1993, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
@@ -349,8 +348,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 +397,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 +532,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 +588,6 @@
 (defun calc-keypad-execute ()
   (interactive)
   (let* ((prompt "Calc keystrokes: ")
-        (flush 'x-flush-mouse-queue)
         (prefix nil)
         keys cmd)
     (save-excursion
@@ -605,10 +604,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)