Mercurial > emacs

changeset 58467:4a905282edbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(math-stack-value-offset): Replace variables c, wid and off with math-svo-c, math-svo-wid and math-svo-off.
author Jay Belanger <jay.p.belanger@gmail.com>
date Wed, 24 Nov 2004 06:01:45 +0000
parents bf2edad57436
children b4af18be9885
files lisp/calc/calc.el
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calc/calc.el	Wed Nov 24 06:00:30 2004 +0000
+++ b/lisp/calc/calc.el	Wed Nov 24 06:01:45 2004 +0000
@@ -3016,19 +3016,23 @@
     (setcar (cdr entry) (calc-count-lines s))
     s))
 
-(defun math-stack-value-offset (c)
+;; 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))
-	 (wid (calc-window-width))
-	 off)
+	 (math-svo-wid (calc-window-width))
+	 math-svo-off)
     (if calc-display-just
 	(progn
 	  (calc-extensions)
 	  (math-stack-value-offset-fancy))
-      (setq off (or calc-display-origin 0))
+      (setq math-svo-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))))
+	(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)