aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-02-11 01:14:59 +0000
committerJuanma Barranquero2007-02-11 01:14:59 +0000
commitbd9bb96e15cb9c36523210260a6d863a1606eb89 (patch)
treec4df2bf597397e7a058b8215359e1c43b9558b14
parent4c4e05bb6617282a664f5eda7399948ee20e2f85 (diff)
downloademacs-bd9bb96e15cb9c36523210260a6d863a1606eb89.tar.gz
emacs-bd9bb96e15cb9c36523210260a6d863a1606eb89.zip
(calculator-mode-map): Fix typo in menu entry.
(calculator-prompt): Doc fix.
-rw-r--r--lisp/calculator.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 98fd5634663..53a3c96d948 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -88,9 +88,9 @@ This determines the default behavior of unary operators."
88 88
89(defcustom calculator-prompt "Calc=%s> " 89(defcustom calculator-prompt "Calc=%s> "
90 "*The prompt used by the Emacs calculator. 90 "*The prompt used by the Emacs calculator.
91It should contain a \"%s\" somewhere that will indicate the i/o radixes, 91It should contain a \"%s\" somewhere that will indicate the i/o radixes;
92this string will be a two-character string as described in the 92this will be a two-character string as described in the documentation
93documentation for `calculator-mode'." 93for `calculator-mode'."
94 :type 'string 94 :type 'string
95 :group 'calculator) 95 :group 'calculator)
96 96
@@ -561,7 +561,7 @@ Used for repeating operations in calculator-repR/L.")
561 calculator-output-radix)))] 561 calculator-output-radix)))]
562 "---" 562 "---"
563 ,@(mapcar 'car radix-selectors) 563 ,@(mapcar 'car radix-selectors)
564 ("Seperate I/O" 564 ("Separate I/O"
565 ,@(mapcar (lambda (x) (nth 1 x)) radix-selectors) 565 ,@(mapcar (lambda (x) (nth 1 x)) radix-selectors)
566 "---" 566 "---"
567 ,@(mapcar (lambda (x) (nth 2 x)) radix-selectors))) 567 ,@(mapcar (lambda (x) (nth 2 x)) radix-selectors)))
@@ -736,13 +736,13 @@ See the documentation for `calculator-mode' for more information."
736 (select-window 736 (select-window
737 (split-window-vertically 737 (split-window-vertically
738 ;; If the modeline might interfere with the calculator buffer, 738 ;; If the modeline might interfere with the calculator buffer,
739 ;; use 3 lines instead. 739 ;; use 3 lines instead.
740 (if (and (fboundp 'face-attr-construct) 740 (if (and (fboundp 'face-attr-construct)
741 (let* ((dh (plist-get (face-attr-construct 'default) :height)) 741 (let* ((dh (plist-get (face-attr-construct 'default) :height))
742 (mf (face-attr-construct 'modeline)) 742 (mf (face-attr-construct 'modeline))
743 (mh (plist-get mf :height))) 743 (mh (plist-get mf :height)))
744 ;; If the modeline is shorter than the default, 744 ;; If the modeline is shorter than the default,
745 ;; stick with 2 lines. (It may be necessary to 745 ;; stick with 2 lines. (It may be necessary to
746 ;; check how much shorter.) 746 ;; check how much shorter.)
747 (and 747 (and
748 (not 748 (not
@@ -766,7 +766,7 @@ See the documentation for `calculator-mode' for more information."
766 (let* ((bx (plist-get mf :box)) 766 (let* ((bx (plist-get mf :box))
767 (lh (plist-get bx :line-width))) 767 (lh (plist-get bx :line-width)))
768 (and bx 768 (and bx
769 (or 769 (or
770 (not lh) 770 (not lh)
771 (> lh 0)))) 771 (> lh 0))))
772 ;; If the modeline has an overline, use 3 lines. 772 ;; If the modeline has an overline, use 3 lines.