mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-21 18:23:59 +00:00
Code Issues Releases Activity

* lisp/calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't

Browse Source 
exist any more.
(calc-keypad-redraw): Remove unused var `pad'.
(calc-keypad-press): Remove unused var `menu'.
This commit is contained in:
Stefan Monnier 2013-08-23 11:21:19 -04:00
parent 6c6014d4cc
commit b9808e7718
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/ChangeLog
View File

@ -1,7 +1,14 @@
2013-08-23 Stefan Monnier <monnier@iro.umontreal.ca>
* calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't
exist any more.
(calc-keypad-redraw): Remove unused var `pad'.
(calc-keypad-press): Remove unused var `menu'.
2013-08-23 Martin Rudalics <rudalics@gmx.at>
* window.el (display-buffer-pop-up-frame): Call
pop-up-frame-function with BUFFER current so `make-frame' will
* window.el (display-buffer-pop-up-frame):
Call pop-up-frame-function with BUFFER current so `make-frame' will
use it as the new frame's buffer (Bug#15133).
2013-08-22 Stefan Monnier <monnier@iro.umontreal.ca>

17
lisp/calc/calc-keypd.el
View File

@ -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)