HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove inline bytecode
[bpt/emacs.git]
/
lisp
/
calc
/
calc-keypd.el
diff --git
a/lisp/calc/calc-keypd.el
b/lisp/calc/calc-keypd.el
index
3a59f69
..
d5021e6
100644
(file)
--- 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
;;; calc-keypd.el --- mouse-capable keypad input for Calc
-;; Copyright (C) 1990-1993, 2001-201
2
Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-201
4
Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
;; 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))))
(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)
(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)
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)
(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."
(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)))
(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."
"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)))
(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."
"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)))
(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: ")
(defun calc-keypad-execute ()
(interactive)
(let* ((prompt "Calc keystrokes: ")
- (flush 'x-flush-mouse-queue)
(prefix nil)
keys cmd)
(save-excursion
(prefix nil)
keys cmd)
(save-excursion
@@
-605,10
+605,9
@@
(progn
(setq last-command-event (aref keys (1- (length keys))))
(command-execute cmd)
(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) " ")))
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)
(message "")
(if (commandp cmd)
(command-execute cmd)