[Emacs-diffs] Changes to emacs/lisp/calculator.el

[Richard M . Stallman]

Index: emacs/lisp/calculator.el
diff -c emacs/lisp/calculator.el:1.18 emacs/lisp/calculator.el:1.19
*** emacs/lisp/calculator.el:1.18       Mon Jul  4 23:08:52 2005
--- emacs/lisp/calculator.el    Sat Jul 16 17:31:53 2005
***************
*** 1277,1288 ****
              (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
  
--- 1277,1282 ----
***************
*** 1301,1308 ****
            (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)))
            ;; assume all symbols are translatable with an ascii-character
            (and (symbolp k)
                 (setq k (or (get k 'ascii-character) ? )))
--- 1295,1303 ----
            (setq k (aref inp i))
            ;; if Emacs will someday have a event-key, then this would
            ;; probably be modified anyway
!           (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) ? )))