summaryrefslogtreecommitdiff
path: root/lisp/calc/calc-aent.el
diff options
context:
space:
mode:
authorChristopher Schmidt <ch@ristopher.com>2014-10-28 19:37:37 -0500
committerJay Belanger <jay.p.belanger@gmail.com>2014-10-28 19:37:37 -0500
commit3f3b46d49bbf90ebbaa66c42d0ccffb5c9621eb7 (patch)
tree038d70f578436248984d5e462cb8e4440bcd47b3 /lisp/calc/calc-aent.el
parente4bf229c3c94cf93a013f97fadea724d5dd85a45 (diff)
downloademacs-3f3b46d49bbf90ebbaa66c42d0ccffb5c9621eb7.tar.gz
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.
Diffstat (limited to 'lisp/calc/calc-aent.el')
-rw-r--r--lisp/calc/calc-aent.el5
1 files changed, 3 insertions, 2 deletions
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)))))