diff options
| author | Paul Eggert | 2011-11-17 01:09:20 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-17 01:09:20 -0800 |
| commit | 4c36be58ca2b4777a5e7bf0d3e692cfd9fa1aea3 (patch) | |
| tree | 04a24b4e53c431ec3deb9281a0454ede7ace7337 /lisp/calc | |
| parent | b6e63cbebdac53be5ba3ce9261d7edc8dfda8bf5 (diff) | |
| download | emacs-4c36be58ca2b4777a5e7bf0d3e692cfd9fa1aea3.tar.gz emacs-4c36be58ca2b4777a5e7bf0d3e692cfd9fa1aea3.zip | |
Spelling fixes.
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-embed.el | 30 | ||||
| -rw-r--r-- | lisp/calc/calc-ext.el | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index f011d187a42..f1f79252857 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el | |||
| @@ -125,7 +125,7 @@ | |||
| 125 | "The mode settings for Calc buffer when put in embedded mode.") | 125 | "The mode settings for Calc buffer when put in embedded mode.") |
| 126 | 126 | ||
| 127 | (defun calc-embedded-save-original-modes () | 127 | (defun calc-embedded-save-original-modes () |
| 128 | "Save the current Calc modes when entereding embedded mode." | 128 | "Save the current Calc modes when entering embedded mode." |
| 129 | (let ((calcbuf (save-excursion | 129 | (let ((calcbuf (save-excursion |
| 130 | (calc-create-buffer) | 130 | (calc-create-buffer) |
| 131 | (current-buffer))) | 131 | (current-buffer))) |
| @@ -144,7 +144,7 @@ | |||
| 144 | (let ((var (cdr (car v)))) | 144 | (let ((var (cdr (car v)))) |
| 145 | (unless (memq var '(the-language the-display-just)) | 145 | (unless (memq var '(the-language the-display-just)) |
| 146 | (setq modes | 146 | (setq modes |
| 147 | (cons (cons var (symbol-value var)) | 147 | (cons (cons var (symbol-value var)) |
| 148 | modes)))) | 148 | modes)))) |
| 149 | (setq v (cdr v)))) | 149 | (setq v (cdr v)))) |
| 150 | (setq calc-embedded-original-modes (cons lang modes))) | 150 | (setq calc-embedded-original-modes (cons lang modes))) |
| @@ -182,7 +182,7 @@ | |||
| 182 | (calc-set-mode-line)))) | 182 | (calc-set-mode-line)))) |
| 183 | (setq calc-embedded-original-modes nil))) | 183 | (setq calc-embedded-original-modes nil))) |
| 184 | 184 | ||
| 185 | ;; The variables calc-embed-outer-top, calc-embed-outer-bot, | 185 | ;; The variables calc-embed-outer-top, calc-embed-outer-bot, |
| 186 | ;; calc-embed-top and calc-embed-bot are | 186 | ;; calc-embed-top and calc-embed-bot are |
| 187 | ;; local to calc-do-embedded, calc-embedded-mark-formula, | 187 | ;; local to calc-do-embedded, calc-embedded-mark-formula, |
| 188 | ;; calc-embedded-duplicate, calc-embedded-new-formula and | 188 | ;; calc-embedded-duplicate, calc-embedded-new-formula and |
| @@ -195,7 +195,7 @@ | |||
| 195 | 195 | ||
| 196 | ;; The variable calc-embed-arg is local to calc-do-embedded, | 196 | ;; The variable calc-embed-arg is local to calc-do-embedded, |
| 197 | ;; calc-embedded-update-formula, calc-embedded-edit and | 197 | ;; calc-embedded-update-formula, calc-embedded-edit and |
| 198 | ;; calc-do-embedded-activate, but is used by | 198 | ;; calc-do-embedded-activate, but is used by |
| 199 | ;; calc-embedded-make-info, which is called by the above | 199 | ;; calc-embedded-make-info, which is called by the above |
| 200 | ;; functions. | 200 | ;; functions. |
| 201 | (defvar calc-embed-arg) | 201 | (defvar calc-embed-arg) |
| @@ -208,14 +208,14 @@ | |||
| 208 | 208 | ||
| 209 | ;; The following is to take care of any minor modes which override | 209 | ;; The following is to take care of any minor modes which override |
| 210 | ;; a Calc command. | 210 | ;; a Calc command. |
| 211 | (defvar calc-override-minor-modes-map | 211 | (defvar calc-override-minor-modes-map |
| 212 | (make-sparse-keymap) | 212 | (make-sparse-keymap) |
| 213 | "A list of keybindings that might be overwritten by minor modes.") | 213 | "A list of keybindings that might be overwritten by minor modes.") |
| 214 | 214 | ||
| 215 | ;; Add any keys that might be overwritten here. | 215 | ;; Add any keys that might be overwritten here. |
| 216 | (define-key calc-override-minor-modes-map "`" 'calc-edit) | 216 | (define-key calc-override-minor-modes-map "`" 'calc-edit) |
| 217 | 217 | ||
| 218 | (defvar calc-override-minor-modes | 218 | (defvar calc-override-minor-modes |
| 219 | (cons t calc-override-minor-modes-map)) | 219 | (cons t calc-override-minor-modes-map)) |
| 220 | 220 | ||
| 221 | (defun calc-do-embedded (calc-embed-arg end obeg oend) | 221 | (defun calc-do-embedded (calc-embed-arg end obeg oend) |
| @@ -279,7 +279,7 @@ | |||
| 279 | (calc-embedded-save-original-modes) | 279 | (calc-embedded-save-original-modes) |
| 280 | (or calc-embedded-globals | 280 | (or calc-embedded-globals |
| 281 | (calc-find-globals)) | 281 | (calc-find-globals)) |
| 282 | (setq info | 282 | (setq info |
| 283 | (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend)) | 283 | (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend)) |
| 284 | (if (eq (car-safe (aref info 8)) 'error) | 284 | (if (eq (car-safe (aref info 8)) 'error) |
| 285 | (progn | 285 | (progn |
| @@ -564,7 +564,7 @@ The command \\[yank] can retrieve it from there." | |||
| 564 | (goto-char calc-embed-outer-bot) | 564 | (goto-char calc-embed-outer-bot) |
| 565 | (insert "\n") | 565 | (insert "\n") |
| 566 | (setq new-top (point)) | 566 | (setq new-top (point)) |
| 567 | (insert-buffer-substring (current-buffer) | 567 | (insert-buffer-substring (current-buffer) |
| 568 | calc-embed-outer-top calc-embed-outer-bot) | 568 | calc-embed-outer-top calc-embed-outer-bot) |
| 569 | (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top))) | 569 | (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top))) |
| 570 | (let ((calc-embedded-quiet (if already t 'x))) | 570 | (let ((calc-embedded-quiet (if already t 'x))) |
| @@ -659,7 +659,7 @@ The command \\[yank] can retrieve it from there." | |||
| 659 | (equal (symbol-value (car (car v))) value)) | 659 | (equal (symbol-value (car (car v))) value)) |
| 660 | (progn | 660 | (progn |
| 661 | (setq changed t) | 661 | (setq changed t) |
| 662 | (if temp (setq calc-embed-prev-modes | 662 | (if temp (setq calc-embed-prev-modes |
| 663 | (cons (cons (car (car v)) | 663 | (cons (cons (car (car v)) |
| 664 | (symbol-value (car (car v)))) | 664 | (symbol-value (car (car v)))) |
| 665 | calc-embed-prev-modes))) | 665 | calc-embed-prev-modes))) |
| @@ -809,12 +809,12 @@ The command \\[yank] can retrieve it from there." | |||
| 809 | (list modes emodes pmodes))) | 809 | (list modes emodes pmodes))) |
| 810 | 810 | ||
| 811 | ;; The variable calc-embed-vars-used is local to calc-embedded-make-info, | 811 | ;; The variable calc-embed-vars-used is local to calc-embedded-make-info, |
| 812 | ;; calc-embedded-evaluate-expr and calc-embedded-update, but is | 812 | ;; calc-embedded-evaluate-expr and calc-embedded-update, but is |
| 813 | ;; used by calc-embedded-find-vars, which is called by the above functions. | 813 | ;; used by calc-embedded-find-vars, which is called by the above functions. |
| 814 | (defvar calc-embed-vars-used) | 814 | (defvar calc-embed-vars-used) |
| 815 | 815 | ||
| 816 | (defun calc-embedded-make-info (point cbuf fresh &optional | 816 | (defun calc-embedded-make-info (point cbuf fresh &optional |
| 817 | calc-embed-top calc-embed-bot | 817 | calc-embed-top calc-embed-bot |
| 818 | calc-embed-outer-top calc-embed-outer-bot) | 818 | calc-embed-outer-top calc-embed-outer-bot) |
| 819 | (let* ((bufentry (assq (current-buffer) calc-embedded-active)) | 819 | (let* ((bufentry (assq (current-buffer) calc-embedded-active)) |
| 820 | (found bufentry) | 820 | (found bufentry) |
| @@ -831,7 +831,7 @@ The command \\[yank] can retrieve it from there." | |||
| 831 | (newform (assoc major-mode calc-embedded-open-close-formula-alist)) | 831 | (newform (assoc major-mode calc-embedded-open-close-formula-alist)) |
| 832 | (newword (assoc major-mode calc-embedded-word-regexp-alist)) | 832 | (newword (assoc major-mode calc-embedded-word-regexp-alist)) |
| 833 | (newplain (assoc major-mode calc-embedded-open-close-plain-alist)) | 833 | (newplain (assoc major-mode calc-embedded-open-close-plain-alist)) |
| 834 | (newnewform | 834 | (newnewform |
| 835 | (assoc major-mode calc-embedded-open-close-new-formula-alist)) | 835 | (assoc major-mode calc-embedded-open-close-new-formula-alist)) |
| 836 | (newmode (assoc major-mode calc-embedded-open-close-mode-alist))) | 836 | (newmode (assoc major-mode calc-embedded-open-close-mode-alist))) |
| 837 | (when newann | 837 | (when newann |
| @@ -874,9 +874,9 @@ The command \\[yank] can retrieve it from there." | |||
| 874 | (aset info 1 (or cbuf (save-excursion | 874 | (aset info 1 (or cbuf (save-excursion |
| 875 | (calc-create-buffer) | 875 | (calc-create-buffer) |
| 876 | (current-buffer))))) | 876 | (current-buffer))))) |
| 877 | (if (and | 877 | (if (and |
| 878 | (or (integerp calc-embed-top) (equal calc-embed-top '(4))) | 878 | (or (integerp calc-embed-top) (equal calc-embed-top '(4))) |
| 879 | (not calc-embed-bot)) | 879 | (not calc-embed-bot)) |
| 880 | ; started with a user-supplied argument | 880 | ; started with a user-supplied argument |
| 881 | (progn | 881 | (progn |
| 882 | (if (equal calc-embed-top '(4)) | 882 | (if (equal calc-embed-top '(4)) |
| @@ -1157,7 +1157,7 @@ The command \\[yank] can retrieve it from there." | |||
| 1157 | (if need-display | 1157 | (if need-display |
| 1158 | (calc-embedded-set-justify (cdr (car calc-embed-prev-modes))))) | 1158 | (calc-embedded-set-justify (cdr (car calc-embed-prev-modes))))) |
| 1159 | (t | 1159 | (t |
| 1160 | (set (car (car calc-embed-prev-modes)) | 1160 | (set (car (car calc-embed-prev-modes)) |
| 1161 | (cdr (car calc-embed-prev-modes))))) | 1161 | (cdr (car calc-embed-prev-modes))))) |
| 1162 | (setq calc-embed-prev-modes (cdr calc-embed-prev-modes)))))) | 1162 | (setq calc-embed-prev-modes (cdr calc-embed-prev-modes)))))) |
| 1163 | 1163 | ||
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 8b816665d97..5429509af86 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el | |||
| @@ -432,7 +432,7 @@ | |||
| 432 | (define-key calc-mode-map "ls" 'calc-spn) | 432 | (define-key calc-mode-map "ls" 'calc-spn) |
| 433 | (define-key calc-mode-map "lm" 'calc-midi) | 433 | (define-key calc-mode-map "lm" 'calc-midi) |
| 434 | (define-key calc-mode-map "lf" 'calc-freq) | 434 | (define-key calc-mode-map "lf" 'calc-freq) |
| 435 | 435 | ||
| 436 | (define-key calc-mode-map "l?" 'calc-l-prefix-help) | 436 | (define-key calc-mode-map "l?" 'calc-l-prefix-help) |
| 437 | 437 | ||
| 438 | (define-key calc-mode-map "m" nil) | 438 | (define-key calc-mode-map "m" nil) |
| @@ -2867,7 +2867,7 @@ If X is not an error form, return 1." | |||
| 2867 | (memq (nth 2 expr) '(var-inf var-uinf var-nan))))) | 2867 | (memq (nth 2 expr) '(var-inf var-uinf var-nan))))) |
| 2868 | 2868 | ||
| 2869 | ;; The variable math-integral-cache is originally declared in calcalg2.el, | 2869 | ;; The variable math-integral-cache is originally declared in calcalg2.el, |
| 2870 | ;; but is set by math-defintegral and math-definitegral2. | 2870 | ;; but is set by math-defintegral and math-defintegral-2. |
| 2871 | (defvar math-integral-cache) | 2871 | (defvar math-integral-cache) |
| 2872 | 2872 | ||
| 2873 | (defmacro math-defintegral (funcs &rest code) | 2873 | (defmacro math-defintegral (funcs &rest code) |