[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el |
Date: |
Wed, 24 Nov 2004 01:09:12 -0500 |
Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.33 emacs/lisp/calc/calc.el:1.34
*** emacs/lisp/calc/calc.el:1.33 Tue Nov 9 20:30:10 2004
--- emacs/lisp/calc/calc.el Wed Nov 24 06:01:45 2004
***************
*** 3016,3034 ****
(setcar (cdr entry) (calc-count-lines s))
s))
! (defun math-stack-value-offset (c)
(let* ((num (if calc-line-numbering 4 0))
! (wid (calc-window-width))
! off)
(if calc-display-just
(progn
(calc-extensions)
(math-stack-value-offset-fancy))
! (setq off (or calc-display-origin 0))
(when (integerp calc-line-breaking)
! (setq wid calc-line-breaking)))
! (cons (max (- off (length calc-left-label)) 0)
! (+ wid num))))
(defun calc-count-lines (s)
(let ((pos 0)
--- 3016,3038 ----
(setcar (cdr entry) (calc-count-lines s))
s))
! ;; The variables math-svo-c, math-svo-wid and math-svo-off are local
! ;; to math-stack-value-offset, but are used by math-stack-value-offset-fancy
! ;; in calccomp.el.
!
! (defun math-stack-value-offset (math-svo-c)
(let* ((num (if calc-line-numbering 4 0))
! (math-svo-wid (calc-window-width))
! math-svo-off)
(if calc-display-just
(progn
(calc-extensions)
(math-stack-value-offset-fancy))
! (setq math-svo-off (or calc-display-origin 0))
(when (integerp calc-line-breaking)
! (setq math-svo-wid calc-line-breaking)))
! (cons (max (- math-svo-off (length calc-left-label)) 0)
! (+ math-svo-wid num))))
(defun calc-count-lines (s)
(let ((pos 0)