Commit 3f3b46d4 authored by Christopher Schmidt's avatar Christopher Schmidt Committed by Jay Belanger
Browse files

doc/misc/calc.texi (Quick Calculator): Mention prefix argument of

`quick-calc'. 

etc/NEWS: Mention prefix argument of `quick-calc'.

lisp/calc/calc.el (quick-calc):
lisp/calc/calc-aent.el (calc-do-quick-calc): New argument INSERT.
parent e4bf229c
2014-10-28 Christopher Schmidt <ch@ristopher.com>
* calc.texi (Quick Calculator): Mention prefix argument of
`quick-calc'.
2014-10-26 Eric S. Raymond <esr@thyrsus.com>
* efaq-w32.texi: Neutralized language specific to a repository type.
......
......@@ -10168,9 +10168,10 @@ to yank the result into the next @kbd{C-x * q} input line as a more
explicit alternative to @kbd{$} notation, or to yank the result
into the Calculator stack after typing @kbd{C-x * c}.
If you finish your formula by typing @key{LFD} (or @kbd{C-j}) instead
of @key{RET}, the result is inserted immediately into the current
buffer rather than going into the kill ring.
If you give a prefix argument to @kbd{C-x * q} or finish your formula
by typing @key{LFD} (or @kbd{C-j}) instead of @key{RET}, the result is
inserted immediately into the current buffer rather than going into
the kill ring.
Quick Calculator results are actually evaluated as if by the @kbd{=}
key (which replaces variable names by their stored values, if any).
2014-09-13 Christopher Schmidt <ch@ristopher.com>
* NEWS: Mention prefix argument of `quick-calc'.
2014-10-20 Glenn Morris <rgm@gnu.org>
* Merge in all changes up to 24.4 release.
......
......@@ -127,6 +127,11 @@ Unicode standards.
* Changes in Specialized Modes and Packages in Emacs 25.1
** Calc
+++
*** If `quick-calc' is called with a prefix argument, insert the
result of the calculation into the current buffer.
** ElDoc
*** New minor mode global-eldoc-mode
*** eldoc-documentation-function now defaults to nil
......
2014-10-28 Christopher Schmidt <ch@ristopher.com>
* calc/calc.el (quick-calc):
* calc/calc-aent.el (calc-do-quick-calc): New argument INSERT.
2014-10-28 Sam Steingold <sds@gnu.org>
* net/rcirc.el (rcirc-fill-column): Allow any symbolic value for
......
......@@ -52,7 +52,7 @@
"The history list for quick-calc.")
;;;###autoload
(defun calc-do-quick-calc ()
(defun calc-do-quick-calc (&optional insert)
(require 'calc-ext)
(calc-check-defines)
(if (eq major-mode 'calc-mode)
......@@ -108,7 +108,8 @@
(setq buf long))))
(calc-handle-whys)
(message "Result: %s" buf)))
(if (eq last-command-event 10)
(if (or insert
(eq last-command-event 10))
(insert shortbuf)
(kill-new shortbuf)))))
......
......@@ -147,7 +147,7 @@
(declare-function calc-edit-finish "calc-yank" (&optional keep))
(declare-function calc-edit-cancel "calc-yank" ())
(declare-function calc-locate-cursor-element "calc-yank" (pt))
(declare-function calc-do-quick-calc "calc-aent" ())
(declare-function calc-do-quick-calc "calc-aent" (&optional insert))
(declare-function calc-do-calc-eval "calc-aent" (str separator args))
(declare-function calc-do-keypad "calc-keypd" (&optional full-display interactive))
(declare-function calcFunc-unixtime "calc-forms" (date &optional zone))
......@@ -1549,10 +1549,12 @@ commands given here will actually operate on the *Calculator* stack."
(and kbuf (bury-buffer kbuf))))))
;;;###autoload
(defun quick-calc ()
"Do a quick calculation in the minibuffer without invoking full Calculator."
(interactive)
(calc-do-quick-calc))
(defun quick-calc (&optional insert)
"Do a quick calculation in the minibuffer without invoking full Calculator.
With prefix argument INSERT, insert the result in the current
buffer. Otherwise, the result is copied into the kill ring."
(interactive "P")
(calc-do-quick-calc insert))
;;;###autoload
(defun calc-eval (str &optional separator &rest args)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment