[Emacs-diffs] trunk r118226: doc/misc/calc.texi (Quick Calculator): Mention prefix argument of

[Jay Belanger]

------------------------------------------------------------
revno: 118226
revision-id: address@hidden
parent: address@hidden
author: Christopher Schmidt  <address@hidden>
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Tue 2014-10-28 19:37:37 -0500
message:
  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.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/calc.texi             calc.texi-20091113204419-o5vbwnq5f7feedwu-6290
  etc/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1485
  etc/NEWS                       news-20141002041645-34n5fasbwydbo8t6-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calc/calc-aent.el         
calcaent.el-20091113204419-o5vbwnq5f7feedwu-2269
  lisp/calc/calc.el              calc.el-20091113204419-o5vbwnq5f7feedwu-2306

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-10-26 15:38:44 +0000
+++ b/doc/misc/ChangeLog        2014-10-29 00:37:37 +0000
@@ -1,3 +1,8 @@
+2014-10-28  Christopher Schmidt  <address@hidden>
+
+       * calc.texi (Quick Calculator): Mention prefix argument of
+       `quick-calc'.
+
 2014-10-26  Eric S. Raymond  <address@hidden>
 
        * efaq-w32.texi: Neutralized language specific to a repository type.

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2014-06-10 02:20:31 +0000
+++ b/doc/misc/calc.texi        2014-10-29 00:37:37 +0000
@@ -10168,9 +10168,10 @@
 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).

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2014-10-21 01:17:06 +0000
+++ b/etc/ChangeLog     2014-10-29 00:37:37 +0000
@@ -1,3 +1,7 @@
+2014-09-13  Christopher Schmidt  <address@hidden>
+
+       * NEWS: Mention prefix argument of `quick-calc'.
+
 2014-10-20  Glenn Morris  <address@hidden>
 
        * Merge in all changes up to 24.4 release.

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-10-22 10:01:17 +0000
+++ b/etc/NEWS  2014-10-29 00:37:37 +0000
@@ -127,6 +127,11 @@
 
 * 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-28 21:55:28 +0000
+++ b/lisp/ChangeLog    2014-10-29 00:37:37 +0000
@@ -1,3 +1,8 @@
+2014-10-28  Christopher Schmidt  <address@hidden>
+
+       * calc/calc.el (quick-calc):
+       * calc/calc-aent.el (calc-do-quick-calc): New argument INSERT.
+
 2014-10-28  Sam Steingold  <address@hidden>
 
        * net/rcirc.el (rcirc-fill-column): Allow any symbolic value for

=== modified file 'lisp/calc/calc-aent.el'
--- a/lisp/calc/calc-aent.el    2014-01-01 07:43:34 +0000
+++ b/lisp/calc/calc-aent.el    2014-10-29 00:37:37 +0000
@@ -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)))))
 

=== modified file 'lisp/calc/calc.el'
--- a/lisp/calc/calc.el 2014-06-28 17:27:29 +0000
+++ b/lisp/calc/calc.el 2014-10-29 00:37:37 +0000
@@ -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 @@
         (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)