[Emacs-diffs] Changes to emacs/lisp/calc/calc-embed.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-embed.el
diff -c emacs/lisp/calc/calc-embed.el:1.25 emacs/lisp/calc/calc-embed.el:1.26
*** emacs/lisp/calc/calc-embed.el:1.25  Sun May  8 04:58:38 2005
--- emacs/lisp/calc/calc-embed.el       Sat May 28 04:36:16 2005
***************
*** 192,199 ****
  (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 off or switch to a new buffer.
--- 192,206 ----
  (defvar calc-embed-top)
  (defvar calc-embed-bot)
  
+ ;; The variable calc-embed-arg is local to calc-do-embedded,
+ ;; calc-embedded-update-formula, calc-embedded-edit and
+ ;; calc-do-embedded-activate, but is used by 
+ ;; calc-embedded-make-info, which is called by the above
+ ;; functions.
+ (defvar calc-embed-arg)
+ 
  (defvar calc-embedded-quiet nil)
! (defun calc-do-embedded (calc-embed-arg end obeg oend)
    (if calc-embedded-info
  
        ;; Turn embedded mode off or switch to a new buffer.
***************
*** 237,243 ****
                                         (buffer-name)))
                       (keyboard-quit))
                   (calc-embedded nil)))
!            (calc-embedded arg end obeg oend)))
  
      ;; Turn embedded mode on.
      (calc-plain-buffer-only)
--- 244,250 ----
                                         (buffer-name)))
                       (keyboard-quit))
                   (calc-embedded nil)))
!            (calc-embedded calc-embed-arg end obeg oend)))
  
      ;; Turn embedded mode on.
      (calc-plain-buffer-only)
***************
*** 250,256 ****
        (calc-embedded-save-original-modes)
        (or calc-embedded-globals
          (calc-find-globals))
!       (setq info (calc-embedded-make-info (point) nil t arg end obeg oend))
        (if (eq (car-safe (aref info 8)) 'error)
          (progn
              (setq calc-embedded-original-modes nil)
--- 257,264 ----
        (calc-embedded-save-original-modes)
        (or calc-embedded-globals
          (calc-find-globals))
!       (setq info 
!             (calc-embedded-make-info (point) nil t calc-embed-arg end obeg 
oend))
        (if (eq (car-safe (aref info 8)) 'error)
          (progn
              (setq calc-embedded-original-modes nil)
***************
*** 311,323 ****
         (calc-select-part 2)))
  
  
! (defun calc-embedded-update-formula (arg)
    (interactive "P")
!   (if arg
        (let ((entry (assq (current-buffer) calc-embedded-active)))
        (while (setq entry (cdr entry))
          (and (eq (car-safe (aref (car entry) 8)) 'calcFunc-evalto)
!              (or (not (consp arg))
                   (and (<= (aref (car entry) 2) (region-beginning))
                        (>= (aref (car entry) 3) (region-end))))
               (save-excursion
--- 319,331 ----
         (calc-select-part 2)))
  
  
! (defun calc-embedded-update-formula (calc-embed-arg)
    (interactive "P")
!   (if calc-embed-arg
        (let ((entry (assq (current-buffer) calc-embedded-active)))
        (while (setq entry (cdr entry))
          (and (eq (car-safe (aref (car entry) 8)) 'calcFunc-evalto)
!              (or (not (consp calc-embed-arg))
                   (and (<= (aref (car entry) 2) (region-beginning))
                        (>= (aref (car entry) 3) (region-end))))
               (save-excursion
***************
*** 337,345 ****
              (goto-char (+ (aref info 4) pt))))))))
  
  
! (defun calc-embedded-edit (arg)
    (interactive "P")
!   (let ((info (calc-embedded-make-info (point) nil t arg))
        str)
      (if (eq (car-safe (aref info 8)) 'error)
        (progn
--- 345,353 ----
              (goto-char (+ (aref info 4) pt))))))))
  
  
! (defun calc-embedded-edit (calc-embed-arg)
    (interactive "P")
!   (let ((info (calc-embedded-make-info (point) nil t calc-embed-arg))
        str)
      (if (eq (car-safe (aref info 8)) 'error)
        (progn
***************
*** 374,385 ****
        (aset info 8 val)
        (calc-embedded-update info 14 t t))))
  
! (defun calc-do-embedded-activate (arg cbuf)
    (calc-plain-buffer-only)
!   (if arg
        (calc-embedded-forget))
    (calc-find-globals)
!   (if (< (prefix-numeric-value arg) 0)
        (message "Deactivating %s for Calc Embedded mode" (buffer-name))
      (message "Activating %s for Calc Embedded mode..." (buffer-name))
      (save-excursion
--- 382,393 ----
        (aset info 8 val)
        (calc-embedded-update info 14 t t))))
  
! (defun calc-do-embedded-activate (calc-embed-arg cbuf)
    (calc-plain-buffer-only)
!   (if calc-embed-arg
        (calc-embedded-forget))
    (calc-find-globals)
!   (if (< (prefix-numeric-value calc-embed-arg) 0)
        (message "Deactivating %s for Calc Embedded mode" (buffer-name))
      (message "Activating %s for Calc Embedded mode..." (buffer-name))
      (save-excursion
***************
*** 802,814 ****
      (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))))
!           (aset info (if (> arg 0) 2 3) (point-marker))
!           (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)
--- 810,822 ----
      (if (and (integerp calc-embed-top) (not calc-embed-bot))  
                                          ; started with a user-supplied 
argument
        (progn
!         (if (= (setq calc-embed-arg (prefix-numeric-value calc-embed-arg)) 0)
              (progn
                (aset info 2 (copy-marker (region-beginning)))
                (aset info 3 (copy-marker (region-end))))
!           (aset info (if (> calc-embed-arg 0) 2 3) (point-marker))
!           (forward-line calc-embed-arg)
!           (aset info (if (> calc-embed-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)