Merge from trunk.

[gnu-emacs] / lisp / calculator.el

diff --git a/lisp/calculator.el b/lisp/calculator.el
index 45ed699c4f5d0b9b1490aece1c92e437ab6c493c..4a79316d73607e26a87fc008ee020bc704205965 100644 (file)
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -198,11 +198,11 @@ For example, use this to define the golden ratio number:
   (setq calculator-user-registers '((?g .  1.61803398875)))
 before you load calculator."
   :type  '(repeat (cons character number))
-  :set   '(lambda (_ val)
-            (and (boundp 'calculator-registers)
-                 (setq calculator-registers
-                       (append val calculator-registers)))
-            (setq calculator-user-registers val))
+  :set   (lambda (_ val)
+           (and (boundp 'calculator-registers)
+                (setq calculator-registers
+                      (append val calculator-registers)))
+           (setq calculator-user-registers val))
   :group 'calculator)
 
 (defcustom calculator-user-operators nil
@@ -482,7 +482,7 @@ Used for repeating operations in calculator-repR/L.")
             ["Electric mode"
              (progn (calculator-quit)
                     (setq calculator-restart-other-mode t)
-                    (run-with-timer 0.1 nil '(lambda () (message nil)))
+                    (run-with-timer 0.1 nil (lambda () (message nil)))
                     ;; the message from the menu will be visible,
                     ;; couldn't make it go away...
                     (calculator))
@@ -706,7 +706,7 @@ See the documentation for `calculator-mode' for more information."
               (Electric-command-loop
                'calculator-done
                ;; can't use 'noprompt, bug in electric.el
-               '(lambda () 'noprompt)
+               (lambda () 'noprompt)
                nil
                (lambda (x y) (calculator-update-display))))
           (and calculator-buffer
@@ -720,7 +720,7 @@ See the documentation for `calculator-mode' for more information."
            ;; maybe leave two lines for our window because of the normal
            ;; `raised' modeline in Emacs 21
            (select-window
-            (split-window-vertically
+            (split-window-below
              ;; If the modeline might interfere with the calculator buffer,
              ;; use 3 lines instead.
              (if (and (fboundp 'face-attr-construct)