procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
`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.
This commit is contained in:
Christopher Schmidt 2014-10-28 19:37:37 -05:00 • committed by Jay Belanger
parent e4bf229c3c
commit 3f3b46d49b
7 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/calc/calc-aent.el
View file

@ -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)))))

12
lisp/calc/calc.el
View file

@ -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)