[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111250: In doc, use standard Amer
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111250: In doc, use standard American English style for e.g., etc., i.e. |
|
Date: |
Tue, 12 Feb 2013 09:36:54 -0800 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111250
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-02-12 09:36:54 -0800
message:
In doc, use standard American English style for e.g., etc., i.e.
modified:
doc/emacs/ack.texi
doc/emacs/mark.texi
doc/lispref/processes.texi
doc/man/etags.1
doc/misc/ada-mode.texi
doc/misc/bovine.texi
doc/misc/calc.texi
doc/misc/cc-mode.texi
doc/misc/cl.texi
doc/misc/dired-x.texi
doc/misc/ede.texi
doc/misc/ediff.texi
doc/misc/emacs-mime.texi
doc/misc/eshell.texi
doc/misc/faq.texi
doc/misc/flymake.texi
doc/misc/forms.texi
doc/misc/gnus-faq.texi
doc/misc/gnus.texi
doc/misc/idlwave.texi
doc/misc/message.texi
doc/misc/org.texi
doc/misc/reftex.texi
doc/misc/remember.texi
doc/misc/ses.texi
doc/misc/sieve.texi
doc/misc/speedbar.texi
doc/misc/url.texi
doc/misc/vip.texi
doc/misc/viper.texi
doc/misc/woman.texi
lisp/gnus/gnus-group.el
lisp/gnus/gnus-start.el
lisp/gnus/nnmail.el
lisp/gnus/smime.el
lisp/hexl.el
lisp/nxml/nxml-mode.el
lisp/org/org-element.el
lisp/org/org.el
lisp/progmodes/cc-align.el
lisp/progmodes/cc-langs.el
lisp/progmodes/compile.el
lisp/progmodes/cperl-mode.el
lisp/progmodes/dcl-mode.el
lisp/progmodes/verilog-mode.el
lisp/server.el
lisp/term/xterm.el
lisp/textmodes/two-column.el
src/coding.c
src/font.c
src/indent.c
=== modified file 'doc/emacs/ack.texi'
--- a/doc/emacs/ack.texi 2013-01-01 09:11:05 +0000
+++ b/doc/emacs/ack.texi 2013-02-12 17:36:54 +0000
@@ -726,7 +726,7 @@
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
=== modified file 'doc/emacs/mark.texi'
--- a/doc/emacs/mark.texi 2013-01-01 09:11:05 +0000
+++ b/doc/emacs/mark.texi 2013-02-12 17:36:54 +0000
@@ -131,7 +131,7 @@
@cindex shift-selection
Finally, you can set the mark by holding down the shift key while
typing certain cursor motion commands (such as @address@hidden,
address@hidden, @kbd{S-C-n}, etc.) This is called @dfn{shift-selection}.
address@hidden, @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
=== modified file 'doc/lispref/processes.texi'
--- a/doc/lispref/processes.texi 2013-01-03 02:23:39 +0000
+++ b/doc/lispref/processes.texi 2013-02-12 17:36:54 +0000
@@ -88,7 +88,7 @@
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 @@
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 @@
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)
=== modified file 'doc/man/etags.1'
--- a/doc/man/etags.1 2013-01-03 01:35:49 +0000
+++ b/doc/man/etags.1 2013-02-12 17:36:54 +0000
@@ -146,7 +146,7 @@
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
@@ -282,4 +282,3 @@
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.
-
=== modified file 'doc/misc/ada-mode.texi'
--- a/doc/misc/ada-mode.texi 2013-01-05 16:19:53 +0000
+++ b/doc/misc/ada-mode.texi 2013-02-12 17:36:54 +0000
@@ -72,7 +72,7 @@
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 @@
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.
=== modified file 'doc/misc/bovine.texi'
--- a/doc/misc/bovine.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/bovine.texi 2013-02-12 17:36:54 +0000
@@ -314,7 +314,7 @@
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).
=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/calc.texi 2013-02-12 17:36:54 +0000
@@ -14011,7 +14011,7 @@
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
address@hidden (and @kbd{$$}, etc.) not followed by digits works the same as
address@hidden (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.
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2013-01-06 14:29:40 +0000
+++ b/doc/misc/cc-mode.texi 2013-02-12 17:36:54 +0000
@@ -4959,7 +4959,7 @@
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 @@
@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 @@
@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 @@
@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 @@
Line up statements for coding standards which place the first statement
in a block on the same line as the block opening address@hidden
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 @@
@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 @@
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 @@
@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 @@
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 @@
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 @@
@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 @@
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 @@
@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 @@
@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 @@
@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 @@
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 @@
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-)
=== modified file 'doc/misc/cl.texi'
--- a/doc/misc/cl.texi 2013-02-06 04:36:44 +0000
+++ b/doc/misc/cl.texi 2013-02-12 17:36:54 +0000
@@ -748,7 +748,7 @@
@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},
=== modified file 'doc/misc/dired-x.texi'
--- a/doc/misc/dired-x.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/dired-x.texi 2013-02-12 17:36:54 +0000
@@ -882,7 +882,7 @@
@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
address@hidden file, etc.) or to test if that file exists. You can then modify
address@hidden 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
=== modified file 'doc/misc/ede.texi'
--- a/doc/misc/ede.texi 2013-02-04 03:07:26 +0000
+++ b/doc/misc/ede.texi 2013-02-12 17:36:54 +0000
@@ -1050,7 +1050,7 @@
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 @@
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.
=== modified file 'doc/misc/ediff.texi'
--- a/doc/misc/ediff.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/ediff.texi 2013-02-12 17:36:54 +0000
@@ -1148,7 +1148,7 @@
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, Credits, Remote and Compressed Files, Top
@chapter Customization
=== modified file 'doc/misc/emacs-mime.texi'
--- a/doc/misc/emacs-mime.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/emacs-mime.texi 2013-02-12 17:36:54 +0000
@@ -993,7 +993,7 @@
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
=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi 2013-02-08 14:59:24 +0000
+++ b/doc/misc/eshell.texi 2013-02-12 17:36:54 +0000
@@ -625,7 +625,7 @@
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 address@hidden Entering just @samp{$var} at the prompt
+used as address@hidden, entering just @samp{$var} at the prompt
is equivalent to entering the value of @code{var} at the prompt.}
@menu
@@ -1158,7 +1158,7 @@
@item Make the shell spawning commands be visual
That is, make (@command{su}, @command{bash}, @command{telnet},
address@hidden, @command{rsh}, etc.) be part of
address@hidden, @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.
=== modified file 'doc/misc/faq.texi'
--- a/doc/misc/faq.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/faq.texi 2013-02-12 17:36:54 +0000
@@ -1909,7 +1909,7 @@
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{+},
address@hidden/}, @code{0}, etc.) that you've chosen during the interactive
address@hidden/}, @code{0}, etc.)@: that you've chosen during the interactive
procedure.
@item
=== modified file 'doc/misc/flymake.texi'
--- a/doc/misc/flymake.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/flymake.texi 2013-02-12 17:36:54 +0000
@@ -64,7 +64,7 @@
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 @@
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
=== modified file 'doc/misc/forms.texi'
--- a/doc/misc/forms.texi 2013-01-05 16:19:53 +0000
+++ b/doc/misc/forms.texi 2013-02-12 17:36:54 +0000
@@ -117,7 +117,7 @@
The contents of the forms consist of the contents of the fields of the
record (e.g., @samp{root}, @samp{0}, @samp{1}, @samp{Super User})
-interspersed with normal text (e.g @samp{User : }, @samp{Uid: }).
+interspersed with normal text (e.g., @samp{User : }, @samp{Uid: }).
If you modify the contents of the fields, Forms mode will analyze your
changes and update the file appropriately. You cannot modify the
=== modified file 'doc/misc/gnus-faq.texi'
--- a/doc/misc/gnus-faq.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/gnus-faq.texi 2013-02-12 17:36:54 +0000
@@ -1218,7 +1218,7 @@
messages?
* FAQ 5-3:: How to set stuff like From, Organization, Reply-To,
signature...?
-* FAQ 5-4:: Can I set things like From, Signature etc group based on
+* FAQ 5-4:: Can I set things like From, Signature etc. group based on
the group I post too?
* FAQ 5-5:: Is there a spell-checker? Perhaps even on-the-fly
spell-checking?
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/gnus.texi 2013-02-12 17:36:54 +0000
@@ -2344,8 +2344,8 @@
unsubscribed, @code{gnus-level-zombie} to be zombies (walking dead)
(default 8) and @code{gnus-level-killed} to be killed (completely dead)
(default 9). Gnus treats subscribed and unsubscribed groups exactly the
-same, but zombie and killed groups have no information on what articles
-you have read, etc, stored. This distinction between dead and living
+same, but zombie and killed groups store no information on what articles
+you have read, etc. This distinction between dead and living
groups isn't done because it is nice or clever, it is done purely for
reasons of efficiency.
@@ -11127,7 +11127,7 @@
@vindex gnus-use-cross-reference
The data on the current group will be updated (which articles you have
-read, which articles you have replied to, etc.) when you exit the
+read, which articles you have replied to, etc.)@: when you exit the
summary buffer. If the @code{gnus-use-cross-reference} variable is
@code{t} (which is the default), articles that are cross-referenced to
this group and are marked as read, will also be marked as read in the
@@ -14009,7 +14009,7 @@
Port number to connect to the @acronym{NNTP} server. The default is
@samp{nntp}. If you use @acronym{NNTP} over
@acronym{TLS}/@acronym{SSL}, you may want to use integer ports rather
-than named ports (i.e, use @samp{563} instead of @samp{snews} or
+than named ports (i.e., use @samp{563} instead of @samp{snews} or
@samp{nntps}), because external @acronym{TLS}/@acronym{SSL} tools may
not work with named ports.
@@ -18977,7 +18977,7 @@
@subsection Agent and flags
The Agent works with any Gnus back end including those, such as
-nnimap, that store flags (read, ticked, etc) on the server. Sadly,
+nnimap, that store flags (read, ticked, etc.)@: on the server. Sadly,
the Agent does not actually know which backends keep their flags in
the backend server rather than in @file{.newsrc}. This means that the
Agent, while unplugged or disconnected, will always record all changes
@@ -19953,7 +19953,7 @@
whole family, eh?)
@item Head, Body, All
-These three match keys use the same match types as the @code{From} (etc)
+These three match keys use the same match types as the @code{From} (etc.)@:
header uses.
@item Followup
@@ -23774,7 +23774,7 @@
This, unfortunately, is a great way to discard legitimate e-mail. The
risks of blocking a whole country (Bulgaria, Norway, Nigeria, China,
-etc.) or even a continent (Asia, Africa, Europe, etc.) from contacting
+etc.)@: or even a continent (Asia, Africa, Europe, etc.)@: from contacting
you should be obvious, so don't do it if you have the choice.
In another instance, the very informative and useful RISKS digest has
@@ -25827,7 +25827,7 @@
This adds registry saves to Gnus newsrc saves (which happen on exit
and when you press @kbd{s} from the @code{*Group*} buffer. It also
-adds registry calls to article actions in Gnus (copy, move, etc.) so
+adds registry calls to article actions in Gnus (copy, move, etc.)@: so
it's not easy to undo the initialization. See
@code{gnus-registry-initialize} for the gory details.
@@ -27904,7 +27904,7 @@
message cited below.
@item
-Smileys (@samp{:-)}, @samp{;-)} etc) are now displayed graphically in
+Smileys (@samp{:-)}, @samp{;-)} etc.)@: are now displayed graphically in
Emacs too.
Put @code{(setq gnus-treat-display-smileys nil)} in @file{~/.gnus.el} to
@@ -28510,7 +28510,7 @@
@item head
@cindex head
-The top part of a message, where administrative information (etc.) is
+The top part of a message, where administrative information (etc.)@: is
put.
@item body
@@ -29459,7 +29459,7 @@
@item (nnchoke-request-set-mark GROUP ACTION &optional SERVER)
Set/remove/add marks on articles. Normally Gnus handles the article
-marks (such as read, ticked, expired etc) internally, and store them in
+marks (such as read, ticked, expired etc.)@: internally, and store them in
@file{~/.newsrc.eld}. Some back ends (such as @acronym{IMAP}) however carry
all information about the articles on the server, so Gnus need to
propagate the mark information to the server.
=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/idlwave.texi 2013-02-12 17:36:54 +0000
@@ -2182,8 +2182,8 @@
@end lisp
Note that the modified assignment operators which begin with a word
-(@samp{AND=}, @samp{OR=}, @samp{NOT=}, etc.) require a leading space to
-be recognized (e.g @code{vAND=4} would be interpreted as a variable
+(@samp{AND=}, @samp{OR=}, @samp{NOT=}, etc.)@: require a leading space to
+be recognized (e.g., @code{vAND=4} would be interpreted as a variable
@code{vAND}). Also note that since, e.g., @code{>} and @code{>=} are
both valid operators, it is impossible to surround both by blanks while
they are being typed. Similarly with @code{&} and @code{&&}. For
@@ -2195,7 +2195,7 @@
@defopt idlwave-surround-by-blank (@code{nil})
address@hidden means enable @code{idlwave-surround}. If address@hidden,
@samp{=}, @samp{<}, @samp{>}, @samp{&}, @samp{,}, @samp{->}, and the
-modified assignment operators (@samp{AND=}, @samp{OR=}, etc.) are
+modified assignment operators (@samp{AND=}, @samp{OR=}, etc.)@: are
surrounded with spaces by @code{idlwave-surround}.
@end defopt
=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/message.texi 2013-02-12 17:36:54 +0000
@@ -2344,7 +2344,7 @@
@table @code
@item nil
Generate the buffer name in the Message way (e.g., *mail*, *news*, *mail
-to whom*, *news on group*, etc.) and continue editing in the existing
+to whom*, *news on group*, etc.)@: and continue editing in the existing
buffer of that name. If there is no such buffer, it will be newly
created.
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2013-02-07 07:11:59 +0000
+++ b/doc/misc/org.texi 2013-02-12 17:36:54 +0000
@@ -1426,7 +1426,7 @@
Move subtree down (swap with next subtree of same level).
@orgcmd{M-h,org-mark-element}
Mark the element at point. Hitting repeatedly will mark subsequent elements
-of the one just marked. E.g. hitting @key{M-h} on a paragraph will mark it,
+of the one just marked. E.g., hitting @key{M-h} on a paragraph will mark it,
hitting @key{M-h} immediately again will mark the next one.
@orgcmd{C-c @@,org-mark-subtree}
Mark the subtree at point. Hitting repeatedly will mark subsequent subtrees
@@ -2439,7 +2439,7 @@
references connected by two dots @samp{..}. If both fields are in the
current row, you may simply use @samp{$2..$7}, but if at least one field
is in a different row, you need to use the general @code{@@row$column}
-format at least for the first field (i.e the reference must start with
+format at least for the first field (i.e., the reference must start with
@samp{@@} in order to be interpreted correctly). Examples:
@example
@@ -11990,7 +11990,7 @@
@samp{efficiency}, @samp{journalentry}, @samp{rate} for resources or
@samp{account}, @samp{start}, @samp{note}, @samp{duration}, @samp{end},
@samp{journalentry}, @samp{milestone}, @samp{reference}, @samp{responsible},
address@hidden, etc for tasks.
address@hidden, etc.@: for tasks.
@subsection Dependencies
=== modified file 'doc/misc/reftex.texi'
--- a/doc/misc/reftex.texi 2013-01-05 16:19:53 +0000
+++ b/doc/misc/reftex.texi 2013-02-12 17:36:54 +0000
@@ -648,7 +648,7 @@
@vindex reftex-toc-max-level
Change the maximum level of toc entries displayed in the @file{*toc*}
buffer. Without prefix arg, all levels will be included. With prefix
-arg (e.g @kbd{3 t}), ignore all toc entries with level greater than
+arg (e.g., @kbd{3 t}), ignore all toc entries with level greater than
@var{arg} (3 in this case). Chapters are level 1, sections are level 2.
The mode line @samp{T<>} indicator shows the current value. The default
depth can be configured with the variable
@@ -3499,7 +3499,7 @@
@item
@address@hidden address@hidden
@cindex LaTeX commands, not found
address@hidden, @code{\include}, and @code{\section} (etc.) statements
address@hidden, @code{\include}, and @code{\section} (etc.)@: statements
have to be first on a line (except for white space).
@item
=== modified file 'doc/misc/remember.texi'
--- a/doc/misc/remember.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/remember.texi 2013-02-12 17:36:54 +0000
@@ -174,7 +174,7 @@
it will store that data---unindexed, uninterpreted---in a data pool.
It will also try to remember as much context information as possible
(any text properties that were set, where you copied it from, when,
-how, etc). Later, you can walk through your accumulated set of data
+how, etc.). Later, you can walk through your accumulated set of data
(both organized, and unorganized) and easily begin moving things
around, and making annotations that will express the full meaning of
that data, as far as you know it.
=== modified file 'doc/misc/ses.texi'
--- a/doc/misc/ses.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/ses.texi 2013-02-12 17:36:54 +0000
@@ -842,7 +842,7 @@
macros for each row, followed by column-widths, column-printers,
default-printer, and header-row. Then there's the global parameters
(file-format ID, numrows, numcols) and the local variables (specifying
-SES mode for the buffer, etc.)
+SES mode for the buffer, etc.).
When a SES file is loaded, first the numrows and numcols values are
loaded, then the entire data area is @code{eval}ed, and finally the local
=== modified file 'doc/misc/sieve.texi'
--- a/doc/misc/sieve.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/sieve.texi 2013-02-12 17:36:54 +0000
@@ -159,7 +159,7 @@
@end example
One of the scripts are highlighted, and standard point navigation
-commands (@kbd{<up>}, @kbd{<down>} etc) can be used to navigate the
+commands (@kbd{<up>}, @kbd{<down>} etc.)@: can be used to navigate the
list.
The following commands are available in the Manage Sieve buffer:
=== modified file 'doc/misc/speedbar.texi'
--- a/doc/misc/speedbar.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/speedbar.texi 2013-02-12 17:36:54 +0000
@@ -1180,7 +1180,7 @@
Create a tag line with @var{exp-button-type} for the small expansion
button. This is the button that expands or contracts a node (if
applicable), and @var{exp-button-char} the character in it (@samp{+},
address@hidden, @samp{?}, etc). @var{exp-button-function} is the function
address@hidden, @samp{?}, etc.). @var{exp-button-function} is the function
to call if it's clicked on. Button types are @code{bracket},
@code{angle}, @code{curly}, @code{expandtag}, @code{statictag}, and
@code{nil}. @var{exp-button-data} is extra data attached to the text
@@ -1189,7 +1189,7 @@
Next, @var{tag-button} is the text of the tag.
@var{tag-button-function} is the function to call if clicked on, and
@var{tag-button-data} is the data to attach to the text field (such a
-tag positioning, etc). @var{tag-button-face} is a face used for this
+tag positioning, etc.). @var{tag-button-face} is a face used for this
type of tag.
Lastly, @var{depth} shows the depth of expansion.
=== modified file 'doc/misc/url.texi'
--- a/doc/misc/url.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/url.texi 2013-02-12 17:36:54 +0000
@@ -890,7 +890,7 @@
@c With a large cache of documents on the local disk, it can be very handy
@c when traveling, or any other time the network connection is not active
address@hidden (a laptop with a dial-on-demand PPP connection, etc). Emacs/W3
can rely
address@hidden (a laptop with a dial-on-demand PPP connection, etc.). Emacs/W3
can rely
@c solely on its cache, and avoid checking to see if the page has changed
@c on the remote server. In the case of a dial-on-demand PPP connection,
@c this will keep the phone line free as long as possible, only bringing up
=== modified file 'doc/misc/vip.texi'
--- a/doc/misc/vip.texi 2013-01-05 16:19:53 +0000
+++ b/doc/misc/vip.texi 2013-02-12 17:36:54 +0000
@@ -356,7 +356,7 @@
As in Vi, searching is done by @kbd{/} and @kbd{?}. The string will be
searched literally by default. To invoke a regular expression search,
first execute the search command @kbd{/} (or @kbd{?}) with empty search
-string. (I.e, type @kbd{/} followed by @key{RET}.)
+string. (I.e., type @kbd{/} followed by @key{RET}.)
A search for empty string will toggle the search mode between vanilla
search and regular expression search. You cannot give an offset to the
search string. (It is a limitation.) By default, search will wrap around
=== modified file 'doc/misc/viper.texi'
--- a/doc/misc/viper.texi 2013-01-05 16:19:53 +0000
+++ b/doc/misc/viper.texi 2013-02-12 17:36:54 +0000
@@ -3210,7 +3210,7 @@
syntax tables in order to not thwart the various major modes that set these
tables.
-The usual Emacs convention is used to indicate Control Characters, i.e
+The usual Emacs convention is used to indicate Control Characters, i.e.,
C-h for Control-h. @emph{Do not confuse this with a sequence of separate
characters
C, -, h!!!} The @kbd{^} is itself, never used to indicate a
=== modified file 'doc/misc/woman.texi'
--- a/doc/misc/woman.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/woman.texi 2013-02-12 17:36:54 +0000
@@ -4,7 +4,7 @@
@settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
@c FIXME
@c Manual last updated:
address@hidden UPDATED Time-stamp: <2012-12-31 21:44:20 eggert>
address@hidden UPDATED Time-stamp: <2013-02-12 09:05:54 eggert>
@c Software version:
@set VERSION 0.54 (beta)
@afourpaper
@@ -929,7 +929,7 @@
@noindent
[for GNU/Linux and Cygwin respectively.] A trailing separator (@file{/}
-for UNIX etc.) on directories is optional and the filename matched if a
+for UNIX etc.)@: on directories is optional and the filename matched if a
directory is specified is the first to match the regexp
@code{man.*\.conf}. If the environment variable @code{MANPATH} is not
set but a configuration file is found then it is parsed instead (or as
=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el 2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/gnus-group.el 2013-02-12 17:36:54 +0000
@@ -4376,7 +4376,7 @@
(defun gnus-group-browse-foreign-server (method)
"Browse a foreign news server.
If called interactively, this function will ask for a select method
- (nntp, nnspool, etc.) and a server address (eg. nntp.some.where).
+ (nntp, nnspool, etc.) and a server address (e.g., nntp.some.where).
If not, METHOD should be a list where the first element is the method
and the second element is the address."
(interactive
=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el 2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/gnus-start.el 2013-02-12 17:36:54 +0000
@@ -121,7 +121,7 @@
the `ask-server' method in addition to the primary, secondary, and archive
servers.
-Eg.
+E.g.:
(setq gnus-check-new-newsgroups
'((nntp \"some.server\") (nntp \"other.server\")))
=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el 2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/nnmail.el 2013-02-12 17:36:54 +0000
@@ -179,7 +179,7 @@
many days an article can be stored before it is considered \"old\".
It can also return the values `never' and `immediate'.
-Eg.:
+E.g.:
\(setq nnmail-expiry-wait-function
(lambda (newsgroup)
@@ -291,7 +291,7 @@
emptied, and can be used to call any mail box programs you have
running (\"xwatch\", etc.)
-Eg.
+E.g.:
\(add-hook 'nnmail-read-incoming-hook
(lambda ()
=== modified file 'lisp/gnus/smime.el'
--- a/lisp/gnus/smime.el 2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/smime.el 2013-02-12 17:36:54 +0000
@@ -214,7 +214,7 @@
against a certificate revocation list (CRL).
For this to work the CRL must be up-to-date and since they are
-normally updated quite often (ie. several times a day) you
+normally updated quite often (i.e., several times a day) you
probably need some tool to keep them up-to-date. Unfortunately
Gnus cannot do this for you.
=== modified file 'lisp/hexl.el'
--- a/lisp/hexl.el 2013-01-01 09:11:05 +0000
+++ b/lisp/hexl.el 2013-02-12 17:36:54 +0000
@@ -311,8 +311,8 @@
000000c0: 7265 6769 6f6e 2e0a region..
Movement is as simple as movement in a normal Emacs text buffer. Most
-cursor movement bindings are the same (ie. Use \\[hexl-backward-char],
\\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
-to move the cursor left, right, down, and up).
+cursor movement bindings are the same: use \\[hexl-backward-char],
\\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
+to move the cursor left, right, down, and up.
Advanced cursor movement commands (ala \\[hexl-beginning-of-line],
\\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer])
are
also supported.
=== modified file 'lisp/nxml/nxml-mode.el'
--- a/lisp/nxml/nxml-mode.el 2013-01-01 09:11:05 +0000
+++ b/lisp/nxml/nxml-mode.el 2013-02-12 17:36:54 +0000
@@ -159,12 +159,12 @@
(defface nxml-comment-delimiter
'((t (:inherit font-lock-comment-delimiter-face)))
- "Face used for the delimiters of comments, i.e <!-- and -->."
+ "Face used for the delimiters of comments, i.e., <!-- and -->."
:group 'nxml-faces)
(defface nxml-processing-instruction-delimiter
'((t (:inherit nxml-delimiter)))
- "Face used for the delimiters of processing instructions, i.e <? and ?>."
+ "Face used for the delimiters of processing instructions, i.e., <? and ?>."
:group 'nxml-faces)
(defface nxml-processing-instruction-target
@@ -179,7 +179,7 @@
(defface nxml-cdata-section-delimiter
'((t (:inherit nxml-delimiter)))
- "Face used for the delimiters of CDATA sections, i.e <![, [, and ]]>."
+ "Face used for the delimiters of CDATA sections, i.e., <![, [, and ]]>."
:group 'nxml-faces)
(defface nxml-cdata-section-CDATA
@@ -200,7 +200,7 @@
(defface nxml-char-ref-delimiter
'((t (:inherit nxml-ref)))
- "Face used for the delimiters of character references, i.e &# and ;."
+ "Face used for the delimiters of character references, i.e., &# and ;."
:group 'nxml-faces)
(defface nxml-entity-ref-name
@@ -210,7 +210,7 @@
(defface nxml-entity-ref-delimiter
'((t (:inherit nxml-ref)))
- "Face used for the delimiters of entity references, i.e & and ;."
+ "Face used for the delimiters of entity references, i.e., & and ;."
:group 'nxml-faces)
(defface nxml-tag-delimiter
=== modified file 'lisp/org/org-element.el'
--- a/lisp/org/org-element.el 2013-02-07 07:11:59 +0000
+++ b/lisp/org/org-element.el 2013-02-12 17:36:54 +0000
@@ -3668,7 +3668,7 @@
(defun org-element-map (data types fun &optional info first-match no-recursion)
"Map a function on selected elements or objects.
-DATA is an Org buffer parse tree, as returned by, i.e,
+DATA is an Org buffer parse tree, as returned by, i.e.,
`org-element-parse-buffer'. TYPES is a symbol or list of symbols
of elements or objects types (see `org-element-all-elements' and
`org-element-all-objects' for a complete list of types). FUN is
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2013-02-07 07:11:59 +0000
+++ b/lisp/org/org.el 2013-02-12 17:36:54 +0000
@@ -928,7 +928,7 @@
(defcustom org-cycle-level-after-item/entry-creation t
"Non-nil means cycle entry level or item indentation in new empty entries.
-When the cursor is at the end of an empty headline, i.e with only stars
+When the cursor is at the end of an empty headline, i.e., with only stars
and maybe a TODO keyword, TAB will then switch the entry to become a child,
and then all possible ancestor states, before returning to the original state.
This makes data entry extremely fast: M-RET to create a new headline,
=== modified file 'lisp/progmodes/cc-align.el'
--- a/lisp/progmodes/cc-align.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/cc-align.el 2013-02-12 17:36:54 +0000
@@ -53,7 +53,7 @@
(defun c-lineup-topmost-intro-cont (langelem)
"Line up declaration continuation lines zero or one indentation step.
For lines in the \"header\" of a definition, zero is used. For other
-lines, `c-basic-offset' is added to the indentation. E.g:
+lines, `c-basic-offset' is added to the indentation. E.g.:
int
neg (int i) <- c-lineup-topmost-intro-cont
@@ -165,7 +165,7 @@
As a special case, if the indented line is inside a brace block
construct, the indentation is `c-basic-offset' only. This is intended
as a \"DWIM\" measure in cases like macros that contains statement
-blocks, e.g:
+blocks, e.g.:
A_VERY_LONG_MACRO_NAME ({
some (code, with + long, lines * in[it]);
@@ -340,7 +340,7 @@
(defun c-lineup-close-paren (langelem)
"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.:
main (int, main (
char ** int, char **
@@ -394,7 +394,7 @@
(defun c-lineup-multi-inher (langelem)
"Line up the classes in C++ multiple inheritance clauses and member
-initializers under each other. E.g:
+initializers under each other. E.g.:
class Foo: Foo::Foo (int a, int b):
public Cyphr, Cyphr (a),
@@ -439,7 +439,7 @@
If class names follow on the same line as the implements/extends
keyword, they are lined up under each other. Otherwise, they are
indented by adding `c-basic-offset' to the column of the keyword.
-E.g:
+E.g.:
class Foo class Foo
extends extends Cyphr,
@@ -461,7 +461,7 @@
they are lined up under each other. Otherwise, they are indented by
adding `c-basic-offset' to the column of the throws keyword. The
throws keyword itself is also indented by `c-basic-offset' from the
-function declaration start if it doesn't hang. E.g:
+function declaration start if it doesn't hang. E.g.:
int foo() int foo() throws Cyphr,
throws <-> Bar, <- c-lineup-java-throws
@@ -485,7 +485,7 @@
(defun c-indent-one-line-block (langelem)
"Indent a one line block `c-basic-offset' extra.
-E.g:
+E.g.:
if (n > 0) if (n > 0)
{m+=n; n=0;} <-> { <- c-indent-one-line-block
@@ -508,7 +508,7 @@
(defun c-indent-multi-line-block (langelem)
"Indent a multi line block `c-basic-offset' extra.
-E.g:
+E.g.:
int *foo[] = { int *foo[] = {
NULL, NULL,
@@ -670,7 +670,7 @@
(defun c-lineup-knr-region-comment (langelem)
"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:
+beginning of the block. E.g.:
int main()
/* This is the main function. */ <- c-lineup-knr-region-comment
@@ -693,7 +693,7 @@
(defun c-lineup-runin-statements (langelem)
"Line up statements when the first statement is on the same line as
-the block opening brace. E.g:
+the block opening brace. E.g.:
int main()
{ puts (\"Hello world!\");
@@ -794,7 +794,7 @@
"Line up \"cascaded calls\" under each other.
If the line begins with \"->\" or \".\" 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:
+arrow is lined up with the first of those tokens. E.g.:
result = proc->add(17)->add(18)
->add(19) + <- c-lineup-cascaded-calls
@@ -839,7 +839,7 @@
(defun c-lineup-string-cont (langelem)
"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:
+directly after another one. E.g.:
result = prefix + \"A message \"
\"string.\"; <- c-lineup-string-cont
@@ -921,7 +921,7 @@
; no complete argument to indent yet
(throw 'no-idea nil))))
- (extra (save-excursion
+ (extra (save-excursion
; indent parameter to argument if needed
(back-to-indentation)
(c-backward-syntactic-ws (c-langelem-pos langelem))
@@ -1023,7 +1023,7 @@
(defun c-lineup-whitesmith-in-block (langelem)
"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:
+when it doesn't. E.g.:
something
{ something {
@@ -1085,7 +1085,7 @@
(defun c-lineup-cpp-define (langelem)
"Line up macro continuation lines according to the indentation of
-the construct preceding the macro. E.g:
+the construct preceding the macro. E.g.:
v beg of preceding constr v beg of preceding constr
int dribble() {
=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/cc-langs.el 2013-02-12 17:36:54 +0000
@@ -2819,7 +2819,7 @@
is in effect or not.
Note that it's used in cases like after \"foo (bar)\" so it should
-only match when it's certain that it's a declaration, e.g \"{\" but
+only match when it's certain that it's a declaration, e.g., \"{\" but
not \",\" or \";\"."
t "{"
;; If K&R style declarations should be recognized then one could
=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2013-01-07 01:23:26 +0000
+++ b/lisp/progmodes/compile.el 2013-02-12 17:36:54 +0000
@@ -1945,7 +1945,7 @@
"This is like `define-derived-mode' without the PARENT argument.
The parent is always `compilation-mode' and the customizable `compilation-...'
variables are also set from the name of the mode you have chosen,
-by replacing the first word, e.g `compilation-scroll-output' from
+by replacing the first word, e.g., `compilation-scroll-output' from
`grep-scroll-output' if that variable exists."
(let ((mode-name (replace-regexp-in-string "-mode\\'" "" (symbol-name
mode))))
`(define-derived-mode ,mode compilation-mode ,name
=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/cperl-mode.el 2013-02-12 17:36:54 +0000
@@ -1551,7 +1551,7 @@
The user types the keyword immediately followed by a space, which
causes the construct to be expanded, and the point is positioned where
-she is most likely to want to be. eg. when the user types a space
+she is most likely to want to be. E.g., when the user types a space
following \"if\" the following appears in the buffer: if () { or if ()
} { } and the cursor is between the parentheses. The user can then
type some boolean expression within the parens. Having done that,
=== modified file 'lisp/progmodes/dcl-mode.el'
--- a/lisp/progmodes/dcl-mode.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/dcl-mode.el 2013-02-12 17:36:54 +0000
@@ -168,8 +168,8 @@
INDENT-TYPE is a symbol indicating what kind of indentation should be done.
It can have the following values:
- indent the lines indentation should be increased, e.g. after THEN.
- outdent the lines indentation should be decreased, e.g a line with ENDIF.
+ indent the indentation should be increased, e.g., after THEN.
+ outdent the indentation should be decreased, e.g., a line with ENDIF.
first-line indentation for the first line in a buffer or SUBROUTINE.
CUR-INDENT is the indentation of the preceding command line.
EXTRA-INDENT is the default change in indentation for this line
=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/verilog-mode.el 2013-02-12 17:36:54 +0000
@@ -4777,7 +4777,7 @@
))))))))))
(defun verilog-get-expr()
- "Grab expression at point, e.g, case ( a | b & (c ^d))."
+ "Grab expression at point, e.g., case ( a | b & (c ^d))."
(let* ((b (progn
(verilog-forward-syntactic-ws)
(skip-chars-forward " \t")
=== modified file 'lisp/server.el'
--- a/lisp/server.el 2013-01-01 09:11:05 +0000
+++ b/lisp/server.el 2013-02-12 17:36:54 +0000
@@ -154,7 +154,7 @@
the key is transmitted as plain-text).
In some situations however, it can be difficult to share randomly
-generated passwords with remote hosts (eg. no shared directory),
+generated passwords with remote hosts (e.g., no shared directory),
so you can set the key with this variable and then copy the
server file to the remote host (with possible changes to IP
address and/or port if that applies).
=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el 2013-01-01 09:11:05 +0000
+++ b/lisp/term/xterm.el 2013-02-12 17:36:54 +0000
@@ -36,7 +36,7 @@
If a list, assume that the listed features are supported, without checking.
The relevant features are:
- modifyOtherKeys -- if supported, more key bindings work (e.g, \"\\C-,\")
+ modifyOtherKeys -- if supported, more key bindings work (e.g., \"\\C-,\")
reportBackground -- if supported, Xterm reports its background color
"
:version "24.1"
=== modified file 'lisp/textmodes/two-column.el'
--- a/lisp/textmodes/two-column.el 2013-01-01 09:11:05 +0000
+++ b/lisp/textmodes/two-column.el 2013-02-12 17:36:54 +0000
@@ -259,9 +259,9 @@
These buffers can be edited separately, for example with `fill-paragraph'.
If you want to disable parallel scrolling temporarily, use
\\[2C-toggle-autoscroll] .
-If you include long lines, i.e which will span both columns (eg.
-source code), they should be in what will be the first column, with
-the associated buffer having empty lines next to them.
+If you include long lines that span both columns (e.g., source
+code), they should be in what will be the first column, with the
+associated buffer having empty lines next to them.
Potential uses are writing bilingual texts, or editing the comments of a
source code. See the file lisp/two-column.el for detailed examples.
=== modified file 'src/coding.c'
--- a/src/coding.c 2013-01-20 22:59:47 +0000
+++ b/src/coding.c 2013-02-12 17:36:54 +0000
@@ -10720,7 +10720,7 @@
The other way to read escape sequences in a file without decoding is
to explicitly specify some coding system that doesn't use ISO-2022
-escape sequence (e.g `latin-1') on reading by
\\[universal-coding-system-argument]. */);
+escape sequence (e.g., `latin-1') on reading by
\\[universal-coding-system-argument]. */);
inhibit_iso_escape_detection = 0;
DEFVAR_BOOL ("inhibit-null-byte-detection",
=== modified file 'src/font.c'
--- a/src/font.c 2013-01-01 09:11:05 +0000
+++ b/src/font.c 2013-02-12 17:36:54 +0000
@@ -4847,7 +4847,7 @@
OPENED-NAME is the name used for opening the font,
FULL-NAME is the full name of the font,
SIZE is the pixelsize of the font,
- HEIGHT is the pixel-height of the font (i.e ascent + descent),
+ HEIGHT is the pixel-height of the font (i.e., ascent + descent),
BASELINE-OFFSET is the upward offset pixels from ASCII baseline,
RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
how to compose characters.
=== modified file 'src/indent.c'
--- a/src/indent.c 2013-01-01 09:11:05 +0000
+++ b/src/indent.c 2013-02-12 17:36:54 +0000
@@ -291,7 +291,7 @@
doc: /* Return the horizontal position of point. Beginning of line is
column 0.
This is calculated by adding together the widths of all the displayed
representations of the character between the start of the previous line
-and point (eg. control characters will have a width of 2 or 4, tabs
+and point (e.g., control characters will have a width of 2 or 4, tabs
will have a variable width).
Ignores finite width of frame, which means that this function may return
values greater than (frame-width).
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111250: In doc, use standard American English style for e.g., etc., i.e.,
Paul Eggert <=