[Emacs-diffs] Changes to emacs/man/calc.texi

[Jay Belanger]

Index: emacs/man/calc.texi
diff -c emacs/man/calc.texi:1.62 emacs/man/calc.texi:1.63
*** emacs/man/calc.texi:1.62    Wed May 25 20:55:49 2005
--- emacs/man/calc.texi Fri May 27 14:18:59 2005
***************
*** 31395,31417 ****
  @node Queries in Macros, , Local Values in Macros, Keyboard Macros
  @subsection Queries in Keyboard Macros
  
! @noindent
! @kindex Z =
! @pindex calc-kbd-report
! The @kbd{Z =} (@code{calc-kbd-report}) command displays an informative
! message including the value on the top of the stack.  You are prompted
! to enter a string.  That string, along with the top-of-stack value,
! is displayed unless @kbd{m w} (@code{calc-working}) has been used
! to turn such messages off.
  
  @kindex Z #
  @pindex calc-kbd-query
! The @kbd{Z #} (@code{calc-kbd-query}) command displays a prompt message
! (which you enter during macro definition), then does an algebraic entry
! which takes its input from the keyboard, even during macro execution.
! This command allows your keyboard macros to accept numbers or formulas
! as interactive input.  All the normal conventions of algebraic input,
! including the use of @kbd{$} characters, are supported.
  
  @xref{Keyboard Macro Query, , , emacs, the Emacs Manual}, for a description of
  @kbd{C-x q} (@code{kbd-macro-query}), the standard Emacs way to accept
--- 31395,31429 ----
  @node Queries in Macros, , Local Values in Macros, Keyboard Macros
  @subsection Queries in Keyboard Macros
  
! @c @noindent
! @c @kindex Z =
! @c @pindex calc-kbd-report
! @c The @kbd{Z =} (@code{calc-kbd-report}) command displays an informative
! @c message including the value on the top of the stack.  You are prompted
! @c to enter a string.  That string, along with the top-of-stack value,
! @c is displayed unless @kbd{m w} (@code{calc-working}) has been used
! @c to turn such messages off.
  
+ @noindent
  @kindex Z #
  @pindex calc-kbd-query
! The @kbd{Z #} (@code{calc-kbd-query}) command prompts for an algebraic
! entry which takes its input from the keyboard, even during macro
! execution.  All the normal conventions of algebraic input, including the
! use of @kbd{$} characters, are supported.  The prompt message itself is
! taken from the top of the stack, and so must be entered (as a string)
! before the @kbd{Z #} command.  (Recall, as a string it can be entered by
! pressing the @kbd{"} key and will appear as a vector when it is put on
! the stack.  The prompt message is only put on the stack to provide a
! prompt for the @kbd{Z #} command; it will not play any role in any
! subsequent calculations.)  This command allows your keyboard macros to
! accept numbers or formulas as interactive input.
! 
! As an example, 
! @kbd{2 @key{RET} "Power: " @key{RET} Z # 3 @key{RET}} will prompt for
! input with ``Power: '' in the minibuffer, then return 2 to the provided
! power.  (The response to the prompt that's given, 3 in this example,
! will not be part of the macro.)
  
  @xref{Keyboard Macro Query, , , emacs, the Emacs Manual}, for a description of
  @kbd{C-x q} (@code{kbd-macro-query}), the standard Emacs way to accept
***************
*** 35869,35876 ****
  @c
  @r{       @:      Z `   @:             @:        @:calc-kbd-push@:}
  @r{       @:      Z '   @:             @:        @:calc-kbd-pop@:}
! @r{      a@:      Z =   @:message      @:    28  @:calc-kbd-report@:}
! @r{       @:      Z #   @:prompt       @:        @:calc-kbd-query@:}
  
  @c
  @r{   comp@:      Z C   @:func, args   @:    50  
@:calc-user-define-composition@:}
--- 35881,35887 ----
  @c
  @r{       @:      Z `   @:             @:        @:calc-kbd-push@:}
  @r{       @:      Z '   @:             @:        @:calc-kbd-pop@:}
! @r{       @:      Z #   @:             @:        @:calc-kbd-query@:}
  
  @c
  @r{   comp@:      Z C   @:func, args   @:    50  
@:calc-user-define-composition@:}