diff man/emacs.texi @ 69506:91970b147f39

* emacs-xtra.texi (Emerge, Picture Mode. Fortran): New chapters, moved here from Emacs manual. * programs.texi (Fortran): Section moved to emacs-xtra. (Program Modes): Xref to Fortran in emacs-xtra. * maintaining.texi (Emerge): Moved to emacs-xtra. * files.texi (Comparing Files): Xref to Emerge in emacs-xtra. * picture.texi: File deleted. * text.texi (Text): Xref to Picture Mode in emacs-xtra. * abbrevs.texi (Abbrevs): * sending.texi (Sending Mail): Picture node removed. * emacs.texi (Top): Update node listings.

--- a/man/emacs.texi	Thu Mar 16 02:22:20 2006 +0000
+++ b/man/emacs.texi	Thu Mar 16 03:19:56 2006 +0000
@@ -103,8 +103,6 @@
 Outline Mode
 @TeX{} Mode
 Formatted Text
-Fortran Mode
-Fortran Indentation
 Shell Command History
 
 The ones for Dired and Rmail have had the items turned into :: items
@@ -182,8 +180,6 @@
 * Maintaining::         Features for maintaining large programs.
 * Abbrevs::	        How to define text abbreviations to reduce
 			  the number of characters you must type.
-* Picture::	        Editing pictures made up of characters
-			  using the quarter-plane screen model.
 * Sending Mail::        Sending mail in Emacs.
 * Rmail::	        Reading mail in Emacs.
 * Dired::	        You can ``edit'' a directory to manage files in it.
@@ -525,7 +521,6 @@
 * Misc for Programs::   Other Emacs features useful for editing programs.
 * C Modes::             Special commands of C, C++, Objective-C,
                           Java, and Pike modes.
-* Fortran::             Fortran mode and its special features.
 * Asm Mode::            Asm mode and its special features.
 
 Top-Level Definitions, or Defuns
@@ -572,15 +567,6 @@
 * Other C Commands::    Filling comments, viewing expansion of macros,
                           and other neat features.
 
-Fortran Mode
-
-* Fortran Motion::	Moving point by statements or subprograms.
-* Fortran Indent::	Indentation commands for Fortran.
-* Fortran Comments::	Inserting and aligning comments.
-* Fortran Autofill::	Auto fill minor mode for Fortran.
-* Fortran Columns::	Measuring columns for valid Fortran.
-* Fortran Abbrev::	Built-in abbrevs for Fortran keywords.
-
 Compiling and Testing Programs
 
 * Compilation::		Compiling programs in languages other
@@ -615,7 +601,6 @@
 * Format of ChangeLog:: What the change log file looks like.
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
-* Emerge::	        A convenient way of merging two versions of a program.
 
 Tags Tables
 
@@ -627,19 +612,6 @@
 * Tags Search::		Using a tags table for searching and replacing.
 * List Tags::		Listing and finding tags defined in a file.
 
-Merging Files with Emerge
-
-* Overview of Emerge::	How to start Emerge.  Basic concepts.
-* Submodes of Emerge::	Fast mode vs. Edit mode.
-			  Skip Prefers mode and Auto Advance mode.
-* State of Difference::	You do the merge by specifying state A or B
-			  for each difference.
-* Merge Commands::	Commands for selecting a difference,
-			  changing states of differences, etc.
-* Exiting Emerge::	What to do when you've finished the merge.
-* Combining in Emerge::	    How to keep both alternatives for a difference.
-* Fine Points of Emerge::   Misc.
-
 Abbrevs
 
 * Abbrev Concepts::     Fundamentals of defined abbrevs.
@@ -650,14 +622,6 @@
 * Dynamic Abbrevs::     Abbreviations for words already in the buffer.
 * Dabbrev Customization:: What is a word, for dynamic abbrevs.  Case handling.
 
-Editing Pictures
-
-* Basic Picture::	Basic concepts and simple commands of Picture Mode.
-* Insert in Picture::	Controlling direction of cursor motion
-			  after "self-inserting" characters.
-* Tabs in Picture::	Various features for tab stops and indentation.
-* Rectangles in Picture:: Clearing and superimposing rectangles.
-
 Sending Mail
 
 * Mail Format:: 	Format of the mail being composed.
@@ -1179,7 +1143,6 @@
 @include building.texi
 @include maintaining.texi
 @include abbrevs.texi
-@include picture.texi
 @include sending.texi
 @include rmail.texi
 @include dired.texi