From: Glenn Morris Date: Thu, 3 May 2012 06:43:02 +0000 (-0700) Subject: Small edits for programs.texi in Emacs manual X-Git-Tag: emacs-24.0.97~56 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e258c6a6aee28f1e68a8e85bf6d47895992dee4a;p=emacs.git Small edits for programs.texi in Emacs manual * doc/emacs/programs.texi (Programs, Electric C): Copyedits. (Program Modes): Add xref to Fortran. (Left Margin Paren): Remove what was (oddly enough) the only use of defvar in the entire Emacs manual. (Hungry Delete): Remove footnote about ancient Emacs version. (Other C Commands): Use example rather than smallexample. --- diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index c7d2f0b7eda..b654b1c16ca 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,12 @@ 2012-05-03 Glenn Morris + * programs.texi (Programs, Electric C): Copyedits. + (Program Modes): Add xref to Fortran. + (Left Margin Paren): Remove what was (oddly enough) the only use + of defvar in the entire Emacs manual. + (Hungry Delete): Remove footnote about ancient Emacs version. + (Other C Commands): Use example rather than smallexample. + * text.texi (Pages, Filling, Foldout, Org Mode, HTML Mode) (Nroff Mode, Enriched Indentation, Table Rows and Columns): Tweak line and page breaks. diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 23f808b93ea..b7f21e8a93c 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -9,7 +9,7 @@ @cindex program editing This chapter describes Emacs features for facilitating editing -programs. Some of these features can: +programs. Some of the things these features can do are: @itemize @bullet @item @@ -128,8 +128,7 @@ IDL/Pike/AWK (@pxref{Top, , CC Mode, ccmode, CC Mode}), and IDLWAVE @ifnotinfo The Emacs distribution contains Info manuals for the major modes for Ada, C/C++/Objective C/Java/Corba IDL/Pike/AWK, and IDLWAVE. For -Fortran mode, see the ``Fortran'' section in the Info version of the -Emacs manual, which is not included in this printed version. +Fortran mode, @pxref{Fortran,,, emacs-xtra, Specialized Emacs Features}. @end ifnotinfo @node Defuns @@ -186,15 +185,13 @@ delimiter from starting a defun. Here's an example: highlights confusing opening delimiters (those that ought to be quoted) in bold red. +@vindex open-paren-in-column-0-is-defun-start If you need to override this convention, you can do so by setting -this user option: - -@defvar open-paren-in-column-0-is-defun-start +the variable @code{open-paren-in-column-0-is-defun-start}. If this user option is set to @code{t} (the default), opening -parentheses or braces at column zero always start defuns. When it's +parentheses or braces at column zero always start defuns. When it is @code{nil}, defuns are found by searching for parens or braces at the outermost level. -@end defvar Usually, you should leave this option at its default value of @code{t}. If your buffer contains parentheses or braces in column @@ -1553,8 +1550,8 @@ after the mode name: @kindex C-c C-l @r{(C mode)} @findex c-toggle-electric-state Toggle electric action (@code{c-toggle-electric-state}). With a -prefix argument, this command enables electric action if the argument -is positive, disables it if it is negative. +positive prefix argument, this command enables electric action, with a +negative one it disables it. @end table Electric characters insert newlines only when, in addition to the @@ -1591,8 +1588,7 @@ preprocessor commands. @findex c-hungry-delete-backwards @kindex C-c C-@key{DEL} (C Mode) @kindex C-c @key{DEL} (C Mode) -@code{c-hungry-delete-backwards}---Delete the entire block of whitespace -preceding point. +Delete the entire block of whitespace preceding point (@code{c-hungry-delete-backwards}). @item C-c C-d @itemx C-c C-@key{DELETE} @@ -1601,8 +1597,7 @@ preceding point. @kindex C-c C-d (C Mode) @kindex C-c C-@key{DELETE} (C Mode) @kindex C-c @key{DELETE} (C Mode) -@code{c-hungry-delete-forward}---Delete the entire block of whitespace -following point. +Delete the entire block of whitespace after point (@code{c-hungry-delete-forward}). @end table As an alternative to the above commands, you can enable @dfn{hungry @@ -1615,9 +1610,7 @@ preceding whitespace, not just one space, and a single @kbd{C-c C-d} @item M-x c-toggle-hungry-state @findex c-toggle-hungry-state Toggle the hungry-delete feature -(@code{c-toggle-hungry-state})@footnote{This command had the binding -@kbd{C-c C-d} in earlier versions of Emacs. @kbd{C-c C-d} is now -bound to @code{c-hungry-delete-forward}.}. With a prefix argument, +(@code{c-toggle-hungry-state}). With a prefix argument, this command turns the hungry-delete feature on if the argument is positive, and off if it is negative. @end table @@ -1656,11 +1649,11 @@ needs a binding to be useful. The following code will bind it to @kbd{C-j}. We use @code{c-initialization-hook} here to make sure the keymap is loaded before we try to change it. -@smallexample +@example (defun my-bind-clb () (define-key c-mode-base-map "\C-j" 'c-context-line-break)) (add-hook 'c-initialization-hook 'my-bind-clb) -@end smallexample +@end example @item C-M-h Put mark at the end of a function definition, and put point at the