[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113980: * lisp/calc/calc-keypd.el (calc-keypad-exec
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r113980: * lisp/calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't |
Date: |
Fri, 23 Aug 2013 15:21:24 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113980
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-23 11:21:19 -0400
message:
* lisp/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'.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/calc/calc-keypd.el
calckeypd.el-20091113204419-o5vbwnq5f7feedwu-2284
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-08-23 06:52:19 +0000
+++ b/lisp/ChangeLog 2013-08-23 15:21:19 +0000
@@ -1,7 +1,14 @@
+2013-08-23 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
- * 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 <address@hidden>
=== modified file 'lisp/calc/calc-keypd.el'
--- a/lisp/calc/calc-keypd.el 2013-01-01 09:11:05 +0000
+++ b/lisp/calc/calc-keypd.el 2013-08-23 15:21:19 +0000
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113980: * lisp/calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't,
Stefan Monnier <=