X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5b31640cadf1f58d59f34ae9763d7ec3921e225a..b23ef7a531da10cd87990fa903b3417e0eba3944:/man/programs.texi

diff --git a/man/programs.texi b/man/programs.texi
index 5cd769446a..63b694f270 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -42,6 +42,9 @@ Highlight program syntax (@pxref{Font Lock}).
 * C Modes::             Special commands of C, C++, Objective-C,
                           Java, and Pike modes.
 * Asm Mode::            Asm mode and its special features.
+@ifnottex
+* Fortran::             Fortran mode and its special features.
+@end ifnottex
 @end menu
 
 @node Program Modes
@@ -109,7 +112,14 @@ tab character before point, in these modes.
 Mode, ada-mode, Ada Mode}), C/C++/Objective C/Java/Corba IDL/Pike/AWK
 (@pxref{Top, , CC Mode, ccmode, CC Mode}) and the IDLWAVE modes
 (@pxref{Top, , IDLWAVE, idlwave, IDLWAVE User Manual}).  For Fortran
-mode, @inforef{Fortran,, emacs-xtra}.
+mode, see
+@iftex
+@ref{Fortran,,, emacs-xtra}.
+@end iftex
+@ifnottex
+@ref{Fortran}.
+@end ifnottex
+
 
 @cindex mode hook
 @vindex c-mode-hook
@@ -387,9 +397,10 @@ the characters around it.
 @findex newline-and-indent
   When entering lines of new code, use @kbd{C-j}
 (@code{newline-and-indent}), which inserts a newline and then adjusts
-indentation after it.  Thus, @kbd{C-j} at the end of a line creates a
-blank line with appropriate indentation.  In programming language
-modes, it is equivalent to @key{RET} @key{TAB}.
+indentation after it.  (It also deletes any trailing whitespace which
+remains before the new newline.)  Thus, @kbd{C-j} at the end of a line
+creates a blank line with appropriate indentation.  In programming
+language modes, it is equivalent to @key{RET} @key{TAB}.
 
   @key{TAB} indents a line that starts within a parenthetical grouping
 under the preceding line within the grouping, or the text after the
@@ -1741,6 +1752,10 @@ Insert or align a comment.
   The variable @code{asm-comment-char} specifies which character
 starts comments in assembler syntax.
 
+@ifnottex
+@include fortran-xtra.texi
+@end ifnottex
+
 @ignore
    arch-tag: c7ee7409-40a4-45c7-bfb7-ae7f2c74d0c0
 @end ignore