diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-19 22:56:26 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-19 22:56:26 +0200 |
| commit | 8e9ff8b115bda364f30654589160fb702a511e9c (patch) | |
| tree | 0b86e2b2609fa064e43ae892dbe9dbb5fffa4131 /lisp/calc/calc-ext.el | |
| parent | a97ba6eb305c9db8641c0e65748907cd53dbfa5e (diff) | |
| download | emacs-8e9ff8b115bda364f30654589160fb702a511e9c.tar.gz emacs-8e9ff8b115bda364f30654589160fb702a511e9c.tar.bz2 emacs-8e9ff8b115bda364f30654589160fb702a511e9c.zip | |
Remove XEmacs compat code from calc
* lisp/calc/calc.el (calc-read-key-sequence)
(calcDigit-start, calc-read-key, calc-unread-command)
(calc-clear-unread-commands):
* lisp/calc/calc-misc.el (calc-dispatch-help):
* lisp/calc/calc-help.el (calc-help-for-help)
(calc-describe-key):
* lisp/calc/calc-ext.el (calc-fancy-prefix, calc-user-key-map):
Remove XEmacs compat code.
Diffstat (limited to 'lisp/calc/calc-ext.el')
| -rw-r--r-- | lisp/calc/calc-ext.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 1456fb28570..4cc6b224226 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -1487,14 +1487,14 @@ calc-kill calc-kill-region calc-yank)))) (not calc-is-keypad-press) (if (boundp 'overriding-terminal-local-map) (setq overriding-terminal-local-map calc-fancy-prefix-map) - (let ((event (calc-read-key t))) - (if (eq (setq last-command-event (car event)) ?\C-u) + (let ((event (read-event))) + (if (eq (setq last-command-event event) ?\C-u) (universal-argument) (if (or (not (integerp last-command-event)) (and (>= last-command-event 0) (< last-command-event ? ) (not (memq last-command-event '(?\e))))) (calc-wrapper)) ; clear flags if not a Calc command. - (setq last-command-event (cdr event)) + (setq last-command-event event) (if (or (not (integerp last-command-event)) (eq last-command-event ?-)) (calc-unread-command) @@ -1915,8 +1915,6 @@ calc-kill calc-kill-region calc-yank)))) ;;; User menu. (defun calc-user-key-map () - (if (featurep 'xemacs) - (error "User-defined keys are not supported in XEmacs")) (let ((res (cdr (lookup-key calc-mode-map "z")))) (if (eq (car (car res)) 27) (cdr res) |