emacs: lisp/calc/calc-embed.el comparison

comparison lisp/calc/calc-embed.el @ 90054:f2ebccfa87d4

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Wed, 08 Dec 2004 05:02:30 +0000
parents	2e44ef8c14b4 05765b6fc9cd
children	cb67264d6096

comparison

equal deleted inserted replaced

-:fff5f1a61d92
+:f2ebccfa87d4
 ;;; calc-embed.el --- embed Calc in a buffer
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainers: D. Goel <deego@gnufans.org>
+;; Maintainer: Jay Belanger <belanger@truman.edu>
-;;              Colin Walters <walters@debian.org>
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY.  No author or distributor
 ;;; Commentary:
 ;;; Code:
 ;; This file is autoloaded from calc-ext.el.
 (require 'calc-ext)
 (require 'calc-macs)
-(defun calc-Need-calc-embed () nil)
 (defun calc-show-plain (n)
 (interactive "P")
 (calc-wrapper
 (calc-set-command-flag 'renum-stack)
 ;;; calc-embedded-active is an a-list keyed on buffers; each cdr is a
 ;;; sorted list of calc-embedded-infos in that buffer.  We do this
 ;;; rather than using buffer-local variables because the latter are
 ;;; thrown away when a buffer changes major modes.
+;; The variables calc-embed-outer-top, calc-embed-outer-bot,
+;; calc-embed-top and calc-embed-bot are
+;; local to calc-do-embedded, calc-embedded-mark-formula,
+;; calc-embedded-duplicate, calc-embedded-new-formula and
+;; calc-embedded-make-info, but are used by calc-embedded-find-bounds,
+;; which is called (directly or indirectly) by the above functions.
+(defvar calc-embed-outer-top)
+(defvar calc-embed-outer-bot)
+(defvar calc-embed-top)
+(defvar calc-embed-bot)
 (defvar calc-embedded-quiet nil)
 (defun calc-do-embedded (arg end obeg oend)
 (if calc-embedded-info
 ;; Turn embedded mode on.
 (calc-plain-buffer-only)
 (let ((modes (list mode-line-buffer-identification
 		       (current-local-map)
 		       truncate-lines))
-	  top bot outer-top outer-bot
+	  calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot
 	  info chg ident)
 (barf-if-buffer-read-only)
 (or calc-embedded-globals
 	  (calc-find-globals))
 (setq info (calc-embedded-make-info (point) nil t arg end obeg oend))
 		(math-format-nice-expr (aref info 8) (frame-width))))
 (calc-edit-mode (list 'calc-embedded-finish-edit info))
 (insert str "\n")))
 (calc-show-edit-buffer))
+(defvar calc-original-buffer)
 (defun calc-embedded-finish-edit (info)
 (let ((buf (current-buffer))
 	(str (buffer-substring (point) (point-max)))
 	(start (point))
 	pos)
 	    (error (nth 2 val))))
 (calc-embedded-original-buffer t info)
 (aset info 8 val)
 (calc-embedded-update info 14 t t))))
-;;;###autoload
 (defun calc-do-embedded-activate (arg cbuf)
 (calc-plain-buffer-only)
 (if arg
 (calc-embedded-forget))
 (calc-find-globals)
 This normally marks the whole formula, including surrounding delimiters.
 With any prefix argument, marks only the formula itself."
 (interactive "P")
 (and (eq major-mode 'calc-mode)
 (error "This command should be used in a normal editing buffer"))
-(let (top bot outer-top outer-bot)
+(let (calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot)
 (save-excursion
 (calc-embedded-find-bounds body-only))
-(push-mark (if body-only bot outer-bot) t)
+(push-mark (if body-only calc-embed-bot calc-embed-outer-bot) t)
-(goto-char (if body-only top outer-top))))
+(goto-char (if body-only calc-embed-top calc-embed-outer-top))))
 (defun calc-embedded-find-bounds (&optional plain)
 ;; (while (and (bolp) (eq (following-char) ?\n))
 ;;  (forward-char 1))
 (and (eolp) (bolp) (not (eq (char-after (- (point) 2)) ?\n))
 	(re-search-backward calc-embedded-open-formula nil t)
 	(error "Can't find start of formula"))
 (and (eq (preceding-char) ?\$)  ; backward search for \$\$? won't back
 	 (eq (following-char) ?\$)  ; up over a second $, so do it by hand.
 	 (forward-char -1))
-(setq outer-top (point))
+(setq calc-embed-outer-top (point))
 (goto-char (match-end 0))
 (if (eq (following-char) ?\n)
 	(forward-char 1))
 (or (bolp)
 	(while (eq (following-char) ?\ )
 (or (eq plain 'plain)
 	(if (looking-at (regexp-quote calc-embedded-open-plain))
 	    (progn
 	      (goto-char (match-end 0))
 	      (search-forward calc-embedded-close-plain))))
-(setq top (point))
+(setq calc-embed-top (point))
 (or (re-search-forward calc-embedded-close-formula nil t)
 	(error "Can't find end of formula"))
 (if (< (point) home)
 	(error "Not inside a formula"))
 (and (eq (following-char) ?\n) (not (bolp))
 	 (forward-char 1))
-(setq outer-bot (point))
+(setq calc-embed-outer-bot (point))
 (goto-char (match-beginning 0))
 (if (eq (preceding-char) ?\n)
 	(backward-char 1))
 (or (eolp)
 	(while (eq (preceding-char) ?\ )
 	  (backward-char 1)))
-(setq bot (point))))
+(setq calc-embed-bot (point))))
 (defun calc-embedded-kill-formula ()
 "Kill the formula surrounding point.
 If Calc Embedded mode was active, this deactivates it.
 The formula (including its surrounding delimiters) is saved in the kill ring.
 (pop-mark)))
 (defun calc-embedded-duplicate ()
 (interactive)
 (let ((already calc-embedded-info)
-	top bot outer-top outer-bot new-top)
+	calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot new-top)
 (if calc-embedded-info
 	(progn
-	  (setq top (+ (aref calc-embedded-info 2))
+	  (setq calc-embed-top (+ (aref calc-embedded-info 2))
-		bot (+ (aref calc-embedded-info 3))
+		calc-embed-bot (+ (aref calc-embedded-info 3))
-		outer-top (+ (aref calc-embedded-info 4))
+		calc-embed-outer-top (+ (aref calc-embedded-info 4))
-		outer-bot (+ (aref calc-embedded-info 5)))
+		calc-embed-outer-bot (+ (aref calc-embedded-info 5)))
 	  (calc-embedded nil))
 (calc-embedded-find-bounds))
-(goto-char outer-bot)
+(goto-char calc-embed-outer-bot)
 (insert "\n")
 (setq new-top (point))
-(insert-buffer-substring (current-buffer) outer-top outer-bot)
+(insert-buffer-substring (current-buffer)
-(goto-char (+ new-top (- top outer-top)))
+calc-embed-outer-top calc-embed-outer-bot)
+(goto-char (+ new-top (- calc-embed-top calc-embed-outer-top)))
 (let ((calc-embedded-quiet (if already t 'x)))
-(calc-embedded (+ new-top (- top outer-top))
+(calc-embedded (+ new-top (- calc-embed-top calc-embed-outer-top))
-		     (+ new-top (- bot outer-top))
+		     (+ new-top (- calc-embed-bot calc-embed-outer-top))
 		     new-top
-		     (+ new-top (- outer-bot outer-top))))))
+		     (+ new-top (- calc-embed-outer-bot calc-embed-outer-top))))))
 (defun calc-embedded-next (arg)
 (interactive "P")
 (setq arg (prefix-numeric-value arg))
 (let* ((active (cdr (assq (current-buffer) calc-embedded-active)))
 (interactive)
 (and (eq major-mode 'calc-mode)
 (error "This command should be used in a normal editing buffer"))
 (if calc-embedded-info
 (calc-embedded nil))
-(let (top bot outer-top outer-bot)
+(let (calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot)
 (if (and (eq (preceding-char) ?\n)
 	     (string-match "\\`\n" calc-embedded-open-new-formula))
 	(progn
-	  (setq outer-top (1- (point)))
+	  (setq calc-embed-outer-top (1- (point)))
 	  (forward-char -1)
 	  (insert (substring calc-embedded-open-new-formula 1)))
-(setq outer-top (point))
+(setq calc-embed-outer-top (point))
 (insert calc-embedded-open-new-formula))
-(setq top (point))
+(setq calc-embed-top (point))
 (insert " ")
-(setq bot (point))
+(setq calc-embed-bot (point))
 (insert calc-embedded-close-new-formula)
 (if (and (eq (following-char) ?\n)
 	     (string-match "\n\\'" calc-embedded-close-new-formula))
 	(delete-char 1))
-(setq outer-bot (point))
+(setq calc-embed-outer-bot (point))
-(goto-char top)
+(goto-char calc-embed-top)
 (let ((calc-embedded-quiet 'x))
-(calc-embedded top bot outer-top outer-bot))))
+(calc-embedded calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot))))
 (defun calc-embedded-forget ()
 (interactive)
 (setq calc-embedded-active (delq (assq (current-buffer) calc-embedded-active)
 				   calc-embedded-active))
 (calc-embedded-active-state nil))
+;; The variables calc-embed-prev-modes is local to calc-embedded-update,
+;; but is used by calc-embedded-set-modes.
+(defvar calc-embed-prev-modes)
 (defun calc-embedded-set-modes (gmodes modes local-modes &optional temp)
 (let ((the-language (calc-embedded-language))
 	(the-display-just (calc-embedded-justify))
 	(v gmodes)
 	    (if (eq (setq value (cdr (car v))) 'default)
 		(setq value (list (nth 1 (assq (car (car v)) calc-mode-var-list)))))
 	    (equal (symbol-value (car (car v))) value))
 	  (progn
 	    (setq changed t)
-	    (if temp (setq prev-modes (cons (cons (car (car v))
+	    (if temp (setq calc-embed-prev-modes
-						  (symbol-value (car (car v))))
+(cons (cons (car (car v))
-					    prev-modes)))
+(symbol-value (car (car v))))
+calc-embed-prev-modes)))
 	    (set (car (car v)) value)))
 (setq v (cdr v)))
 (setq v modes)
 (while v
 (or (and (setq found (assq (car (car v)) local-modes))
 	       (not (eq (cdr found) 'default)))
 	  (eq (setq value (cdr (car v))) 'default)
 	  (equal (symbol-value (car (car v))) value)
 	  (progn
 	    (setq changed t)
-	    (if temp (setq prev-modes (cons (cons (car (car v))
+	    (if temp (setq calc-embed-prev-modes (cons (cons (car (car v))
 						  (symbol-value (car (car v))))
-					    prev-modes)))
+					    calc-embed-prev-modes)))
 	    (set (car (car v)) value)))
 (setq v (cdr v)))
 (setq v local-modes)
 (while v
 (or (eq (setq value (cdr (car v))) 'default)
 	  (equal (symbol-value (car (car v))) value)
 	  (progn
 	    (setq changed t)
-	    (if temp (setq prev-modes (cons (cons (car (car v))
+	    (if temp (setq calc-embed-prev-modes (cons (cons (car (car v))
 						  (symbol-value (car (car v))))
-					    prev-modes)))
+					    calc-embed-prev-modes)))
 	    (set (car (car v)) value)))
 (setq v (cdr v)))
 (and changed (not (eq temp t))
 	 (progn
 	   (calc-embedded-set-justify the-display-just)
 	       (setq no-defaults nil)))
 (backward-char 6))
 (goto-char save-pt)
 (list modes emodes pmodes)))
+;; The variable calc-embed-vars-used is local to calc-embedded-make-info,
+;; calc-embedded-evaluate-expr and calc-embedded-update, but is
+;; used by calc-embedded-find-vars, which is called by the above functions.
+(defvar calc-embed-vars-used)
 (defun calc-embedded-make-info (point cbuf fresh &optional
-				      top bot outer-top outer-bot)
+				      calc-embed-top calc-embed-bot
+calc-embed-outer-top calc-embed-outer-bot)
 (let* ((bufentry (assq (current-buffer) calc-embedded-active))
 	 (found bufentry)
-	 (force (and fresh top))
+	 (force (and fresh calc-embed-top))
-	 (fixed top)
+	 (fixed calc-embed-top)
 	 (new-info nil)
 	 info str)
 (or found
 	(setq found (list (current-buffer))
 	      calc-embedded-active (cons found calc-embedded-active)))
 	    fresh t)
 (aset info 0 (current-buffer))
 (aset info 1 (or cbuf (save-excursion
 			      (calc-create-buffer)
 			      (current-buffer)))))
-(if (and (integerp top) (not bot))  ; started with a user-supplied argument
+(if (and (integerp calc-embed-top) (not calc-embed-bot))
+; started with a user-supplied argument
 	(progn
 	  (if (= (setq arg (prefix-numeric-value arg)) 0)
 	      (progn
 		(aset info 2 (copy-marker (region-beginning)))
 		(aset info 3 (copy-marker (region-end))))
 	    (forward-line arg)
 	    (aset info (if (> arg 0) 3 2) (point-marker)))
 	  (aset info 4 (copy-marker (aref info 2)))
 	  (aset info 5 (copy-marker (aref info 3))))
 (if (aref info 4)
-	  (setq top (aref info 2)
+	  (setq calc-embed-top (aref info 2)
-		fixed top)
+		fixed calc-embed-top)
-	(if (consp top)
+	(if (consp calc-embed-top)
 	    (let ((calc-embedded-open-formula calc-embedded-open-word)
 		  (calc-embedded-close-formula calc-embedded-close-word))
 	      (calc-embedded-find-bounds 'plain))
-	  (or top
+	  (or calc-embed-top
 	      (calc-embedded-find-bounds 'plain)))
-	(aset info 2 (copy-marker (min top bot)))
+	(aset info 2 (copy-marker (min calc-embed-top calc-embed-bot)))
-	(aset info 3 (copy-marker (max top bot)))
+	(aset info 3 (copy-marker (max calc-embed-top calc-embed-bot)))
-	(aset info 4 (copy-marker (or outer-top (aref info 2))))
+	(aset info 4 (copy-marker (or calc-embed-outer-top (aref info 2))))
-	(aset info 5 (copy-marker (or outer-bot (aref info 3))))))
+	(aset info 5 (copy-marker (or calc-embed-outer-bot (aref info 3))))))
 (goto-char (aref info 2))
 (if new-info
 	(progn
 	  (or (bolp) (aset info 7 t))
 	  (goto-char (aref info 3))
 	      (calc-embedded-make-info point cbuf nil)
 	      (setq new-info nil))
 	  (let* ((open-plain calc-embedded-open-plain)
 		 (close-plain calc-embedded-close-plain)
 		 (pref-len (length open-plain))
-		 (vars-used nil)
+		 (calc-embed-vars-used nil)
 		 suff-pos val temp)
 	    (save-excursion
 	      (set-buffer (aref info 1))
 	      (calc-embedded-set-modes (aref info 15)
 				       (aref info 12) (aref info 14))
 		    (calc-embedded-active-state 'less))))
 	    (aset info 9 (and (eq (car-safe temp) 'calcFunc-assign)
 			      (nth 1 temp)))
 	    (if (memq (car-safe val) '(calcFunc-evalto calcFunc-assign))
 		(calc-embedded-find-vars val))
-	    (aset info 10 vars-used)
+	    (aset info 10 calc-embed-vars-used)
 	    (aset info 11 nil))))
 (if new-info
 	(progn
 	  (setcdr found (cons info (cdr found)))
 	  (calc-embedded-active-state 'more)))
 info))
 (defun calc-embedded-find-vars (x)
 (cond ((Math-primp x)
 	 (and (eq (car-safe x) 'var)
-	      (not (assoc x vars-used))
+	      (not (assoc x calc-embed-vars-used))
-	      (setq vars-used (cons (list x) vars-used))))
+	      (setq calc-embed-vars-used (cons (list x) calc-embed-vars-used))))
 	((eq (car x) 'calcFunc-evalto)
 	 (calc-embedded-find-vars (nth 1 x)))
 	((eq (car x) 'calcFunc-assign)
 	 (calc-embedded-find-vars (nth 2 x)))
 	(t
 	 (and (eq (car x) 'calcFunc-subscr)
 	      (eq (car-safe (nth 1 x)) 'var)
 	      (Math-primp (nth 2 x))
-	      (not (assoc x vars-used))
+	      (not (assoc x calc-embed-vars-used))
-	      (setq vars-used (cons (list x) vars-used)))
+	      (setq calc-embed-vars-used (cons (list x) calc-embed-vars-used)))
 	 (while (setq x (cdr x))
 	   (calc-embedded-find-vars (car x))))))
 (defun calc-embedded-evaluate-expr (x)
-(let ((vars-used (aref calc-embedded-info 10)))
+(let ((calc-embed-vars-used (aref calc-embedded-info 10)))
-(or vars-used (calc-embedded-find-vars x))
+(or calc-embed-vars-used (calc-embedded-find-vars x))
-(if vars-used
+(if calc-embed-vars-used
 	(let ((active (assq (aref calc-embedded-info 0) calc-embedded-active))
 	      (args nil))
 	  (save-excursion
 	    (calc-embedded-original-buffer t)
 	    (or active
 		(progn
 		  (calc-embedded-activate)
 		  (setq active (assq (aref calc-embedded-info 0)
 				     calc-embedded-active))))
-	    (while vars-used
+	    (while calc-embed-vars-used
-	      (calc-embedded-eval-get-var (car (car vars-used)) active)
+	      (calc-embedded-eval-get-var (car (car calc-embed-vars-used)) active)
-	      (setq vars-used (cdr vars-used))))
+	      (setq calc-embed-vars-used (cdr calc-embed-vars-used))))
 	  (calc-embedded-subst x))
 (calc-normalize (math-evaluate-expr-rec x)))))
 (defun calc-embedded-subst (x)
 (if (and (eq (car-safe x) 'calcFunc-evalto) (cdr x))
 	    (calc-embedded-eval-get-var var base))))))
 (defun calc-embedded-update (info which need-eval need-display
 				  &optional str entry old-val)
-(let* ((prev-modes nil)
+(let* ((calc-embed-prev-modes nil)
 	 (open-plain calc-embedded-open-plain)
 	 (close-plain calc-embedded-close-plain)
-	 (vars-used nil)
+	 (calc-embed-vars-used nil)
 	 (evalled nil)
 	 (val (aref info 8))
 	 (old-eval (aref info 11)))
 (or old-val (setq old-val val))
 (if (eq (car-safe val) 'calcFunc-evalto)
 		(setq val (math-evaluate-expr val)
 		      evalled val)))
 	  (if (or (eq need-eval 'eval) (eq (car-safe val) 'calcFunc-evalto))
 	      (aset info 8 val))
 	  (aset info 9 nil)
-	  (aset info 10 vars-used)
+	  (aset info 10 calc-embed-vars-used)
 	  (aset info 11 nil)
 	  (if (or need-display (eq (car-safe val) 'calcFunc-evalto))
 	      (let ((extra (if (eq calc-language 'big) 1 0)))
 		(or entry (setq entry (list val 1 nil)))
 		(or str (progn
 	    (if (eq (car-safe old-val) 'calcFunc-evalto)
 		(setq old-val (nth 1 old-val)))
 	    (if (eq (car-safe old-val) 'calcFunc-assign)
 		(calc-embedded-var-change (nth 1 old-val) (aref info 0)))))
 (set-buffer (aref info 1))
-(while prev-modes
+(while calc-embed-prev-modes
-	(cond ((eq (car (car prev-modes)) 'the-language)
+	(cond ((eq (car (car calc-embed-prev-modes)) 'the-language)
 	       (if need-display
-		   (calc-embedded-set-language (cdr (car prev-modes)))))
+		   (calc-embedded-set-language (cdr (car calc-embed-prev-modes)))))
-	      ((eq (car (car prev-modes)) 'the-display-just)
+	      ((eq (car (car calc-embed-prev-modes)) 'the-display-just)
 	       (if need-display
-		   (calc-embedded-set-justify (cdr (car prev-modes)))))
+		   (calc-embedded-set-justify (cdr (car calc-embed-prev-modes)))))
 	      (t
-	       (set (car (car prev-modes)) (cdr (car prev-modes)))))
+	       (set (car (car calc-embed-prev-modes))
-	(setq prev-modes (cdr prev-modes))))))
+(cdr (car calc-embed-prev-modes)))))
+	(setq calc-embed-prev-modes (cdr calc-embed-prev-modes))))))
 ;;; These are hooks called by the main part of Calc.
 		     "(Tried to recompute but formula was changed or missing)"))))
 	    (setq p (cdr p))))
 	(setq bp (if buf nil (cdr bp))))
 (or first calc-embedded-quiet (message "")))))
+(provide 'calc-embed)
 ;;; arch-tag: 1b8f311e-fba1-40d3-b8c3-1d6f68fd26fc
 ;;; calc-embed.el ends here

Mercurial > emacs

comparison lisp/calc/calc-embed.el @ 90054:f2ebccfa87d4