# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1139775675 0
# Node ID 353348d5ce788fdcd4fff7b246653829ef3596b1
# Parent  4359a8ec809218e584688d6a03237edd3f3e3169
(Defuns): Delete duplicate explanation of left-margin paren convention.
(Hungry Delete): Minor cleanup.

diff -r 4359a8ec8092 -r 353348d5ce78 man/programs.texi
--- a/man/programs.texi	Sun Feb 12 17:46:11 2006 +0000
+++ b/man/programs.texi	Sun Feb 12 20:21:15 2006 +0000
@@ -132,19 +132,6 @@
 something like a function, is called a @dfn{defun}.  The name comes
 from Lisp, but in Emacs we use it for all languages.
 
-  In many programming language modes, Emacs assumes that a defun is
-any pair of parentheses (or braces, if the language uses braces this
-way) that starts at the left margin.  For example, in C, the body of a
-function definition is a defun, usually recognized as an open-brace
-that begins at the left margin@footnote{Alternatively, you can set up
-C Mode to recognize a defun at an opening brace at the outermost
-level.  @xref{Movement Commands,,, ccmode, the CC Mode Manual}.}.  A
-variable's initializer can also count as a defun, if the open-brace
-that begins the initializer is at the left margin.
-
-  However, some language modes provide their own code for recognizing
-defuns in a way that suits the language syntax and conventions better.
-
 @menu
 * Left Margin Paren::   An open-paren or similar opening delimiter
                           starts a defun if it is at the left margin.
@@ -1573,9 +1560,9 @@
 
   As an alternative to the above commands, you can enable @dfn{hungry
 delete mode}.  When this feature is enabled (indicated by @samp{/h} in
-the mode line after the mode name), a single @key{DEL} command deletes
-all preceding whitespace, not just one space, and a single @kbd{C-c
-C-d} (but @emph{not} @key{DELETE}) deletes all following whitespace.
+the mode line after the mode name), a single @key{DEL} deletes all
+preceding whitespace, not just one space, and a single @kbd{C-c C-d}
+(but @emph{not} plain @key{DELETE}) deletes all following whitespace.
 
 @table @kbd
 @item M-x c-toggle-hungry-state