Mercurial > emacs
changeset 86455:57027a3a29e3
(calc-modes-menu): Add normal and incomplete algebraic modes.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Tue, 27 Nov 2007 01:07:15 +0000 |
parents | ebd4b500132c |
children | b3d5d8240204 |
files | lisp/calc/calc-menu.el |
diffstat | 1 files changed, 27 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc-menu.el Mon Nov 26 20:27:12 2007 +0000 +++ b/lisp/calc/calc-menu.el Tue Nov 27 01:07:15 2007 +0000 @@ -1052,18 +1052,42 @@ :style radio :selected (eq (car-safe calc-float-format) 'eng)]) (list "Algebraic" + ["Normal" + (progn + (require 'calc-mode) + (cond + (calc-incomplete-algebraic-mode + (calc-algebraic-mode t)) + (calc-algebraic-mode + (calc-algebraic-mode nil)))) + :style radio + :selected (not calc-algebraic-mode)] ["Algebraic mode" (progn (require 'calc-mode) - (call-interactively 'calc-algebraic-mode)) + (if (or + calc-incomplete-algebraic-mode + (not calc-algebraic-mode)) + (calc-algebraic-mode nil))) :keys "m a" :style radio - :selected (eq calc-algebraic-mode t) + :selected (and calc-algebraic-mode + (not calc-incomplete-algebraic-mode)) :help "Keys which start numeric entry also start algebraic entry"] + ["Incomplete algebraic mode" + (progn + (require 'calc-mode) + (unless calc-incomplete-algebraic-mode + (calc-algebraic-mode t))) + :keys "C-u m a" + :style radio + :selected calc-incomplete-algebraic-mode + :help "Only ( and [ begin algebraic entry"] ["Total algebraic mode" (progn (require 'calc-mode) - (call-interactively 'calc-total-algebraic-mode)) + (unless (eq calc-algebraic-mode 'total) + (calc-total-algebraic-mode nil))) :keys "m t" :style radio :selected (eq calc-algebraic-mode 'total)