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.

7 files changed, 33 insertions, 10 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 462e7b6bbd3..c5daf44af91 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 2e9d71acd4f..ede9598c281 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -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).
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1a33d958b50..4717d3011f5 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/etc/NEWS b/etc/NEWS
index 42608f1d5a3..27b58fefbeb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c166b164ee..967e4a74c14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 107c0ae4ce4..968d30ee60a 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -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)))))
 
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 04d852e5cb3..85266fbac32 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -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)