aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2004-12-01 20:57:30 +0000
committerJay Belanger2004-12-01 20:57:30 +0000
commitd5639b35f77763b44e0849823e884ab45fdc0420 (patch)
tree7deb5086f9d50c3deabf49c5e4b4c067ab4cbaa2
parentd8059b033116768212476cc68bbff8beb19b11ba (diff)
downloademacs-d5639b35f77763b44e0849823e884ab45fdc0420.tar.gz
emacs-d5639b35f77763b44e0849823e884ab45fdc0420.zip
(calc-inverse, calc-hyperbolic): Give more thorough messages.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-ext.el18
2 files changed, 21 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0750bd92404..e39db555779 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12004-12-01 Jay Belanger <belanger@truman.edu>
2
3 * calc/calc-ext.el (calc-inverse, calc-hyperbolic):
4 Change message.
5
12004-12-01 Juri Linkov <juri@jurta.org> 62004-12-01 Juri Linkov <juri@jurta.org>
2 7
3 * progmodes/prolog.el (prolog-mode-variables): 8 * progmodes/prolog.el (prolog-mode-variables):
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 3aede349e5e..3347d8f24a7 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1318,7 +1318,14 @@ calc-kill calc-kill-region calc-yank))))
1318 1318
1319(defun calc-inverse (&optional n) 1319(defun calc-inverse (&optional n)
1320 (interactive "P") 1320 (interactive "P")
1321 (calc-fancy-prefix 'calc-inverse-flag "Inverse..." n)) 1321 (let* ((hyp-flag (if (eq major-mode 'calc-keypad-mode)
1322 (with-current-buffer calc-main-buffer
1323 calc-hyperbolic-flag)
1324 calc-hyperbolic-flag))
1325 (msg (if hyp-flag
1326 "Inverse Hyperbolic..."
1327 "Inverse...")))
1328 (calc-fancy-prefix 'calc-inverse-flag msg n)))
1322 1329
1323(defconst calc-fancy-prefix-map 1330(defconst calc-fancy-prefix-map
1324 (let ((map (make-sparse-keymap))) 1331 (let ((map (make-sparse-keymap)))
@@ -1386,7 +1393,14 @@ calc-kill calc-kill-region calc-yank))))
1386 1393
1387(defun calc-hyperbolic (&optional n) 1394(defun calc-hyperbolic (&optional n)
1388 (interactive "P") 1395 (interactive "P")
1389 (calc-fancy-prefix 'calc-hyperbolic-flag "Hyperbolic..." n)) 1396 (let* ((inv-flag (if (eq major-mode 'calc-keypad-mode)
1397 (with-current-buffer calc-main-buffer
1398 calc-inverse-flag)
1399 calc-inverse-flag))
1400 (msg (if inv-flag
1401 "Inverse Hyperbolic..."
1402 "Hyperbolic...")))
1403 (calc-fancy-prefix 'calc-hyperbolic-flag msg n)))
1390 1404
1391(defun calc-hyperbolic-func () 1405(defun calc-hyperbolic-func ()
1392 (save-excursion 1406 (save-excursion