[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.16 emacs/lisp/calc/calc-embed.el:1.17
*** emacs/lisp/calc/calc-embed.el:1.16  Tue Feb  1 03:57:08 2005
--- emacs/lisp/calc/calc-embed.el       Fri Feb  4 06:22:18 2005
***************
*** 967,985 ****
                  (calc-embedded-original-buffer t info)
                  (or (equal str (aref info 6))
                      (let ((delta (- (aref info 5) (aref info 3)))
                            (buffer-read-only nil))
                        (goto-char (aref info 2))
                        (delete-region (point) (aref info 3))
                        (and (> (nth 1 entry) (1+ extra))
                             (aref info 7)
                             (progn
-                              (aset info 7 nil)
                               (delete-horizontal-space)
!                              (insert "\n\n")
!                              (delete-horizontal-space)
!                              (backward-char 1)))
                        (insert str)
!                       (set-marker (aref info 3) (point))
                        (set-marker (aref info 5) (+ (point) delta))
                        (aset info 6 str))))))
          (if (eq (car-safe val) 'calcFunc-evalto)
--- 967,990 ----
                  (calc-embedded-original-buffer t info)
                  (or (equal str (aref info 6))
                      (let ((delta (- (aref info 5) (aref info 3)))
+                             (adjbot 0)
                            (buffer-read-only nil))
                        (goto-char (aref info 2))
                        (delete-region (point) (aref info 3))
                        (and (> (nth 1 entry) (1+ extra))
                             (aref info 7)
                             (progn
                               (delete-horizontal-space)
!                                (if (looking-at "\n")
!                                    ;; If there's a newline there, don't add 
one
!                                    (insert "\n")
!                                  (insert "\n\n")
!                                  (delete-horizontal-space)
!                                  (setq adjbot 1)
! ;                               (setq delta (1+ delta))
!                                  (backward-char 1))))
                        (insert str)
!                       (set-marker (aref info 3) (+ (point) adjbot))
                        (set-marker (aref info 5) (+ (point) delta))
                        (aset info 6 str))))))
          (if (eq (car-safe val) 'calcFunc-evalto)