mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 00:01:33 -08:00
Code Issues Projects Releases Wiki Activity

Remove XEmacs compat code from calc

Browse source 
* 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.
This commit is contained in:
Lars Ingebrigtsen 2019-06-19 22:56:26 +02:00
parent a97ba6eb30
commit 8e9ff8b115
4 changed files with 29 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/calc/calc-ext.el
View file

@ -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)