Commit 84f4a531 authored by Chong Yidong's avatar Chong Yidong

More minor manual copyedits to fix 7x9 manual underfull/overfull hboxes.

* doc/emacs/emacs.texi: Remove urlcolor setting.

* doc/lispref/elisp.texi, vol1.texi, vol2.texi: Remove urlcolor setting.

* doc/lispref/vol2.texi: Include package.texi.
parent b4543a28
2012-06-11 Chong Yidong <cyd@gnu.org>
* emacs.texi: Remove urlcolor setting.
2012-06-10 Chong Yidong <cyd@gnu.org>
* emacs.texi: Update ISBN and edition number.
......
......@@ -71,9 +71,10 @@ 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,
e.g.@: @code{display-buffer-base-action}, @code{display-buffer-alist},
@code{window-combination-limit}, and @code{window-combination-resize}.
We have removed several options for controlling how windows are used,
such as @code{display-buffer-base-action},
@code{display-buffer-alist}, @code{window-combination-limit}, and
@code{window-combination-resize}.
@item
The command @kbd{M-x customize-themes} has been removed. Emacs no
......
......@@ -1495,7 +1495,7 @@ eval-buffer} is similar but evaluates the entire buffer.
@vindex eval-expression-print-level
@vindex eval-expression-print-length
@vindex eval-expression-debug-on-error
The customizable variables @code{eval-expression-print-level} and
The options @code{eval-expression-print-level} and
@code{eval-expression-print-length} control the maximum depth and
length of lists to print in the result of the evaluation commands
before abbreviating them. @code{eval-expression-debug-on-error}
......
......@@ -245,10 +245,10 @@ Scroll calendar one month forward (@code{calendar-scroll-left}).
Scroll calendar one month backward (@code{calendar-scroll-right}).
@item C-v
@itemx @key{next}
Scroll three months forward (@code{calendar-scroll-left-three-months}).
Scroll forward by three months (@code{calendar-scroll-left-three-months}).
@item M-v
@itemx @key{prior}
Scroll three months backward (@code{calendar-scroll-right-three-months}).
Scroll backward by three months (@code{calendar-scroll-right-three-months}).
@end table
@kindex > @r{(Calendar mode)}
......
......@@ -577,8 +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} Lisp variable
(@pxref{Backup Names}).
Used to initialize the @code{version-control} variable (@pxref{Backup
Names}).
@end table
@node Misc Variables
......
......@@ -1052,13 +1052,13 @@ pair with a colon and semicolon. The special variable/value pair
@findex add-file-local-variable-prop-line
@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. 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
You can use @kbd{M-x add-file-local-variable-prop-line} 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.
@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
......
......@@ -54,7 +54,7 @@ developing GNU and promoting software freedom.''
@c in general, keep the following line commented out, unless doing a
@c copy of this manual that will be published. The manual should go
@c onto the distribution in the full, 8.5 x 11" size.
@c @smallbook
@c @set smallbook
@ifset smallbook
@smallbook
......@@ -66,8 +66,6 @@ developing GNU and promoting software freedom.''
@tex
@ifset smallbook
@fonttextsize 10
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset
\global\hbadness=6666 % don't worry about not-too-underfull boxes
@end tex
......
......@@ -668,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 one of @samp{normal}, @samp{condensed},
The font width---normally @samp{normal}, @samp{condensed},
@samp{semicondensed}, or @samp{extended}. Some font names support
other values.
@item style
......
......@@ -903,11 +903,11 @@ Display the changes that will be sent by the next push operation
@kindex C-x v l
@findex vc-print-log
The command @kbd{C-x v l} (@code{vc-print-log}) displays a buffer
named @file{*vc-change-log*}, showing the history of changes made to
the current file, including who made the changes, the dates, and the
log entry for each change (these are the same log entries you would
enter via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is
@kbd{C-x v l} (@code{vc-print-log}) displays a buffer named
@file{*vc-change-log*}, showing the history of changes made to the
current file, including who made the changes, the dates, and the log
entry for each change (these are the same log entries you would enter
via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is
centered at the revision of the file currently being visited. With a
prefix argument, the command prompts for the revision to center on,
and the maximum number of revisions to display.
......
......@@ -2257,18 +2257,18 @@ editors. Standard facilities can emulate these:
@cindex Brief emulation
@cindex emulation of Brief
@cindex mode, CRiSP
You can turn on key bindings to emulate the CRiSP/Brief editor with
@kbd{M-x crisp-mode}. Note that this rebinds @kbd{M-x} to exit Emacs
unless you set the variable @code{crisp-override-meta-x}. You can
also use the command @kbd{M-x scroll-all-mode} or set the variable
@kbd{M-x crisp-mode} enables key bindings to emulate the CRiSP/Brief
editor. Note that this rebinds @kbd{M-x} to exit Emacs unless you set
the variable @code{crisp-override-meta-x}. You can also use the
command @kbd{M-x scroll-all-mode} or set the variable
@code{crisp-load-scroll-all} to emulate CRiSP's scroll-all feature
(scrolling all windows together).
@item EDT (DEC VMS editor)
@findex edt-emulation-on
@findex edt-emulation-off
Turn on EDT emulation @kbd{M-x edt-emulation-on}; use @kbd{M-x
edt-emulation-off} to restore normal Emacs command bindings.
Turn on EDT emulation with @kbd{M-x edt-emulation-on}; restore normal
command bindings with @kbd{M-x edt-emulation-off}.
Most of the EDT emulation commands are keypad keys, and most standard
Emacs key bindings are still available. The EDT emulation rebindings
......@@ -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; for example, try
@kbd{M-x animate-birthday-present}.
The @code{animate} package makes text dance (e.g. @kbd{M-x
animate-birthday-present}).
@findex blackbox
@findex mpuz
......
......@@ -415,16 +415,15 @@ names, which might cause misalignment of columns in Dired display.
@section HOME and Startup Directories on MS-Windows
@cindex @code{HOME} directory on MS-Windows
The Windows equivalent of the @code{HOME} directory is the
@dfn{user-specific application data directory}. The actual location
depends on the Windows version; typical values are @file{C:\Documents
and Settings\@var{username}\Application Data} on Windows 2K/XP/2K3,
@file{C:\Users\@var{username}\AppData\Roaming} on Windows Vista/7/2K8,
and either @file{C:\WINDOWS\Application Data} or
@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the
older Windows 9X/ME systems. If this directory does not exist or
cannot be accessed, Emacs falls back to @file{C:\} as the default
value of @code{HOME}.
The Windows equivalent of @code{HOME} is the @dfn{user-specific
application data directory}. The actual location depends on the
Windows version; typical values are @file{C:\Documents and
Settings\@var{username}\Application Data} on Windows 2000/XP/2K3,
@file{C:\Users\@var{username}\AppData\Roaming} on Windows
Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or
@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows
9X/ME. If this directory does not exist or cannot be accessed, Emacs
falls back to @file{C:\} as the default value of @code{HOME}.
You can override this default value of @code{HOME} by explicitly
setting the environment variable @env{HOME} to point to any directory
......
......@@ -1015,11 +1015,11 @@ Both accept numeric arguments as repeat counts.
@kindex C-c C-f @r{(Outline mode)}
@kindex C-c C-b @r{(Outline mode)}
@kindex C-c C-u @r{(Outline mode)}
The commands @kbd{C-c C-f} (@code{outline-forward-same-level}) and
@kbd{C-c C-b} (@code{outline-backward-same-level}) move from one
heading line to another visible heading at the same depth in the
outline. @kbd{C-c C-u} (@code{outline-up-heading}) moves backward to
another heading that is less deeply nested.
@kbd{C-c C-f} (@code{outline-forward-same-level}) and @kbd{C-c C-b}
(@code{outline-backward-same-level}) move from one heading line to
another visible heading at the same depth in the outline. @kbd{C-c
C-u} (@code{outline-up-heading}) moves backward to another heading
that is less deeply nested.
@node Outline Visibility
@subsection Outline Visibility Commands
......@@ -2311,8 +2311,7 @@ hides text), and @code{intangible} (which disallows moving point
within the text). The @samp{Remove Special} menu item removes all of
these special properties from the text in the region.
The @code{invisible} and @code{intangible} properties are not saved
in the @samp{text/enriched} format.
The @code{invisible} and @code{intangible} properties are not saved.
@node Text Based Tables
@section Editing Text-based Tables
......
2012-06-11 Chong Yidong <cyd@gnu.org>
* elisp.texi, vol1.texi, vol2.texi: Remove urlcolor setting.
* vol2.texi: Include package.texi.
2012-06-01 Chong Yidong <cyd@gnu.org>
* Version 24.1 released.
......
......@@ -711,7 +711,8 @@ This is done by using a customization type specification instead of a
symbol for the key.
@example
:options '("foo" ((function-item some-function) integer)
:options '("foo"
((function-item some-function) integer)
"baz")
@end example
......@@ -719,7 +720,8 @@ Many alists use lists with two elements, instead of cons cells. For
example,
@example
(defcustom list-alist '(("foo" 1) ("bar" 2) ("baz" 3))
(defcustom list-alist
'(("foo" 1) ("bar" 2) ("baz" 3))
"Each element is a list of the form (KEY VALUE).")
@end example
......@@ -727,7 +729,8 @@ example,
instead of
@example
(defcustom cons-alist '(("foo" . 1) ("bar" . 2) ("baz" . 3))
(defcustom cons-alist
'(("foo" . 1) ("bar" . 2) ("baz" . 3))
"Each element is a cons-cell (KEY . VALUE).")
@end example
......
......@@ -791,8 +791,8 @@ Its default value is a list of two functions:
@findex collapse-delayed-warnings
@findex display-delayed-warnings
@noindent
The function @code{collapse-delayed-warnings} iterates through
@code{delayed-warnings-list}, removing repeated entries. The function
The function @code{collapse-delayed-warnings} removes repeated entries
from @code{delayed-warnings-list}. The function
@code{display-delayed-warnings} calls @code{display-warning} on each
of the entries in @code{delayed-warnings-list}, in turn, and then sets
@code{delayed-warnings-list} to @code{nil}.
......@@ -2079,11 +2079,10 @@ the @code{:family} attribute (a string). The wild-card characters
Emacs Manual}.
@item :width
Relative proportionate character width, also known as the character
set width. This should be one of the symbols @code{ultra-condensed},
@code{extra-condensed}, @code{condensed}, @code{semi-condensed},
@code{normal}, @code{semi-expanded}, @code{expanded},
@code{extra-expanded}, or @code{ultra-expanded}.
Relative character width. This should be one of the symbols
@code{ultra-condensed}, @code{extra-condensed}, @code{condensed},
@code{semi-condensed}, @code{normal}, @code{semi-expanded},
@code{expanded}, @code{extra-expanded}, or @code{ultra-expanded}.
@item :height
The height of the font. In the simplest case, this is an integer in
......
......@@ -1035,10 +1035,10 @@ The current match data. @xref{Match Data}.
@item
The variables @code{last-command}, @code{this-command},
@code{last-input-event}, @code{last-command-event},
@code{last-command-event}, @code{last-input-event},
@code{last-event-frame}, @code{last-nonmenu-event}, and
@code{track-mouse}. Commands used within Edebug do not affect these
variables outside of Edebug.
@code{track-mouse}. Commands in Edebug do not affect these variables
outside of Edebug.
Executing commands within Edebug can change the key sequence that
would be returned by @code{this-command-keys}, and there is no way to
......
......@@ -14,7 +14,7 @@
@c in general, keep the following line commented out, unless doing a
@c copy of this manual that will be published. The manual should go
@c onto the distribution in the full, 8.5 x 11" size.
@c @smallbook
@c @set smallbook
@ifset smallbook
@smallbook
......@@ -26,8 +26,6 @@
@tex
@ifset smallbook
@fonttextsize 10
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset
\global\hbadness=6666 % don't worry about not-too-underfull boxes
@end tex
......@@ -1522,12 +1520,8 @@ Object Internals
@include package.texi
@c MOVE to Emacs Manual: include misc-modes.texi
@c appendices
@c REMOVE this: include non-hacker.texi
@include anti.texi
@include doclicense.texi
@include gpl.texi
......
......@@ -2954,7 +2954,8 @@ between consecutive checks. For example:
(let ((remote-file-name-inhibit-cache
(- display-time-interval 5)))
(and (file-exists-p file)
(< 0 (nth 7 (file-attributes (file-chase-links file)))))))
(< 0 (nth 7 (file-attributes
(file-chase-links file)))))))
@end example
@end defopt
......
......@@ -1264,8 +1264,8 @@ example, byte-compiling @file{fortran.el} used to warn:
@example
In end of data:
fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not known
to be defined.
fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not
known to be defined.
@end example
In fact, @code{gud-find-c-expr} is only used in the function that
......
......@@ -449,8 +449,8 @@ override any non-@code{nil} binding in any other of the @var{maps}.
@example
(defvar help-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map (make-composed-keymap button-buffer-map
special-mode-map))
(set-keymap-parent map
(make-composed-keymap button-buffer-map special-mode-map))
... map) ... )
@end example
......@@ -1601,10 +1601,11 @@ to @code{self-insert-command}.
@end defvar
@cindex key translation function
You can use @code{input-decode-map}, @code{local-function-key-map}, or
@code{key-translation-map} for more than simple aliases, by using a
function, instead of a key sequence, as the ``translation'' of a key.
Then this function is called to compute the translation of that key.
You can use @code{input-decode-map}, @code{local-function-key-map},
and @code{key-translation-map} for more than simple aliases, by using
a function, instead of a key sequence, as the ``translation'' of a
key. Then this function is called to compute the translation of that
key.
The key translation function receives one argument, which is the prompt
that was specified in @code{read-key-sequence}---or @code{nil} if the
......
......@@ -515,9 +515,10 @@ the following:
@item Definitions for major or minor modes:
@code{define-minor-mode}, @code{define-globalized-minor-mode},
@code{define-generic-mode}, @code{easy-mmode-define-minor-mode},
@code{define-generic-mode}, @code{define-derived-mode},
@code{easy-mmode-define-minor-mode},
@code{easy-mmode-define-global-mode}, @code{define-compilation-mode},
@code{define-derived-mode}, and @code{define-global-minor-mode}.
and @code{define-global-minor-mode}.
@item Other definition types:
@code{defcustom}, @code{defgroup}, @code{defclass}
......
......@@ -339,8 +339,9 @@ problem. This macro allows us to write a ``for'' loop construct.
"Execute a simple \"for\" loop.
For example, (for i from 1 to 10 do (print i))."
(list 'let (list (list var init))
(cons 'while (cons (list '<= var final)
(append body (list (list 'inc var)))))))
(cons 'while
(cons (list '<= var final)
(append body (list (list 'inc var)))))))
@end group
@result{} for
......
......@@ -1235,8 +1235,8 @@ each calls the following function to set various variables:
@smallexample
@group
(defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive)
(when lisp-syntax
(defun lisp-mode-variables (&optional syntax keywords-case-insensitive)
(when syntax
(set-syntax-table lisp-mode-syntax-table))
(setq local-abbrev-table lisp-mode-abbrev-table)
@dots{}
......@@ -1309,9 +1309,9 @@ or to switch back to an existing one.
Entry to this mode calls the value of `lisp-mode-hook'
if that value is non-nil."
(lisp-mode-variables nil t)
(set (make-local-variable 'find-tag-default-function) 'lisp-find-tag-default)
(make-local-variable 'comment-start-skip)
(setq comment-start-skip
(set (make-local-variable 'find-tag-default-function)
'lisp-find-tag-default)
(set (make-local-variable 'comment-start-skip)
"\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
(setq imenu-case-fold-search t))
@end group
......
......@@ -409,16 +409,15 @@ codepoint belongs: most unassigned codepoints get the value of
or @code{R} (strong R).
@item decomposition
Corresponds to the Unicode @code{Decomposition_Type} and
@code{Decomposition_Value} properties. The value is a list, whose
first element may be a symbol representing a compatibility formatting
tag, such as @code{small}@footnote{The Unicode specification writes
these tag names inside @samp{<..>} brackets, but the tag names in
Emacs do not include the brackets; e.g.@: Unicode specifies
@samp{<small>} where Emacs uses @samp{small}. }; the other elements
are characters that give the compatibility decomposition sequence of
this character. For unassigned codepoints, the value is the character
itself.
Corresponds to the Unicode properties @code{Decomposition_Type} and
@code{Decomposition_Value}. The value is a list, whose first element
may be a symbol representing a compatibility formatting tag, such as
@code{small}@footnote{The Unicode specification writes these tag names
inside @samp{<..>} brackets, but the tag names in Emacs do not include
the brackets; e.g.@: Unicode specifies @samp{<small>} where Emacs uses
@samp{small}. }; the other elements are characters that give the
compatibility decomposition sequence of this character. For
unassigned codepoints, the value is the character itself.
@item decimal-digit-value
Corresponds to the Unicode @code{Numeric_Value} property for
......
......@@ -2317,7 +2317,7 @@ channels and image data, respectively.
@item :image-path @var{path}
This is represented either as a URI (@samp{file://} is the only URI
schema supported right now) or a name in a freedesktop.org-compliant
icon theme from @samp{$XDG_DATA_DIRS/icons}, like @samp{"mail-message-new"}.
icon theme from @samp{$XDG_DATA_DIRS/icons}.
@item :sound-file @var{filename}
The path to a sound file to play when the notification pops up.
......@@ -2414,26 +2414,27 @@ a symbol representing a supported external library, and the rest are
strings giving alternate filenames for that library.
Emacs tries to load the library from the files in the order they
appear in the list; if none is found, the running session of Emacs
won't have access to that library, and the features that depend on the
library will be unavailable.
appear in the list; if none is found, the Emacs session won't have
access to that library, and the features it provides will be
unavailable.
Image support on some platforms uses this facility. Here's an example
of setting this variable for supporting images on MS-Windows:
@lisp
@example
(setq dynamic-library-alist
'((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
(png "libpng12d.dll" "libpng12.dll" "libpng.dll"
"libpng13d.dll" "libpng13.dll")
(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
"libpng13d.dll" "libpng13.dll")
(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll"
"jpeg.dll")
(tiff "libtiff3.dll" "libtiff.dll")
(gif "giflib4.dll" "libungif4.dll" "libungif.dll")
(svg "librsvg-2-2.dll")
(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
(glib "libglib-2.0-0.dll")
(gobject "libgobject-2.0-0.dll")))
@end lisp
@end example
Note that image types @code{pbm} and @code{xbm} do not need entries in
this variable because they do not depend on external libraries and are
......
......@@ -831,7 +831,8 @@ consequences, so the byte compiler warns if you call @code{set-buffer}
during an excursion:
@example
Warning: Use `with-current-buffer' rather than save-excursion+set-buffer
Warning: Use `with-current-buffer' rather than
save-excursion+set-buffer
@end example
@noindent
......
......@@ -1800,7 +1800,7 @@ The number of threads in the process.
@item start
The time when the process was started, in the same
@w{@code{(@var{high} @var{low} @var{microsec})}} format used by
@code{current-time} and @code{file-attributes}.
@code{current-time} and by @code{file-attributes}.
@item etime
The time elapsed since the process started, in the @w{@code{(@var{high}
......
......@@ -216,8 +216,7 @@ properties, just the characters themselves. @xref{Text Properties}.
@defun buffer-string
This function returns the contents of the entire accessible portion of
the current buffer as a string. It is equivalent to
@w{@code{(buffer-substring (point-min) (point-max))}}.
the current buffer, as a string.
@end defun
@defun filter-buffer-substring start end &optional delete
......
......@@ -48,8 +48,6 @@
@tex
@ifset smallbook
@fonttextsize 10
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset
\global\hbadness=6666 % don't worry about not-too-underfull boxes
@end tex
......@@ -1538,12 +1536,8 @@ Object Internals
@c include display.texi
@c include os.texi
@c MOVE to Emacs Manual: include misc-modes.texi
@c appendices
@c REMOVE this: include non-hacker.texi
@c include anti.texi
@c include doclicense.texi
@c include gpl.texi
......
......@@ -48,8 +48,6 @@
@tex
@ifset smallbook
@fonttextsize 10
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset
\global\hbadness=6666 % don't worry about not-too-underfull boxes
@end tex
......@@ -1536,13 +1534,10 @@ Object Internals
@include display.texi
@include os.texi
@c MOVE to Emacs Manual: include misc-modes.texi
@include package.texi
@c appendices
@c REMOVE this: include non-hacker.texi
@include anti.texi
@include doclicense.texi
@include gpl.texi
......
......@@ -1400,7 +1400,7 @@ When writing an application, you should normally use the higher-level
functions described in @ref{Switching Buffers}, instead of calling
@code{set-window-buffer} directly.
This function runs @code{window-scroll-functions}, followed by
This runs @code{window-scroll-functions}, followed by
@code{window-configuration-change-hook}. @xref{Window Hooks}.
@end defun
......
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