* doc/emacs/emacs.texi: Simplify following removal of node pointers.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 307d103a806721fe5e5fc959703ab3b0591beccc..6380bae5f18ea1718a17008e0ff3deacb80f5157 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-27  Glenn Morris  <rgm@gnu.org>
 
+       * emacs.texi: Simplify following removal of node pointers.
+
        * ack.texi, anti.texi, basic.texi, buffers.texi, building.texi:
        * cmdargs.texi, commands.texi, display.texi, emacs.texi:
        * entering.texi, files.texi, fixit.texi, frames.texi, glossary.texi:

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index e0a861a194b471e52518c337b6fbb695b5d387b0..87a550064e4fc529de809a19556ab2f3d43c605f 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1555,37 +1555,20 @@ Lisp programming.
 @c The Option Index is produced only in the on-line version,
 @c because the index entries related to command-line options
 @c tend to point to the same pages and all begin with a dash.
-@c This, and the need to keep the node links consistent, are
-@c the reasons for the funky @iftex/@ifnottex dance below.
-@c The Option Index is _not_ before Key Index, because that
-@c would require changes in the glossary.texi's @node line.
-@c It is not after Concept Index for similar reasons.
 
-@iftex
 @node Key Index
 @unnumbered Key (Character) Index
 @printindex ky
-@end iftex
 
 @ifnottex
-@node Key Index
-@unnumbered Key (Character) Index
-@printindex ky
-
 @node Option Index
 @unnumbered Command-Line Options Index
 @printindex op
-
-@node Command Index
-@unnumbered Command and Function Index
-@printindex fn
 @end ifnottex
 
-@iftex
 @node Command Index
 @unnumbered Command and Function Index
 @printindex fn
-@end iftex
 
 @node Variable Index
 @unnumbered Variable Index