* doc/misc/calc.texi: Improve indexing.

doc/misc/calc.texi

@@ -31447,6 +31447,7 @@ newline so that mode annotations will appear on lines by themselves.
 @node Programming
 @chapter Programming
 
+@cindex Programming Calc
 @noindent
 There are several ways to ``program'' the Emacs Calculator, depending
 on the nature of the problem you need to solve.
@@ -31575,7 +31576,7 @@ following sections.
 
 @noindent
 @kindex X
-@cindex Programming with keyboard macros
+@cindex Programming Calc, with keyboard macros
 @cindex Keyboard macros
 The easiest way to ``program'' the Emacs Calculator is to use standard
 keyboard macros.  Press @w{@kbd{C-x (}} to begin recording a macro.  From
@@ -31976,7 +31977,7 @@ The @kbd{m m} command saves the last invocation macro defined by
 @noindent
 @kindex Z F
 @pindex calc-user-define-formula
-@cindex Programming with algebraic formulas
+@cindex Programming Calc, with algebraic formulas
 Another way to create a new Calculator command uses algebraic formulas.
 The @kbd{Z F} (@code{calc-user-define-formula}) command stores the
 formula at the top of the stack as the definition for a key.  This
@@ -32085,6 +32086,7 @@ in symbolic form without ever activating the @code{deriv} function.  Press
 @node Lisp Definitions
 @section Programming with Lisp
 
+@section Programming Calc, with Lisp
 @noindent
 The Calculator can be programmed quite extensively in Lisp.  All you
 do is write a normal Lisp function definition, but with @code{defmath}
@@ -32830,6 +32832,7 @@ a large argument, a simpler program like the first one shown is fine.
 @node Calling Calc from Your Programs
 @subsection Calling Calc from Your Lisp Programs
 
+@cindex Calling Calc from Lisp
 @noindent
 A later section (@pxref{Internals}) gives a full description of
 Calc's internal Lisp functions.  It's not hard to call Calc from