From d88757d61b84855d9860155c424ab6bfdcf5a77d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 16 Jul 2005 17:31:53 +0000 Subject: [PATCH] (calculator-last-input): Guard uses of event-key and key-press-event-p. (event-key, key-press-event-p): Delete definitions. --- lisp/calculator.el | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lisp/calculator.el b/lisp/calculator.el index 923d4022098..301a27eac5f 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -1277,12 +1277,6 @@ arguments." (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 @@ Optional string argument KEYS will force using it as the keys entered." (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) ? ))) -- 2.39.2