# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1117203916 0
# Node ID 3e8d22427034b3d4722e12da9a2047520226a471
# Parent  afd60531171302c7c33792d3d0209f3e514fb963
(calc-kbd-report): Remove.
(calc-kbd-query): Rewrite.

diff -r afd605311713 -r 3e8d22427034 lisp/calc/calc-prog.el
--- a/lisp/calc/calc-prog.el	Fri May 27 14:18:59 2005 +0000
+++ b/lisp/calc/calc-prog.el	Fri May 27 14:25:16 2005 +0000
@@ -1446,15 +1446,22 @@
     (error "Unbalanced Z' in keyboard macro")))
 
 
-(defun calc-kbd-report (msg)
-  (interactive "sMessage: ")
-  (calc-wrapper
-   (math-working msg (calc-top-n 1))))
+;; (defun calc-kbd-report (msg)
+;;   (interactive "sMessage: ")
+;;   (calc-wrapper
+;;    (math-working msg (calc-top-n 1))))
 
-(defun calc-kbd-query (msg)
-  (interactive "sPrompt: ")
-  (calc-wrapper
-   (calc-alg-entry nil (and (not (equal msg "")) msg))))
+(defun calc-kbd-query ()
+  (interactive)
+  (let ((defining-kbd-macro nil)
+        (executing-kbd-macro nil)
+        (msg (calc-top 1)))
+    (if (not (eq (car-safe msg) 'vec))
+        (error "No prompt string provided on stack")
+      (setq msg (math-vector-to-string msg))
+      (calc-wrapper
+       (calc-pop-stack 1)
+       (calc-alg-entry nil (and (not (equal msg "")) msg))))))
 
 ;;;; Logical operations.