Mercurial > emacs
changeset 64381:c25db06be8ca
(calculator-last-input): Guard uses of event-key and key-press-event-p.
(event-key, key-press-event-p): Delete definitions.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 16 Jul 2005 17:31:53 +0000 |
| parents | ce8784010c3c |
| children | c16c027014c6 |
| files | lisp/calculator.el |
| diffstat | 1 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calculator.el Sat Jul 16 17:24:40 2005 +0000 +++ b/lisp/calculator.el Sat Jul 16 17:31:53 2005 +0000 @@ -1277,12 +1277,6 @@ (if Dbound (fset 'D Dsave) (fmakunbound 'D))))) (error 0))) -(eval-when-compile ; silence the compiler - (or (fboundp 'event-key) - (defun event-key (&rest _) nil)) - (or (fboundp 'key-press-event-p) - (defun key-press-event-p (&rest _) nil))) - ;;;--------------------------------------------------------------------- ;;; Input interaction @@ -1301,8 +1295,9 @@ (setq k (aref inp i)) ;; if Emacs will someday have a event-key, then this would ;; probably be modified anyway - (and (fboundp 'event-key) (key-press-event-p k) - (event-key k) (setq k (event-key k))) + (and (if (fboundp 'key-press-event-p) (key-press-event-p k)) + (if (fboundp 'event-key) + (and (event-key k) (setq k (event-key k))))) ;; assume all symbols are translatable with an ascii-character (and (symbolp k) (setq k (or (get k 'ascii-character) ? )))