From: Jay Belanger Date: Sun, 27 Feb 2011 01:55:29 +0000 (-0600) Subject: Adjust previous change to behave as intended. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~717 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53f963cf73d93a7d1dca07d4c338acd5b6c8cb2f;p=emacs.git Adjust previous change to behave as intended. --- diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el index 401a4f516c6..47ef3241b3e 100644 --- a/lisp/calc/calc-vec.el +++ b/lisp/calc/calc-vec.el @@ -759,13 +759,13 @@ (math-reject-arg n "*Index out of range"))))) (defun calcFunc-subscr (mat n &optional m) - (if (eq (car-safe mat) 'var) nil) - (setq mat (calcFunc-mrow mat n)) - (if m - (if (math-num-integerp n) - (calcFunc-mrow mat m) - (calcFunc-mcol mat m)) - mat)) + (if (eq (car-safe mat) 'var) nil + (setq mat (calcFunc-mrow mat n)) + (if m + (if (math-num-integerp n) + (calcFunc-mrow mat m) + (calcFunc-mcol mat m)) + mat))) ;;; Get the Nth column of a matrix. (defun math-mat-col (mat n)