diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calc/calc-embed.el | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index bb37d7f9c98..bd5601b7292 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -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))) |