mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

change calc to use derived-mode-p

Browse Source 
* lisp/calc/calc-embed.el (calc-embedded-find-modes)
(calc-embedded-make-info): Use derived-mode-p.
This commit is contained in:
Tom Tromey 2017-03-18 23:00:13 +01:00
parent a2a38790ee
commit 089b159287
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/calc/calc-embed.el
View File

@ -804,7 +804,7 @@ The command \\[yank] can retrieve it from there."
(backward-char 6))
(goto-char save-pt)
(unless (assq 'the-language modes)
(let ((lang (assoc major-mode calc-language-alist)))
(let ((lang (cl-assoc-if #'derived-mode-p calc-language-alist)))
(if lang
(setq modes (cons (cons 'the-language (cdr lang))
modes)))))
@ -829,13 +829,19 @@ The command \\[yank] can retrieve it from there."
(setq found (list (current-buffer))
calc-embedded-active (cons found calc-embedded-active)
calc-embedded-firsttime-buf t)
(let ((newann (assoc major-mode calc-embedded-announce-formula-alist))
(newform (assoc major-mode calc-embedded-open-close-formula-alist))
(newword (assoc major-mode calc-embedded-word-regexp-alist))
(newplain (assoc major-mode calc-embedded-open-close-plain-alist))
(let ((newann (cl-assoc-if #'derived-mode-p
calc-embedded-announce-formula-alist))
(newform (cl-assoc-if #'derived-mode-p
calc-embedded-open-close-formula-alist))
(newword (cl-assoc-if #'derived-mode-p
calc-embedded-word-regexp-alist))
(newplain (cl-assoc-if #'derived-mode-p
calc-embedded-open-close-plain-alist))
(newnewform
(assoc major-mode calc-embedded-open-close-new-formula-alist))
(newmode (assoc major-mode calc-embedded-open-close-mode-alist)))
(cl-assoc-if #'derived-mode-p
calc-embedded-open-close-new-formula-alist))
(newmode (cl-assoc-if #'derived-mode-p
calc-embedded-open-close-mode-alist)))
(when newann
(make-local-variable 'calc-embedded-announce-formula)
(setq calc-embedded-announce-formula (cdr newann)))