Mercurial > emacs
comparison lisp/calc/calc-mode.el @ 65988:43c517a3ef4e
(calc-matrix-mode, math-get-modes-vec): Change the mode name `square'
to 'sqmatrix'.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Mon, 10 Oct 2005 19:38:02 +0000 |
| parents | f4c158053fb0 |
| children | 6bf177f8065b 5e2d3828e89f |
comparison
equal
deleted
inserted
replaced
| 65987:16a03d245dee | 65988:43c517a3ef4e |
|---|---|
| 350 (if calc-symbolic-mode 1 0) | 350 (if calc-symbolic-mode 1 0) |
| 351 (if calc-prefer-frac 1 0) | 351 (if calc-prefer-frac 1 0) |
| 352 (if (eq calc-complex-mode 'polar) 1 0) | 352 (if (eq calc-complex-mode 'polar) 1 0) |
| 353 (cond ((eq calc-matrix-mode 'scalar) 0) | 353 (cond ((eq calc-matrix-mode 'scalar) 0) |
| 354 ((eq calc-matrix-mode 'matrix) -2) | 354 ((eq calc-matrix-mode 'matrix) -2) |
| 355 ((eq calc-matrix-mode 'square) -3) | 355 ((eq calc-matrix-mode 'sqmatrix) -3) |
| 356 (calc-matrix-mode) | 356 (calc-matrix-mode) |
| 357 (t -1)) | 357 (t -1)) |
| 358 (cond ((eq calc-simplify-mode 'none) -1) | 358 (cond ((eq calc-simplify-mode 'none) -1) |
| 359 ((eq calc-simplify-mode 'num) 0) | 359 ((eq calc-simplify-mode 'num) 0) |
| 360 ((eq calc-simplify-mode 'binary) 2) | 360 ((eq calc-simplify-mode 'binary) 2) |
| 476 (calc-change-mode 'calc-matrix-mode | 476 (calc-change-mode 'calc-matrix-mode |
| 477 (cond ((eq arg 0) 'scalar) | 477 (cond ((eq arg 0) 'scalar) |
| 478 ((< (prefix-numeric-value arg) 1) | 478 ((< (prefix-numeric-value arg) 1) |
| 479 (and (< (prefix-numeric-value arg) -1) 'matrix)) | 479 (and (< (prefix-numeric-value arg) -1) 'matrix)) |
| 480 (arg | 480 (arg |
| 481 (if (consp arg) 'square | 481 (if (consp arg) 'sqmatrix |
| 482 (prefix-numeric-value arg))) | 482 (prefix-numeric-value arg))) |
| 483 ((eq calc-matrix-mode 'matrix) 'scalar) | 483 ((eq calc-matrix-mode 'matrix) 'scalar) |
| 484 ((eq calc-matrix-mode 'scalar) nil) | 484 ((eq calc-matrix-mode 'scalar) nil) |
| 485 (t 'matrix))) | 485 (t 'matrix))) |
| 486 (if (integerp calc-matrix-mode) | 486 (if (integerp calc-matrix-mode) |
| 487 (message "Variables are assumed to be %dx%d matrices" | 487 (message "Variables are assumed to be %dx%d matrices" |
| 488 calc-matrix-mode calc-matrix-mode) | 488 calc-matrix-mode calc-matrix-mode) |
| 489 (message (if (eq calc-matrix-mode 'matrix) | 489 (message (if (eq calc-matrix-mode 'matrix) |
| 490 "Variables are assumed to be matrices" | 490 "Variables are assumed to be matrices" |
| 491 (if (eq calc-matrix-mode 'square) | 491 (if (eq calc-matrix-mode 'sqmatrix) |
| 492 "Variables are assumed to be square matrices" | 492 "Variables are assumed to be square matrices" |
| 493 (if calc-matrix-mode | 493 (if calc-matrix-mode |
| 494 "Variables are assumed to be scalars (non-matrices)" | 494 "Variables are assumed to be scalars (non-matrices)" |
| 495 "Variables are not assumed to be matrix or scalar"))))))) | 495 "Variables are not assumed to be matrix or scalar"))))))) |
| 496 | 496 |