Commit 166bc0c8 authored by Chong Yidong's avatar Chong Yidong
Browse files

Emacs manual tweaks to accomodate 7x9 pdf.

* emacs.texi: Update ISBN and edition number.

* anti.texi:
* building.texi:
* cmdargs.texi:
* custom.texi:
* display.texi:
* files.texi:
* frames.texi:
* glossary.texi:
* misc.texi:
* mule.texi:
* programs.texi:
* sending.texi:
* text.texi: Copyedits to avoid underfull/overfull in 7x9 manual.
parent edcdbe4d
2012-06-10 Chong Yidong <cyd@gnu.org>
* emacs.texi: Update ISBN and edition number.
* anti.texi:
* building.texi:
* cmdargs.texi:
* custom.texi:
* display.texi:
* files.texi:
* frames.texi:
* glossary.texi:
* misc.texi:
* mule.texi:
* programs.texi:
* sending.texi:
* text.texi: Copyedits to avoid underfull/overfull in 7x9 manual.
2012-06-01 Chong Yidong <cyd@gnu.org>
* Version 24.1 released.
......
......@@ -63,14 +63,12 @@ string (@code{isearch-yank-line}), whereas @kbd{M-y} does
@kbd{C-y} and @kbd{M-y} is unintended.
@item
Various completion features have been simplified. The options
@code{completion-cycle-threshold} and
@code{completion-category-overrides} have been removed. Due to the
latter removal, Emacs uses a single consistent scheme to generate
completions, instead of using a separate scheme for (say) buffer name
completion. Several major modes, such as Shell mode, now implement
their own inline completion commands instead of using
@code{completion-at-point}.
Various completion features have been simplified. The option
@code{completion-category-overrides} has been removed, so Emacs uses a
single consistent scheme to generate completions, instead of using a
separate scheme for (say) buffer name completion. Several major
modes, such as Shell mode, now implement their own inline completion
commands instead of using @code{completion-at-point}.
@item
We have removed various options for controlling how windows are used,
......
......@@ -426,11 +426,11 @@ syntax checking tool used depends on the language; for example, for
C/C++ files this is usually the C compiler. Flymake can also use
build tools such as @code{make} for checking complicated projects.
To enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump to
the errors that it finds by using @kbd{M-x
flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}.
Use the command @kbd{M-x flymake-display-err-menu-for-current-line}
to display any error messages associated with the current line.
To enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump
to the errors that it finds by using @kbd{M-x flymake-goto-next-error}
and @kbd{M-x flymake-goto-prev-error}. To display any error messages
associated with the current line, type @kbd{M-x
flymake-display-err-menu-for-current-line}.
For more details about using Flymake,
@ifnottex
......
......@@ -436,7 +436,7 @@ Used by the @code{cd} command to search for the directory you specify,
when you specify a relative directory name.
@item EMACSDATA
Directory for the architecture-independent files that come with Emacs.
This is used to initialize the Lisp variable @code{data-directory}.
This is used to initialize the variable @code{data-directory}.
@item EMACSDOC
Directory for the documentation string file, which is used to
initialize the Lisp variable @code{doc-directory}.
......@@ -577,7 +577,8 @@ does not use @env{TZ} at all.
The user's login name. See also @env{LOGNAME}. On MS-DOS, this
defaults to @samp{root}.
@item VERSION_CONTROL
Used to initialize the @code{version-control} variable (@pxref{Backup Names}).
Used to initialize the @code{version-control} Lisp variable
(@pxref{Backup Names}).
@end table
@node Misc Variables
......
......@@ -765,16 +765,14 @@ displays something like this:
@example
fill-column is a variable defined in `C source code'.
fill-column's value is 70
Local in buffer custom.texi; global value is 70
Automatically becomes buffer-local when set in any fashion.
Automatically becomes buffer-local when set in any fashion.
This variable is safe as a file local variable if its value
satisfies the predicate `integerp'.
Automatically becomes buffer-local when set in any fashion.
This variable is safe as a file local variable if its value
satisfies the predicate `integerp'.
Documentation:
*Column beyond which automatic line-wrapping should happen.
Interactively, you can set the buffer local value using C-x f.
Column beyond which automatic line-wrapping should happen.
Interactively, you can set the local value with C-x f.
You can customize this variable.
@end example
......@@ -1055,12 +1053,13 @@ pair with a colon and semicolon. The special variable/value pair
@findex delete-file-local-variable-prop-line
@findex copy-dir-locals-to-file-locals-prop-line
You can use the command @kbd{M-x add-file-local-variable-prop-line}
instead of adding entries by hand. It prompts for
a variable and value, and adds them to the first line in the
appropriate way. @kbd{M-x delete-file-local-variable-prop-line}
prompts for a variable, and deletes its entry from the line. @kbd{M-x
copy-dir-locals-to-file-locals-prop-line} copies directory-local
variables to the first line (@pxref{Directory Variables}).
instead of adding entries by hand. This command prompts for a
variable and value, and adds them to the first line in the appropriate
way. The command @kbd{M-x delete-file-local-variable-prop-line}
prompts for a variable, and deletes its entry from the line. The
command @kbd{M-x copy-dir-locals-to-file-locals-prop-line} copies the
current directory-local variables to the first line (@pxref{Directory
Variables}).
Here is an example first line that specifies Lisp mode and sets two
variables with numeric values:
......
......@@ -759,11 +759,10 @@ argument disables it.
@findex global-font-lock-mode
@vindex global-font-lock-mode
To toggle Font Lock mode in all buffers, type @kbd{M-x
global-font-lock-mode}. To impose this setting for future Emacs
sessions, customize the variable @code{global-font-lock-mode}
(@pxref{Easy Customization}), or add the following line to your init
file:
Type @kbd{M-x global-font-lock-mode} to toggle Font Lock mode in all
buffers. To impose this setting for future Emacs sessions, customize
the variable @code{global-font-lock-mode} (@pxref{Easy
Customization}), or add the following line to your init file:
@example
(global-font-lock-mode 0)
......
......@@ -14,7 +14,7 @@
@c be something added by the FSF during the publishing process.
@c Also, the lispref uses a float (3.0), whereas this uses an ordinal,
@c so the format is not even consistent.
@set EDITION Sixteenth
@set EDITION Seventeenth
@include emacsver.texi
@copying
......@@ -96,10 +96,10 @@ developing GNU and promoting software freedom.''
Published by the Free Software Foundation @*
51 Franklin Street, Fifth Floor @*
Boston, MA 02110-1301 USA @*
ISBN 1-882114-86-8
ISBN 978-0-9831592-2-3
@sp 2
Cover art by Etienne Suvasa.
Cover art by Etienne Suvasa; cover design by Matt Lee.
@end titlepage
......
......@@ -1096,11 +1096,11 @@ recover are present in Emacs buffers. You should then save them. Only
this---saving them---updates the files themselves.
@vindex auto-save-list-file-prefix
Emacs records information about interrupted sessions for later
recovery in files named @file{.saves-@var{pid}-@var{hostname}} in the
directory @file{~/.emacs.d/auto-save-list/}. This directory is
determined by the variable @code{auto-save-list-file-prefix}. If you
set @code{auto-save-list-file-prefix} to @code{nil}, sessions are not
Emacs records information about interrupted sessions in files named
@file{.saves-@var{pid}-@var{hostname}} in the directory
@file{~/.emacs.d/auto-save-list/}. This directory is determined by
the variable @code{auto-save-list-file-prefix}. If you set
@code{auto-save-list-file-prefix} to @code{nil}, sessions are not
recorded for recovery.
@node File Aliases
......
......@@ -499,7 +499,8 @@ Add a line to your init file, modifying the variable
(@pxref{Frame Parameters}), like this:
@example
(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
(add-to-list 'default-frame-alist
'(font . "DejaVu Sans Mono-10"))
@end example
@cindex X defaults file
......@@ -667,7 +668,7 @@ The font slant---normally @samp{r} (roman), @samp{i} (italic),
@samp{o} (oblique), @samp{ri} (reverse italic), or @samp{ot} (other).
Some font names support other values.
@item widthtype
The font width---normally @samp{normal}, @samp{condensed},
The font width---normally one of @samp{normal}, @samp{condensed},
@samp{semicondensed}, or @samp{extended}. Some font names support
other values.
@item style
......
......@@ -40,8 +40,8 @@ An @acronym{ASCII} control character is the Control version of an upper-case
letter, or the Control version of one of the characters @samp{@@[\]^_?}.
@item @acronym{ASCII} printing character
@acronym{ASCII} printing characters include letters, digits, space, and these
punctuation characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
@acronym{ASCII} letters, digits, space, and the following punctuation
characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
@item Auto Fill Mode
Auto Fill mode is a minor mode (q.v.@:) in which text that you insert is
......
......@@ -2454,7 +2454,7 @@ point (@code{dired-at-point}).
@code{ffap-read-only-other-window}, analogous to
@code{find-file-read-only-other-window}.
@item C-x 4 d
@code{ffap-dired-other-window}, analogous to @code{dired-other-window}.
@code{ffap-dired-other-window}, like @code{dired-other-window}.
@item C-x 5 f
@kindex C-x 5 f @r{(FFAP)}
@code{ffap-other-frame}, analogous to @code{find-file-other-frame}.
......@@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}).
@findex animate-birthday-present
@cindex animate
The @code{animate} package makes text dance (e.g. try
@kbd{M-x animate-birthday-present}).
The @code{animate} package makes text dance; for example, try
@kbd{M-x animate-birthday-present}.
@findex blackbox
@findex mpuz
......
......@@ -1114,11 +1114,11 @@ in communication with other processes.
@table @kbd
@item C-x @key{RET} x @var{coding} @key{RET}
Use coding system @var{coding} for transferring selections to and from
other window-based applications (@code{set-selection-coding-system}).
other graphical applications (@code{set-selection-coding-system}).
@item C-x @key{RET} X @var{coding} @key{RET}
Use coding system @var{coding} for transferring @emph{one}
selection---the next one---to or from another window-based application
selection---the next one---to or from another graphical application
(@code{set-next-selection-coding-system}).
@item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET}
......
......@@ -1651,7 +1651,8 @@ the keymap is loaded before we try to change it.
@example
(defun my-bind-clb ()
(define-key c-mode-base-map "\C-j" 'c-context-line-break))
(define-key c-mode-base-map "\C-j"
'c-context-line-break))
(add-hook 'c-initialization-hook 'my-bind-clb)
@end example
......
......@@ -74,8 +74,8 @@ CC: mongol.soldier@@example.net, rms@@gnu.org
Subject: Re: What is best in life?
From: conan@@example.org
--text follows this line--
To crush your enemies, see them driven before you, and to hear the
lamentation of their women.
To crush your enemies, see them driven before you, and to
hear the lamentation of their women.
@end example
@noindent
......
......@@ -2345,8 +2345,8 @@ large to fit in the cell. You can use the commands defined in the
following sections for navigating and editing the table layout.
@findex table-fixed-width-mode
To toggle the automatic table resizing feature, type @kbd{M-x
table-fixed-width-mode}.
Type @kbd{M-x table-fixed-width-mode} to toggle the automatic table
resizing feature.
@menu
* Table Definition:: What is a text based table.
......@@ -2506,15 +2506,16 @@ result in an illegitimate cell layout.
@cindex text-based tables, splitting cells
@cindex splitting table cells
@kbd{M-x table-split-cell} splits the current cell vertically or
horizontally, prompting for the direction with the minibuffer. The
commands @kbd{M-x table-split-cell-vertically} and @kbd{M-x
table-split-cell-horizontally} split in a specific direction. When
splitting vertically, the old cell contents are automatically split
between the two new cells. When splitting horizontally, you are
prompted for how to divide the cell contents, if the cell is
non-empty; the options are @samp{split} (divide the contents at
point), @samp{left} (put all the contents in the left cell), and
@samp{right} (put all the contents in the right cell).
horizontally, prompting for the direction with the minibuffer. To
split in a specific direction, use @kbd{M-x
table-split-cell-vertically} and @kbd{M-x
table-split-cell-horizontally}. When splitting vertically, the old
cell contents are automatically split between the two new cells. When
splitting horizontally, you are prompted for how to divide the cell
contents, if the cell is non-empty; the options are @samp{split}
(divide the contents at point), @samp{left} (put all the contents in
the left cell), and @samp{right} (put all the contents in the right
cell).
The following commands enlarge or shrink a cell. By default, they
resize by one row or column; if a numeric argument is supplied, that
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment