aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2012-05-02 23:22:54 -0700
committerGlenn Morris2012-05-02 23:22:54 -0700
commit4223d75523a085c44d536841a6ae7a565538d8f1 (patch)
treeefd5d7908dc6ab4e5b17353a828e880bc552eafb /doc
parent0b40418e9fa9f1465d78aa5a0257d5701f04d8bc (diff)
downloademacs-4223d75523a085c44d536841a6ae7a565538d8f1.tar.gz
emacs-4223d75523a085c44d536841a6ae7a565538d8f1.zip
More page break tweaks for the manual
* doc/emacs/text.texi (Pages, Filling, Foldout, Org Mode, HTML Mode) (Nroff Mode, Enriched Indentation, Table Rows and Columns): Tweak line and page breaks.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/text.texi34
2 files changed, 22 insertions, 16 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 83511037c69..c7d2f0b7eda 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
12012-05-03 Glenn Morris <rgm@gnu.org> 12012-05-03 Glenn Morris <rgm@gnu.org>
2 2
3 * text.texi (Pages, Filling, Foldout, Org Mode, HTML Mode)
4 (Nroff Mode, Enriched Indentation, Table Rows and Columns):
5 Tweak line and page breaks.
6
3 * modes.texi (Major Modes, Minor Modes): Reword to improve page-breaks. 7 * modes.texi (Major Modes, Minor Modes): Reword to improve page-breaks.
4 (Major Modes): Use example rather than smallexample. 8 (Major Modes): Use example rather than smallexample.
5 9
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index e56b00e2723..90f4732079b 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -379,8 +379,8 @@ delimited once again. The reason @kbd{C-x C-p} includes only the
379following page delimiter in the region is to ensure that. 379following page delimiter in the region is to ensure that.
380 380
381 A numeric argument to @kbd{C-x C-p} specifies which page to go to, 381 A numeric argument to @kbd{C-x C-p} specifies which page to go to,
382relative to the current one. Zero means the current page. One means 382relative to the current one. Zero means the current page, one
383the next page, and @minus{}1 means the previous one. 383the next page, and @minus{}1 the previous one.
384 384
385@kindex C-x l 385@kindex C-x l
386@findex count-lines-page 386@findex count-lines-page
@@ -412,7 +412,7 @@ beginning of a line.
412specified width. Emacs does filling in two ways. In Auto Fill mode, 412specified width. Emacs does filling in two ways. In Auto Fill mode,
413inserting text with self-inserting characters also automatically fills 413inserting text with self-inserting characters also automatically fills
414it. There are also explicit fill commands that you can use when editing 414it. There are also explicit fill commands that you can use when editing
415text leaves it unfilled. 415text.
416 416
417@menu 417@menu
418* Auto Fill:: Auto Fill mode breaks long lines automatically. 418* Auto Fill:: Auto Fill mode breaks long lines automatically.
@@ -1240,6 +1240,7 @@ quad click: exit all folds and hide text.
1240@end itemize 1240@end itemize
1241@end table 1241@end table
1242 1242
1243@c FIXME not marked as a user variable
1243@vindex foldout-mouse-modifiers 1244@vindex foldout-mouse-modifiers
1244 You can specify different modifier keys (instead of 1245 You can specify different modifier keys (instead of
1245@kbd{Control-Meta-}) by setting @code{foldout-mouse-modifiers}; but if 1246@kbd{Control-Meta-}) by setting @code{foldout-mouse-modifiers}; but if
@@ -1248,7 +1249,7 @@ it in order for this to take effect.
1248 1249
1249 To use the Foldout package, you can type @kbd{M-x load-library 1250 To use the Foldout package, you can type @kbd{M-x load-library
1250@key{RET} foldout @key{RET}}; or you can arrange for to do that 1251@key{RET} foldout @key{RET}}; or you can arrange for to do that
1251automatically by putting this in your init file (@pxref{Init File}): 1252automatically by putting the following in your init file:
1252 1253
1253@example 1254@example
1254(eval-after-load "outline" '(require 'foldout)) 1255(eval-after-load "outline" '(require 'foldout))
@@ -1307,8 +1308,8 @@ with @kbd{M-<left>} (@code{org-metaleft}) and @kbd{M-<right>}
1307if invoked on a body line. 1308if invoked on a body line.
1308 1309
1309 The following subsections give basic instructions for using Org mode 1310 The following subsections give basic instructions for using Org mode
1310as an organizer and as an authoring system. @xref{Top,The Org Mode 1311as an organizer and as an authoring system. For details, @pxref{Top,
1311Manual,,org, The Org Manual}, for details. 1312The Org Mode Manual, Introduction, org, The Org Manual}.
1312 1313
1313@menu 1314@menu
1314* Org Organizer:: Managing TODO lists and agendas. 1315* Org Organizer:: Managing TODO lists and agendas.
@@ -1886,8 +1887,8 @@ the tag at point.
1886@kindex C-c / @r{(SGML mode)} 1887@kindex C-c / @r{(SGML mode)}
1887@findex sgml-close-tag 1888@findex sgml-close-tag
1888Insert a close tag for the innermost unterminated tag 1889Insert a close tag for the innermost unterminated tag
1889(@code{sgml-close-tag}). If called from within a tag or a comment, 1890(@code{sgml-close-tag}). If called within a tag or a comment,
1890close this element instead of inserting a close tag. 1891close it instead of inserting a close tag.
1891 1892
1892@item C-c 8 1893@item C-c 8
1893@kindex C-c 8 @r{(SGML mode)} 1894@kindex C-c 8 @r{(SGML mode)}
@@ -1948,10 +1949,10 @@ always insert explicit closing tags as well.
1948@cindex nroff 1949@cindex nroff
1949@findex nroff-mode 1950@findex nroff-mode
1950@vindex nroff-mode-hook 1951@vindex nroff-mode-hook
1951 Nroff mode is a major mode derived from Text mode, which is 1952 Nroff mode, a major mode derived from Text mode, is
1952specialized for editing nroff files (e.g.@: Unix man pages). Type 1953specialized for editing nroff files (e.g.@: Unix man pages). Type
1953@kbd{M-x nroff-mode} to enter this mode. Entering Nroff mode runs the 1954@kbd{M-x nroff-mode} to enter this mode. Entering Nroff mode runs the
1954hook @code{text-mode-hook}, followed by @code{nroff-mode-hook} 1955hook @code{text-mode-hook}, then @code{nroff-mode-hook}
1955(@pxref{Hooks}). 1956(@pxref{Hooks}).
1956 1957
1957 In Nroff mode, nroff command lines are treated as paragraph 1958 In Nroff mode, nroff command lines are treated as paragraph
@@ -2209,7 +2210,7 @@ for the right or left margin of a paragraph or a part of a paragraph.
2209These margins also affect fill commands such as @kbd{M-q} 2210These margins also affect fill commands such as @kbd{M-q}
2210(@pxref{Filling}). 2211(@pxref{Filling}).
2211 2212
2212 The Indentation submenu of Text Properties provides four commands 2213 The Indentation submenu of Text Properties offers commands
2213for specifying indentation: 2214for specifying indentation:
2214 2215
2215@table @code 2216@table @code
@@ -2292,10 +2293,9 @@ commands do nothing on text with this setting. You can, however,
2292still indent the left margin. 2293still indent the left margin.
2293@end table 2294@end table
2294 2295
2296@vindex default-justification
2295 You can also specify justification styles using the Justification 2297 You can also specify justification styles using the Justification
2296submenu in the Text Properties menu. 2298submenu in the Text Properties menu.
2297
2298@vindex default-justification
2299 The default justification style is specified by the per-buffer 2299 The default justification style is specified by the per-buffer
2300variable @code{default-justification}. Its value should be one of the 2300variable @code{default-justification}. Its value should be one of the
2301symbols @code{left}, @code{right}, @code{full}, @code{center}, or 2301symbols @code{left}, @code{right}, @code{full}, @code{center}, or
@@ -2578,10 +2578,12 @@ to @code{nil}.
2578@findex table-insert-row 2578@findex table-insert-row
2579 @kbd{M-x table-insert-row} inserts a row of cells before the current 2579 @kbd{M-x table-insert-row} inserts a row of cells before the current
2580table row. The current row, together with point, is pushed down past 2580table row. The current row, together with point, is pushed down past
2581the new row. To insert rows after the last row at the bottom of a 2581the new row. To insert a row after the last row at the bottom of a
2582table, invoke this command with point below the table, just below the 2582table, invoke this command with point below the table, just below the
2583bottom edge. A numeric prefix argument specifies the number of rows 2583bottom edge. You can insert more than one row at a time by using a
2584to insert. 2584numeric prefix argument.
2585
2586@c A numeric prefix argument specifies the number of rows to insert.
2585 2587
2586@findex table-insert-column 2588@findex table-insert-column
2587 Similarly, @kbd{M-x table-insert-column} inserts a column of cells 2589 Similarly, @kbd{M-x table-insert-column} inserts a column of cells