Mercurial > emacs

comparison lisp/calc/calc-ext.el @ 101001:14b421290b2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace last-command-char with last-command-event.
author Glenn Morris <rgm@gnu.org>
date Fri, 09 Jan 2009 03:57:12 +0000
parents a9dc0e7c3f2b
children e3187820f169
comparison
equal deleted inserted replaced
101000:ee5456efd63c 101001:14b421290b2f
1444 (and prefix 1444 (and prefix
1445 (not calc-is-keypad-press) 1445 (not calc-is-keypad-press)
1446 (if (boundp 'overriding-terminal-local-map) 1446 (if (boundp 'overriding-terminal-local-map)
1447 (setq overriding-terminal-local-map calc-fancy-prefix-map) 1447 (setq overriding-terminal-local-map calc-fancy-prefix-map)
1448 (let ((event (calc-read-key t))) 1448 (let ((event (calc-read-key t)))
1449 (if (eq (setq last-command-char (car event)) ?\C-u) 1449 (if (eq (setq last-command-event (car event)) ?\C-u)
1450 (universal-argument) 1450 (universal-argument)
1451 (if (or (not (integerp last-command-char)) 1451 (if (or (not (integerp last-command-event))
1452 (and (>= last-command-char 0) (< last-command-char ? ) 1452 (and (>= last-command-event 0) (< last-command-event ? )
1453 (not (memq last-command-char '(?\e))))) 1453 (not (memq last-command-event '(?\e)))))
1454 (calc-wrapper)) ; clear flags if not a Calc command. 1454 (calc-wrapper)) ; clear flags if not a Calc command.
1455 (setq last-command-event (cdr event)) 1455 (setq last-command-event (cdr event))
1456 (if (or (not (integerp last-command-char)) 1456 (if (or (not (integerp last-command-event))
1457 (eq last-command-char ?-)) 1457 (eq last-command-event ?-))
1458 (calc-unread-command) 1458 (calc-unread-command)
1459 (digit-argument n)))))))) 1459 (digit-argument n))))))))
1460 1460
1461 (defun calc-fancy-prefix-other-key (arg) 1461 (defun calc-fancy-prefix-other-key (arg)
1462 (interactive "P") 1462 (interactive "P")
1463 (if (and 1463 (if (and
1464 (not (eq last-command-char 'tab)) 1464 (not (eq last-command-event 'tab))
1465 (not (eq last-command-char 'M-tab)) 1465 (not (eq last-command-event 'M-tab))
1466 (or (not (integerp last-command-char)) 1466 (or (not (integerp last-command-event))
1467 (and (>= last-command-char 0) (< last-command-char ? ) 1467 (and (>= last-command-event 0) (< last-command-event ? )
1468 (not (eq last-command-char meta-prefix-char))))) 1468 (not (eq last-command-event meta-prefix-char)))))
1469 (calc-wrapper)) ; clear flags if not a Calc command. 1469 (calc-wrapper)) ; clear flags if not a Calc command.
1470 (setq prefix-arg arg) 1470 (setq prefix-arg arg)
1471 (calc-unread-command) 1471 (calc-unread-command)
1472 (setq overriding-terminal-local-map nil)) 1472 (setq overriding-terminal-local-map nil))
1473 1473