[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108033: Emacs manual tweaks to ac
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108033: Emacs manual tweaks to accomodate 7x9 pdf. |
Date: |
Sun, 10 Jun 2012 22:02:52 +0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108033
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-06-10 22:02:52 +0800
message:
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.
modified:
doc/emacs/ChangeLog
doc/emacs/anti.texi
doc/emacs/building.texi
doc/emacs/cmdargs.texi
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/files.texi
doc/emacs/frames.texi
doc/emacs/glossary.texi
doc/emacs/misc.texi
doc/emacs/mule.texi
doc/emacs/programs.texi
doc/emacs/sending.texi
doc/emacs/text.texi
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-06-01 09:51:00 +0000
+++ b/doc/emacs/ChangeLog 2012-06-10 14:02:52 +0000
@@ -1,3 +1,21 @@
+2012-06-10 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* Version 24.1 released.
=== modified file 'doc/emacs/anti.texi'
--- a/doc/emacs/anti.texi 2012-01-23 06:52:18 +0000
+++ b/doc/emacs/anti.texi 2012-06-10 14:02:52 +0000
@@ -63,14 +63,12 @@
@kbd{C-y} and @kbd{M-y} is unintended.
@item
-Various completion features have been simplified. The options
address@hidden and
address@hidden 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
address@hidden
+Various completion features have been simplified. The option
address@hidden 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,
=== modified file 'doc/emacs/building.texi'
--- a/doc/emacs/building.texi 2012-04-28 07:45:03 +0000
+++ b/doc/emacs/building.texi 2012-06-10 14:02:52 +0000
@@ -426,11 +426,11 @@
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
=== modified file 'doc/emacs/cmdargs.texi'
--- a/doc/emacs/cmdargs.texi 2012-04-28 07:45:03 +0000
+++ b/doc/emacs/cmdargs.texi 2012-06-10 14:02:52 +0000
@@ -436,7 +436,7 @@
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 @@
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
=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi 2012-05-03 07:23:27 +0000
+++ b/doc/emacs/custom.texi 2012-06-10 14:02:52 +0000
@@ -765,16 +765,14 @@
@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'.
+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 @@
@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:
=== modified file 'doc/emacs/display.texi'
--- a/doc/emacs/display.texi 2012-04-30 06:51:44 +0000
+++ b/doc/emacs/display.texi 2012-06-10 14:02:52 +0000
@@ -759,11 +759,10 @@
@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)
=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi 2012-05-01 07:38:15 +0000
+++ b/doc/emacs/emacs.texi 2012-06-10 14:02:52 +0000
@@ -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.
address@hidden EDITION Sixteenth
address@hidden EDITION Seventeenth
@include emacsver.texi
@copying
@@ -96,10 +96,10 @@
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
=== modified file 'doc/emacs/files.texi'
--- a/doc/emacs/files.texi 2012-04-26 00:31:47 +0000
+++ b/doc/emacs/files.texi 2012-06-10 14:02:52 +0000
@@ -1096,11 +1096,11 @@
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 @address@hidden@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
address@hidden@address@hidden in the directory
address@hidden/.emacs.d/auto-save-list/}. This directory is determined by
+the variable @code{auto-save-list-file-prefix}. If you set
address@hidden to @code{nil}, sessions are not
recorded for recovery.
@node File Aliases
=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi 2012-05-06 04:28:58 +0000
+++ b/doc/emacs/frames.texi 2012-06-10 14:02:52 +0000
@@ -499,7 +499,8 @@
(@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 @@
@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
=== modified file 'doc/emacs/glossary.texi'
--- a/doc/emacs/glossary.texi 2012-04-14 08:25:06 +0000
+++ b/doc/emacs/glossary.texi 2012-06-10 14:02:52 +0000
@@ -40,8 +40,8 @@
letter, or the Control version of one of the characters @samp{@@[\]^_?}.
@item @acronym{ASCII} printing character
address@hidden printing characters include letters, digits, space, and these
-punctuation characters: @samp{!@@#$%^&*()_-+=|address@hidden@}[]:;"'<>,.?/}.
address@hidden letters, digits, space, and the following punctuation
+characters: @samp{!@@#$%^&*()_-+=|address@hidden@}[]:;"'<>,.?/}.
@item Auto Fill Mode
Auto Fill mode is a minor mode (q.v.@:) in which text that you insert is
=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi 2012-04-28 07:45:03 +0000
+++ b/doc/emacs/misc.texi 2012-06-10 14:02:52 +0000
@@ -2454,7 +2454,7 @@
@code{ffap-read-only-other-window}, analogous to
@code{find-file-read-only-other-window}.
@item C-x 4 d
address@hidden, analogous to @code{dired-other-window}.
address@hidden, 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 @@
@findex animate-birthday-present
@cindex animate
- The @code{animate} package makes text dance (e.g. try
address@hidden animate-birthday-present}).
+ The @code{animate} package makes text dance; for example, try
address@hidden animate-birthday-present}.
@findex blackbox
@findex mpuz
=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi 2012-05-03 02:10:18 +0000
+++ b/doc/emacs/mule.texi 2012-06-10 14:02:52 +0000
@@ -1114,11 +1114,11 @@
@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}
=== modified file 'doc/emacs/programs.texi'
--- a/doc/emacs/programs.texi 2012-05-03 06:43:02 +0000
+++ b/doc/emacs/programs.texi 2012-06-10 14:02:52 +0000
@@ -1651,7 +1651,8 @@
@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
=== modified file 'doc/emacs/sending.texi'
--- a/doc/emacs/sending.texi 2012-04-10 06:54:43 +0000
+++ b/doc/emacs/sending.texi 2012-06-10 14:02:52 +0000
@@ -74,8 +74,8 @@
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
=== modified file 'doc/emacs/text.texi'
--- a/doc/emacs/text.texi 2012-05-03 06:22:54 +0000
+++ b/doc/emacs/text.texi 2012-06-10 14:02:52 +0000
@@ -2345,8 +2345,8 @@
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 @@
@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
address@hidden (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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108033: Emacs manual tweaks to accomodate 7x9 pdf.,
Chong Yidong <=