Commit 01fcc3a5 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

parents d0009c73 1a359750
......@@ -726,7 +726,7 @@ the display of the Emacs tool bar. With Riccardo Murri he wrote
Eric Ludlam wrote the Speedbar package; @file{checkdoc.el}, for checking
doc strings in Emacs Lisp programs; @file{dframe.el}, providing
dedicated frame support modes; @file{ezimage.el}, a generalized way to
place images over text; @file{chart.el} for drawing bar charts etc; and
place images over text; @file{chart.el} for drawing bar charts etc.; and
the EIEIO (Enhanced Implementation of Emacs Interpreted Objects)
package. He was also the main author of the CEDET (Collection of Emacs
Development Environment Tools) package. Portions were also written by
......
......@@ -131,7 +131,7 @@ detailed description of these mouse commands.
@cindex shift-selection
Finally, you can set the mark by holding down the shift key while
typing certain cursor motion commands (such as @kbd{S-@key{right}},
@kbd{S-C-f}, @kbd{S-C-n}, etc.) This is called @dfn{shift-selection}.
@kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}.
It sets the mark at point before moving point, but only if there is no
active mark set via shift-selection. The mark set by mouse commands
and by shift-selection behaves slightly differently from the usual
......
2013-02-13 Glenn Morris <rgm@gnu.org>
* objects.texi (Char-Table Type): Add footnote about #^^.
* modes.texi (Minor Mode Conventions): Fix typo.
* keymaps.texi (Scanning Keymaps): Remove obsolete sentence about
meta characters; this changed in 22.1. (Bug#13684)
* objects.texi (Char-Table Type): Add cindex.
* keymaps.texi (Key Binding Commands): Trivial rephrasing.
2013-02-10 Glenn Morris <rgm@gnu.org>
* keymaps.texi (Creating Keymaps): Update make-keymap result.
......
......@@ -1784,7 +1784,7 @@ that uses @var{key} as a prefix---which would not be allowed if
@end group
@end smallexample
This function is implemented simply using @code{define-key}:
This function is equivalent to using @code{define-key} as follows:
@smallexample
@group
......@@ -1975,9 +1975,6 @@ modes---minor modes first, then the major mode, then global bindings.
If @var{prefix} is non-@code{nil}, it should be a prefix key; then the
listing includes only keys that start with @var{prefix}.
The listing describes meta characters as @key{ESC} followed by the
corresponding non-meta character.
When several characters with consecutive @acronym{ASCII} codes have the
same definition, they are shown together, as
@samp{@var{firstchar}..@var{lastchar}}. In this instance, you need to
......
......@@ -1361,7 +1361,7 @@ follow them is to use the macro @code{define-minor-mode}.
@cindex mode variable
Define a variable whose name ends in @samp{-mode}. We call this the
@dfn{mode variable}. The minor mode command should set this variable.
The value will be @code{nil} is the mode is disabled, and non-@code{nil}
The value will be @code{nil} if the mode is disabled, and non-@code{nil}
if the mode is enabled. The variable should be buffer-local if the
minor mode is buffer-local.
......
......@@ -1177,8 +1177,10 @@ inherit from, a default value, and a small number of extra slots to use for
special purposes. A char-table can also specify a single value for
a whole character set.
@cindex @samp{#^} read syntax
The printed representation of a char-table is like a vector
except that there is an extra @samp{#^} at the beginning.
except that there is an extra @samp{#^} at the beginning.@footnote{You
may also encounter @samp{#^^}, used for ``sub-char-tables''.}
@xref{Char-Tables}, for special functions to operate on char-tables.
Uses of char-tables include:
......
......@@ -88,7 +88,7 @@ initializes @code{exec-path} when it starts up, based on the value of
the environment variable @env{PATH}. The standard file name
constructs, @samp{~}, @samp{.}, and @samp{..}, are interpreted as
usual in @code{exec-path}, but environment variable substitutions
(@samp{$HOME}, etc.) are not recognized; use
(@samp{$HOME}, etc.)@: are not recognized; use
@code{substitute-in-file-name} to perform them (@pxref{File Name
Expansion}). @code{nil} in this list refers to
@code{default-directory}.
......@@ -557,7 +557,7 @@ from the process only while waiting for input or for a time delay.
when creating the process, based on the value of the variable
@code{process-connection-type} (see below). Ptys are usually
preferable for processes visible to the user, as in Shell mode,
because they allow for job control (@kbd{C-c}, @kbd{C-z}, etc.)
because they allow for job control (@kbd{C-c}, @kbd{C-z}, etc.)@:
between the process and its children, whereas pipes do not. For
subprocesses used for internal purposes by programs, it is often
better to use a pipe, because they are more efficient, and because
......@@ -571,7 +571,7 @@ program @var{program} running in it. It returns a process object that
stands for the new subprocess in Lisp. The argument @var{name}
specifies the name for the process object; if a process with this name
already exists, then @var{name} is modified (by appending @samp{<1>},
etc.) to be unique. The buffer @var{buffer-or-name} is the buffer to
etc.)@: to be unique. The buffer @var{buffer-or-name} is the buffer to
associate with the process.
If @var{program} is @code{nil}, Emacs opens a new pseudoterminal (pty)
......
......@@ -147,7 +147,7 @@ of \- means standard output; overrides default \fBTAGS\fP or \fBtags\fP.
Make tags based on regexp matching for the files following this option,
in addition to the tags made with the standard parsing based on
language. May be freely intermixed with filenames and the \fB\-R\fP
option. The regexps are cumulative, i.e. each such option will add to
option. The regexps are cumulative, i.e., each such option will add to
the previous ones. The regexps are of one of the forms:
.br
[\fB{\fP\fIlanguage\fP\fB}\fP]\fB/\fP\fItagregexp/\fP[\fInameregexp\fP\fB/\fP]\fImodifiers\fP
......@@ -283,4 +283,3 @@ Permission is granted to copy and distribute translations of this
document into another language, under the above conditions for
modified versions, except that this permission notice may be stated
in a translation approved by the Free Software Foundation.
......@@ -72,7 +72,7 @@ existing code and facilitates writing new code.
When the Gnu Ada compiler GNAT is used, the cross-reference
information output by the compiler is used to provide powerful code
navigation (jump to definition, find all uses, etc).
navigation (jump to definition, find all uses, etc.).
When you open a file with a file extension of @file{.ads} or
@file{.adb}, Emacs will automatically load and activate Ada mode.
......@@ -1267,7 +1267,7 @@ Non-@code{nil} means that the current line will also be re-indented
before inserting a newline, when you press @key{RET}.
@end table
Most of the time, the indentation will be automatic, i.e when you
Most of the time, the indentation will be automatic, i.e., when you
press @key{RET}, the cursor will move to the correct column on the
next line.
......
......@@ -314,7 +314,7 @@ The first object spliced into the list (assuming it is a list from a
non-terminal).
@item '$1
The first object matched, placed in a list. i.e. @code{( $1 )}.
The first object matched, placed in a list. I.e., @code{( $1 )}.
@item foo
The symbol @code{foo} (exactly as displayed).
......
......@@ -14122,7 +14122,7 @@ conventions. Like C mode, Pascal mode interprets array brackets and uses
a different table of operators. Hexadecimal numbers are entered and
displayed with a preceding dollar sign. (Thus the regular meaning of
@kbd{$2} during algebraic entry does not work in Pascal mode, though
@kbd{$} (and @kbd{$$}, etc.) not followed by digits works the same as
@kbd{$} (and @kbd{$$}, etc.)@: not followed by digits works the same as
always.) No special provisions are made for other non-decimal numbers,
vectors, and so on, since there is no universally accepted standard way
of handling these in Pascal.
......@@ -4959,7 +4959,7 @@ the declaration is an annotation.
There are a few occasions where a statement block might be used inside
an expression. One is in C or C++ code using the gcc extension for
this, e.g:
this, e.g.:
@example
1: int res = (@{
......@@ -5552,7 +5552,7 @@ parentheses and statements within brace blocks.
@findex lineup-close-paren (c-)
Line up the closing paren under its corresponding open paren if the
open paren is followed by code. If the open paren ends its line, no
indentation is added. E.g:
indentation is added. E.g.:
@example
@group
......@@ -5606,7 +5606,7 @@ discussion of this ``DWIM'' measure.
@defun c-indent-one-line-block
@findex indent-one-line-block (c-)
Indent a one line block @code{c-basic-offset} extra. E.g:
Indent a one line block @code{c-basic-offset} extra. E.g.:
@example
@group
......@@ -5640,7 +5640,7 @@ which makes the function usable in list expressions.
@defun c-indent-multi-line-block
@findex indent-multi-line-block (c-)
Indent a multiline block @code{c-basic-offset} extra. E.g:
Indent a multiline block @code{c-basic-offset} extra. E.g.:
@example
@group
......@@ -5679,7 +5679,7 @@ block, which makes the function usable in list expressions.
Line up statements for coding standards which place the first statement
in a block on the same line as the block opening brace@footnote{Run-in
style doesn't really work too well. You might need to write your own
custom line-up functions to better support this style.}. E.g:
custom line-up functions to better support this style.}. E.g.:
@example
@group
......@@ -5762,7 +5762,7 @@ indents relative to the surrounding block just like
@defun c-lineup-whitesmith-in-block
@findex lineup-whitesmith-in-block (c-)
Line up lines inside a block in Whitesmith style. It's done in a way
that works both when the opening brace hangs and when it doesn't. E.g:
that works both when the opening brace hangs and when it doesn't. E.g.:
@example
@group
......@@ -5816,7 +5816,7 @@ Line up the current argument line under the first argument.
As a special case, if an argument on the same line as the open
parenthesis starts with a brace block opener, the indentation is
@code{c-basic-offset} only. This is intended as a ``DWIM'' measure in
cases like macros that contain statement blocks, e.g:
cases like macros that contain statement blocks, e.g.:
@example
@group
......@@ -5852,7 +5852,7 @@ brace block.
@defun c-lineup-multi-inher
@findex lineup-multi-inher (c-)
Line up the classes in C++ multiple inheritance clauses and member
initializers under each other. E.g:
initializers under each other. E.g.:
@example
@group
......@@ -5895,7 +5895,7 @@ Line up Java implements and extends declarations. If class names
follow on the same line as the @samp{implements}/@samp{extends}
keyword, they are lined up under each other. Otherwise, they are
indented by adding @code{c-basic-offset} to the column of the keyword.
E.g:
E.g.:
@example
@group
......@@ -5929,7 +5929,7 @@ same line as the throws keyword, they are lined up under each other.
Otherwise, they are indented by adding @code{c-basic-offset} to the
column of the @samp{throws} keyword. The @samp{throws} keyword itself
is also indented by @code{c-basic-offset} from the function declaration
start if it doesn't hang. E.g:
start if it doesn't hang. E.g.:
@example
@group
......@@ -6014,7 +6014,7 @@ line.
@defun c-lineup-argcont
@findex lineup-argcont (c-)
Line up a continued argument. E.g:
Line up a continued argument. E.g.:
@example
@group
......@@ -6101,7 +6101,7 @@ function is the same as specifying a list @code{(c-lineup-assignments
Line up ``cascaded calls'' under each other. If the line begins with
@code{->} or @code{.} and the preceding line ends with one or more
function calls preceded by the same token, then the arrow is lined up
with the first of those tokens. E.g:
with the first of those tokens. E.g.:
@example
@group
......@@ -6133,7 +6133,7 @@ Line up C++ stream operators (i.e., @samp{<<} and @samp{>>}).
@findex lineup-string-cont (c-)
Line up a continued string under the one it continues. A continued
string in this sense is where a string literal follows directly after
another one. E.g:
another one. E.g.:
@example
@group
......@@ -6242,7 +6242,7 @@ is equivalent to @code{(@r{@var{value}} . -1000)}.
@findex lineup-knr-region-comment (c-)
Line up a comment in the ``K&R region'' with the declaration. That is
the region between the function or class header and the beginning of the
block. E.g:
block. E.g.:
@example
@group
......@@ -6282,7 +6282,7 @@ already has; think of it as an identity function for lineups.
@defun c-lineup-cpp-define
@findex lineup-cpp-define (c-)
Line up macro continuation lines according to the indentation of the
construct preceding the macro. E.g:
construct preceding the macro. E.g.:
@example
@group
......@@ -6409,7 +6409,7 @@ that those lines could be analyzed as either topmost-intro-cont or
statement-cont. It's used for @code{topmost-intro-cont} by default, but
you might consider using @code{+} instead.}. For lines preceding a
definition, zero is used. For other lines, @code{c-basic-offset} is
added to the indentation. E.g:
added to the indentation. E.g.:
@example
@group
......@@ -6507,7 +6507,7 @@ earlier. Line-up functions are still passed this cons cell, so as to
preserve compatibility with older configurations. In the future, we
may decide to convert to using the full list format---you can prepare
your setup for this by using the access functions
(@code{c-langelem-sym}, etc.) described below.
(@code{c-langelem-sym}, etc.)@: described below.
@vindex c-syntactic-element
@vindex syntactic-element (c-)
......
......@@ -748,7 +748,7 @@ This function attempts to convert @var{object} to the specified
@var{type}. If @var{object} is already of that type as determined by
@code{cl-typep}, it is simply returned. Otherwise, certain types of
conversions will be made: If @var{type} is any sequence type
(@code{string}, @code{list}, etc.) then @var{object} will be
(@code{string}, @code{list}, etc.)@: then @var{object} will be
converted to that type if possible. If @var{type} is
@code{character}, then strings of length one and symbols with
one-character names can be coerced. If @var{type} is @code{float},
......
......@@ -882,7 +882,7 @@ Dired buffers, is like @code{shell-command}, but it runs with
@file{dired-x} provides a method of visiting or editing a file mentioned in
the buffer you are viewing (e.g., a mail buffer, a news article, a
@file{README} file, etc.) or to test if that file exists. You can then modify
@file{README} file, etc.)@: or to test if that file exists. You can then modify
this in the minibuffer after snatching the file name.
When installed @file{dired-x} will substitute @code{dired-x-find-file} for
......
......@@ -1050,7 +1050,7 @@ other options for that project. The configuration is saved in
Generic projects are disabled by default because they have the
potential to interfere with other projects. To use the generic
project sytem to start detecting projects, you need to enable it.
project system to start detecting projects, you need to enable it.
@deffn Command ede-enable-generic-projects
Enable generic project loaders.
......@@ -1956,7 +1956,7 @@ Type: @code{list} @*
Default Value: @code{(quote ("/include" "../include/"))}
The default locate function expands filenames within a project.
If a header file (.h, .hh, etc) name is expanded, and
If a header file (.h, .hh, etc.)@: name is expanded, and
the @code{:locate-fcn} slot is @code{nil}, then the include path is checked
first, and other directories are ignored. For very large
projects, this optimization can save a lot of time.
......
......@@ -1148,7 +1148,7 @@ packages also use this method).
Regular files are treated by the @code{patch} utility in the usual manner,
i.e., the original is renamed into @file{source-name.orig} and the result
of the patch is placed into the file source-name (@file{_orig} is used
on systems like DOS, etc.)
on systems like DOS, etc.).
@node Customization
@chapter Customization
......
......@@ -993,7 +993,7 @@ Customization}).
The charset to be used can be overridden by setting the @code{charset}
@acronym{MML} tag (@pxref{MML Definition}) when composing the message.
The encoding of characters (quoted-printable, 8bit etc) is orthogonal
The encoding of characters (quoted-printable, 8bit, etc.)@: is orthogonal
to the discussion here, and is controlled by the variables
@code{mm-body-charset-encoding-alist} and
@code{mm-content-transfer-encoding-defaults} (@pxref{Encoding
......
......@@ -625,7 +625,7 @@ string-manipulation expansions because the Elisp library already
provides many functions for this.} For example, @code{$var} on a line
expands to the value of the variable @code{var} when the line is
executed. Expansions are usually passed as arguments, but may also be
used as commands.@footnote{e.g. Entering just @samp{$var} at the prompt
used as commands.@footnote{E.g., entering just @samp{$var} at the prompt
is equivalent to entering the value of @code{var} at the prompt.}
@menu
......@@ -1158,7 +1158,7 @@ it).
@item Make the shell spawning commands be visual
That is, make (@command{su}, @command{bash}, @command{telnet},
@command{rlogin}, @command{rsh}, etc.) be part of
@command{rlogin}, @command{rsh}, etc.)@: be part of
@code{eshell-visual-commands}. The only exception is if the shell is
being used to invoke a single command. Then, the behavior should be
based on what that command is.
......
......@@ -1909,7 +1909,7 @@ following line to your @file{.emacs}:
where @var{syntactic-symbol} is the name Emacs shows in the minibuffer
when you type @kbd{C-c C-o} at the beginning of the line, and
@var{offset} is one of the indentation symbols listed above (@code{+},
@code{/}, @code{0}, etc.) that you've chosen during the interactive
@code{/}, @code{0}, etc.)@: that you've chosen during the interactive
procedure.
@item
......
......@@ -64,7 +64,7 @@ modify this GNU manual.''
Flymake is a universal on-the-fly syntax checker implemented as an
Emacs minor mode. Flymake runs the pre-configured syntax check tool
(compiler for C++ files, @code{perl} for perl files, etc.) in the
(compiler for C++ files, @code{perl} for perl files, etc.)@: in the
background, passing it a temporary copy of the current buffer, and
parses the output for known error/warning message patterns. Flymake
then highlights erroneous lines (i.e., lines for which at least one
......@@ -569,7 +569,7 @@ These modes are handled inside init/cleanup/getfname functions, see
Flymake contains implementations of all functionality required to
support different syntax check modes described above (making temporary
copies, finding master files, etc.), as well as some tool-specific
(routines for Make, Ant, etc.) code.
(routines for Make, Ant, etc.)@: code.
@node Making a temporary copy
......
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