Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org

ChangeLog

+2012-12-06  Glenn Morris  <rgm@gnu.org>
+
+	* configure.ac: Handle info/ files with or without ".info" extension.
+
 2012-11-30  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib for 'inline' (Bug#13040), incorporating:

configure.ac

@@ -830,7 +830,7 @@ if test "$MAKEINFO" = "no"; then
   MAKEINFO=makeinfo
   if test "x${with_makeinfo}" = "xno"; then
     HAVE_MAKEINFO=no
-  elif test ! -e $srcdir/info/emacs; then
+  elif test ! -e $srcdir/info/emacs && test ! -e $srcdir/info/emacs.info; then
     AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your
 source tree does not seem to have pre-built manuals in the `info' directory.
 Either install a suitable version of makeinfo, or re-run configure

doc/emacs/ChangeLog

+2012-12-06  Juanma Barranquero  <lekktu@gmail.com>
+
+	* vc1-xtra.texi (General VC Options): Remove obsolete reference
+	to `vc-path'.
+
 2012-12-03  Chong Yidong  <cyd@gnu.org>
 
 	* custom.texi (Init Rebinding): kbd is now a function (Bug#13052).

doc/emacs/abbrevs.texi

@@ -141,7 +141,7 @@ abbrev definitions, both global and local.
 
   When Abbrev mode is enabled, an abbrev expands whenever it is
 present in the buffer just before point and you type a self-inserting
-whitespace or punctuation character (@key{SPC}, comma, etc.@:).  More
+whitespace or punctuation character (@key{SPC}, comma, etc.).  More
 precisely, any character that is not a word constituent expands an
 abbrev, and any word-constituent character can be part of an abbrev.
 The most common way to use an abbrev is to insert it and then insert a

doc/emacs/ack.texi

@@ -44,7 +44,7 @@ Tomas Abrahamsson wrote @file{artist.el}, a package for producing
 @acronym{ASCII} art with a mouse or with keyboard keys.
 
 @item
-Jay K.@: Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el},
+Jay K. Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el},
 providing automatic decompression and recompression for compressed
 files.
 
@@ -96,13 +96,13 @@ Eli Barzilay wrote @file{calculator.el}, a desktop calculator for
 Emacs.
 
 @item
-Steven L.@: Baur wrote @file{footnote.el} which lets you include
+Steven L. Baur wrote @file{footnote.el} which lets you include
 footnotes in email messages; and @file{gnus-audio.el} and
 @file{earcon.el}, which provide sound effects for Gnus.  He also wrote
 @file{gnus-setup.el}.
 
 @item
-Alexander L.@: Belikoff, Sergey Berezin, Sacha Chua, David Edmondson,
+Alexander L. Belikoff, Sergey Berezin, Sacha Chua, David Edmondson,
 Noah Friedman, Andreas Fuchs, Mario Lang, Ben Mesander, Lawrence
 Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Schaefer,
 Alex Schroeder, and Tom Tromey wrote ERC, an advanced Internet Relay
@@ -115,7 +115,7 @@ Christian Limpach and Adrian Robert developed and maintained the
 NeXTstep port of Emacs.
 
 @item
-Anna M.@: Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
+Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
 
 @item
 Ray Blaak and Simon South wrote @file{delphi.el}, a mode for editing
@@ -130,14 +130,14 @@ Jim Blandy wrote Emacs 19's input system, brought its configuration and
 build process up to the GNU coding standards, and contributed to the
 frame support and multi-face support.  Jim also wrote @file{tvi970.el},
 terminal support for the TeleVideo 970 terminals; and co-wrote
-@file{wyse50.el} (q.v.@:).
+@file{wyse50.el} (q.v.).
 
 @item
 Per Bothner wrote @file{term.el}, a terminal emulator in an Emacs
 buffer.
 
 @item
-Terrence M.@: Brannon wrote @file{landmark.el}, a neural-network robot
+Terrence M. Brannon wrote @file{landmark.el}, a neural-network robot
 that learns landmarks.
 
 @item
@@ -162,7 +162,7 @@ Kevin Broadey wrote @file{foldout.el}, providing folding extensions to
 Emacs's outline modes.
 
 @item
-David M.@: Brown wrote @file{array.el}, for editing arrays and other
+David M. Brown wrote @file{array.el}, for editing arrays and other
 tabular data.
 
 @item
@@ -184,7 +184,7 @@ Emacs Lisp functions; and @file{trace.el}, a tracing facility for Emacs
 Lisp.
 
 @item
-Chris Chase, Carsten Dominik, and J.@: D.@: Smith wrote IDLWAVE mode,
+Chris Chase, Carsten Dominik, and J. D. Smith wrote IDLWAVE mode,
 for editing IDL and WAVE CL.
 
 @item
@@ -266,10 +266,10 @@ He also wrote @file{dynamic-setting.el}.
 @item
 Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and
 cross-references in @LaTeX{} documents; and co-wrote IDLWAVE mode
-(q.v.@:).  He was the original author of Org mode, for maintaining notes,
+(q.v.).  He was the original author of Org mode, for maintaining notes,
 todo lists, and project planning.  Bastien Guerry subsequently took
 over maintainership.  Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart
-Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S.@: Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip
+Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S. Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip
 Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte,
 Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize,
 Piotr Zielinski, and others also wrote various Org mode components.
@@ -429,7 +429,7 @@ characters used by @TeX{} and net tradition.
 
 @item
 Bastien Guerry wrote @file{gnus-bookmark.el}, bookmark support for Gnus;
-as well as helping to maintain Org mode (q.v.@:).
+as well as helping to maintain Org mode (q.v.).
 
 @item
 Henry Guillaume wrote @file{find-file.el}, a package to visit files
@@ -456,7 +456,7 @@ Jesper Harder wrote @file{yenc.el}, for decoding yenc encoded messages.
 Alexandru Harsanyi wrote a library for accessing SOAP web services.
 
 @item
-K.@: Shane Hartman wrote @file{chistory.el} and @file{echistory.el},
+K. Shane Hartman wrote @file{chistory.el} and @file{echistory.el},
 packages for browsing command history lists; @file{electric.el} and
 @file{helper.el}, which provide an alternative command loop and
 appropriate help facilities; @file{emacsbug.el}, a package for
@@ -617,7 +617,7 @@ Pavel Kobyakov wrote @file{flymake.el}, a minor mode for performing
 on-the-fly syntax checking.
 
 @item
-David M.@: Koppelman wrote @file{hi-lock.el}, a minor mode for
+David M. Koppelman wrote @file{hi-lock.el}, a minor mode for
 interactive automatic highlighting of parts of the buffer text.
 
 @item
@@ -630,7 +630,7 @@ menu support.
 
 @item
 Sebastian Kremer wrote @code{dired-mode}, with contributions by Lawrence
-R.@: Dodd.  He also wrote @file{ls-lisp.el}, a Lisp emulation of the
+R. Dodd.  He also wrote @file{ls-lisp.el}, a Lisp emulation of the
 @code{ls} command for platforms that don't have @code{ls} as a standard
 program.
 
@@ -647,7 +647,7 @@ Daniel LaLiberte wrote @file{edebug.el}, a source-level debugger for
 Emacs Lisp; @file{cl-specs.el}, specifications to help @code{edebug}
 debug code written using David Gillespie's Common Lisp support; and
 @file{isearch.el}, Emacs's incremental search minor mode.  He also
-co-wrote @file{hideif.el} (q.v.@:).
+co-wrote @file{hideif.el} (q.v.).
 
 @item
 Karl Landstrom and Daniel Colascione wrote @file{js.el}, a mode for
@@ -673,7 +673,7 @@ Emacs Lisp programs.
 
 @item
 Lars Lindberg wrote @file{msb.el}, which provides more flexible menus
-for buffer selection; co-wrote @file{imenu.el} (q.v.@:); and rewrote
+for buffer selection; co-wrote @file{imenu.el} (q.v.); and rewrote
 @file{dabbrev.el}, originally written by Don Morrison.
 
 @item
@@ -752,11 +752,11 @@ maintained CC Mode from Emacs 22 onwards.
 Michael McNamara and Wilson Snyder wrote Verilog mode.
 
 @item
-Christopher J.@: Madsen wrote @file{decipher.el}, a package for cracking
+Christopher J. Madsen wrote @file{decipher.el}, a package for cracking
 simple substitution ciphers.
 
 @item
-Neil M.@: Mager wrote @file{appt.el}, functions to notify users of their
+Neil M. Mager wrote @file{appt.el}, functions to notify users of their
 appointments.  It finds appointments recorded in the diary files
 used by the @code{calendar} package.
 
@@ -859,7 +859,7 @@ Erik Naggum wrote the time-conversion functions.  He also wrote
 @file{parse-time.el}, for parsing time strings.
 
 @item
-Takahashi Naoto co-wrote @file{quail.el} (q.v.@:), and wrote
+Takahashi Naoto co-wrote @file{quail.el} (q.v.), and wrote
 @file{robin.el}, another input method.
 
 @item
@@ -908,7 +908,7 @@ Takaaki Ota wrote @file{table.el}, a package for creating and editing
 embedded text-based tables.
 
 @item
-Pieter E.@: J.@: Pareit wrote @file{mixal-mode.el}, an editing mode for
+Pieter E. J. Pareit wrote @file{mixal-mode.el}, an editing mode for
 the MIX assembly language.
 
 @item
@@ -924,7 +924,7 @@ Damon Anton Permezel wrote @file{hanoi.el}, an animated demonstration of
 the ``Towers of Hanoi'' puzzle.
 
 @item
-William M.@: Perry wrote @file{mailcap.el} (with Lars Magne
+William M. Perry wrote @file{mailcap.el} (with Lars Magne
 Ingebrigtsen), a MIME media types configuration facility;
 @file{mwheel.el}, a package for supporting mouse wheels; co-wrote (with
 Dave Love) @file{socks.el}, a Socks v5 client; and developed the URL
@@ -953,7 +953,7 @@ support for Wyse 50 terminals.  He also co-wrote @file{compile.el}
 (q.v.@:) and @file{ada-stmt.el}.
 
 @item
-Richard L.@: Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC
+Richard L. Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC
 1460) interface for Emacs.
 
 @item
@@ -976,12 +976,12 @@ minor mode for displaying a ruler in the header line; and
 structures.
 
 @item
-Francesco A.@: Potorti wrote @file{cmacexp.el}, providing a command which
+Francesco A. Potorti wrote @file{cmacexp.el}, providing a command which
 runs the C preprocessor on a region of a file and displays the results.
 He also expanded and redesigned the @code{etags} program.
 
 @item
-Michael D.@: Prange and Steven A.@: Wood wrote @file{fortran.el}, a mode
+Michael D. Prange and Steven A. Wood wrote @file{fortran.el}, a mode
 for editing Fortran code.
 
 @item
@@ -989,7 +989,7 @@ Ashwin Ram wrote @file{refer.el}, commands to look up references in
 bibliography files by keyword.
 
 @item
-Eric S.@: Raymond wrote @file{vc.el}, an interface to the RCS and SCCS
+Eric S. Raymond wrote @file{vc.el}, an interface to the RCS and SCCS
 source code version control systems, with Paul Eggert; @file{gud.el},
 a package for running source-level debuggers like GDB and SDB in
 Emacs; @file{asm-mode.el}, a mode for editing assembly language code;
@@ -1005,14 +1005,14 @@ used in Emacs Lisp library files; and code to set and make use of the
 which each lisp function loaded into Emacs came.
 
 @item
-Edward M.@: Reingold wrote the calendar and diary support,
+Edward M. Reingold wrote the calendar and diary support,
 with contributions from Stewart Clamen (@file{cal-mayan.el}), Nachum
 Dershowitz (@file{cal-hebrew.el}), Paul Eggert (@file{cal-dst.el}),
 Steve Fisk (@file{cal-tex.el}), Michael Kifer (@file{cal-x.el}), Lara
-Rios (@file{cal-menu.el}), and Denis B.@: Roegel (@file{solar.el}).
+Rios (@file{cal-menu.el}), and Denis B. Roegel (@file{solar.el}).
 Andy Oram contributed to its documentation.  Reingold also contributed
 to @file{tex-mode.el}, a mode for editing @TeX{} files, as did William
-F.@: Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob
+F. Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob
 Gore.
 
 @item
@@ -1031,7 +1031,7 @@ VT line of terminals.
 
 @item
 Nick Roberts wrote @file{t-mouse.el}, for mouse support in text
-terminals; and @file{gdb-ui.el}, a graphical user interface to GDB.
+terminals; and @file{gdb-ui.el}, a graphical user interface to GDB@.
 Together with Dmitry Dzhus, he wrote @file{gdb-mi.el}, the successor to
 @file{gdb-ui.el}.
 
@@ -1043,7 +1043,7 @@ into ``handwriting''.
 Markus Rost wrote @file{cus-test.el}, a testing framework for customize.
 
 @item
-Guillermo J.@: Rozas wrote @file{scheme.el}, a mode for editing Scheme and
+Guillermo J. Rozas wrote @file{scheme.el}, a mode for editing Scheme and
 DSSSL code.
 
 @item
@@ -1067,7 +1067,7 @@ Kevin Ryde wrote @file{info-xref.el}, a library for checking
 references in Info files.
 
 @item
-James B.@: Salem and Brewster Kahle wrote @file{completion.el}, providing
+James B. Salem and Brewster Kahle wrote @file{completion.el}, providing
 dynamic word completion.
 
 @item
@@ -1091,7 +1091,7 @@ Michael Schmidt and Tom Perrine wrote @file{modula2.el}, a mode for
 editing Modula-2 code, based on work by Mick Jordan and Peter Robinson.
 
 @item
-Ronald S.@: Schnell wrote @file{dunnet.el}, a text adventure game.
+Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game.
 
 @item
 Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played
@@ -1111,7 +1111,7 @@ for interactively running an SQL interpreter in an Emacs buffer;
 @file{cus-theme.el}, an interface for custom themes; @file{master.el}, a
 package for making a buffer @samp{master} over another; and
 @file{spam-stat.el}, for statistical detection of junk email.  He also
-wrote parts of the IRC client ERC (q.v.@:).
+wrote parts of the IRC client ERC (q.v.).
 
 @item
 Randal Schwartz wrote @file{pp.el}, a pretty-printer for lisp objects.
@@ -1162,7 +1162,7 @@ David Smith wrote @file{ielm.el}, a mode for interacting with the Emacs
 Lisp interpreter as a subprocess.
 
 @item
-Paul D.@: Smith wrote @file{snmp-mode.el}.
+Paul D. Smith wrote @file{snmp-mode.el}.
 
 @item
 William Sommerfeld wrote @file{scribe.el}, a mode for editing Scribe
@@ -1204,7 +1204,7 @@ cursor'' that you can move with the keyboard and use for copying text.
 Ken Stevens wrote @file{ispell.el}, a spell-checker interface.
 
 @item
-Kim F.@: Storm made many improvements to the Emacs display engine,
+Kim F. Storm made many improvements to the Emacs display engine,
 process support, and networking support. He also wrote
 @file{bindat.el}, a package for encoding and decoding binary data;
 CUA mode, which allows Emacs to emulate the standard CUA key
@@ -1278,12 +1278,12 @@ for Gnus; and @file{timezone.el}, providing functions for dealing with
 time zones.
 
 @item
-Neil W.@: Van Dyke wrote @file{webjump.el}, a ``hot links'' package.
+Neil W. Van Dyke wrote @file{webjump.el}, a ``hot links'' package.
 
 @item
 Didier Verna wrote @file{rect.el}, a package of functions for
 operations on rectangle regions of text.  He also contributed to Gnus
-(q.v.@:).
+(q.v.).
 
 @item
 Joakim Verona implemented ImageMagick support.
@@ -1332,7 +1332,7 @@ the shift key and motion commands; and @file{dos-fns.el}, functions
 for use under MS-DOS.
 
 @item
-Joe Wells wrote the original version of @file{apropos.el} (q.v.@:);
+Joe Wells wrote the original version of @file{apropos.el} (q.v.);
 @file{resume.el}, support for processing command-line arguments after
 resuming a suspended Emacs job; and @file{mail-extr.el}, a package for
 extracting names and addresses from mail headers, with contributions
@@ -1351,7 +1351,7 @@ time spent on projects; the Bah
 @file{remember.el}, a mode for jotting down things to remember;
 @file{eudcb-mab.el}, an address book backend for the Emacs Unified
 Directory Client; and @code{eshell}, a command shell implemented
-entirely in Emacs Lisp.  He also contributed to Org mode (q.v.@:).
+entirely in Emacs Lisp.  He also contributed to Org mode (q.v.).
 
 @item
 Mike Williams wrote @file{thingatpt.el}, a library of functions for
@@ -1362,16 +1362,16 @@ Roland Winkler wrote @file{proced.el}, a system process editor.
 
 @item
 Bill Wohler wrote MH-E, the Emacs interface to the MH mail system;
-making use of earlier work by James R.@: Larus.  Satyaki Das, Peter S.@:
-Galbraith, Stephen Gildea, and Jeffrey C.@: Honig also wrote various
+making use of earlier work by James R. Larus.  Satyaki Das, Peter S.
+Galbraith, Stephen Gildea, and Jeffrey C. Honig also wrote various
 MH-E components.
 
 @item
-Dale R.@: Worley wrote @file{emerge.el}, a package for interactively
+Dale R. Worley wrote @file{emerge.el}, a package for interactively
 merging two versions of a file.
 
 @item
-Francis J.@: Wright wrote @file{woman.el}, a package for browsing
+Francis J. Wright wrote @file{woman.el}, a package for browsing
 manual pages without the @code{man} command.
 
 @item
@@ -1429,13 +1429,13 @@ messages; @file{rfc1843.el}, an HZ decoding package;
 other Gnus components.
 
 @item
-Ian T.@: Zimmerman wrote @file{gametree.el}.
+Ian T. Zimmerman wrote @file{gametree.el}.
 
 @item
 Reto Zimmermann wrote @file{vera-mode.el}.
 
 @item
-Neal Ziring and Felix S.@: T.@: Wu wrote @file{vi.el}, an emulation of the
+Neal Ziring and Felix S. T. Wu wrote @file{vi.el}, an emulation of the
 VI text editor.
 
 @item

doc/emacs/arevert-xtra.texi

@@ -40,7 +40,7 @@ explained in the corresponding sections.
 @menu
 * Auto Reverting the Buffer Menu:: Auto Revert of the Buffer Menu.
 * Auto Reverting Dired::           Auto Revert of Dired buffers.
-* Supporting additional buffers::  How to add more Auto Revert support. 
+* Supporting additional buffers::  How to add more Auto Revert support.
 @end menu
 
 @node Auto Reverting the Buffer Menu
@@ -66,9 +66,9 @@ operating systems.  It may not work satisfactorily on some other
 systems.
 
 Dired buffers only auto-revert when the file list of the buffer's main
-directory changes (e.g. when a new file is added).  They do not
+directory changes (e.g., when a new file is added).  They do not
 auto-revert when information about a particular file changes
-(e.g. when the size changes) or when inserted subdirectories change.
+(e.g., when the size changes) or when inserted subdirectories change.
 To be sure that @emph{all} listed information is up to date, you have
 to manually revert using @kbd{g}, @emph{even} if auto-reverting is
 enabled in the Dired buffer.  Sometimes, you might get the impression

doc/emacs/basic.texi

@@ -107,7 +107,7 @@ just like digits.  Case is ignored.
 of a character, using the minibuffer.  If you enter a name, the
 command provides completion (@pxref{Completion}).  If you enter a
 code-point, it should be as a hexadecimal number (the convention for
-Unicode), or a number with a specified radix, e.g.@: @code{#o23072}
+Unicode), or a number with a specified radix, e.g., @code{#o23072}
 (octal); @xref{Integer Basics,,, elisp, The Emacs Lisp Reference
 Manual}.  The command then inserts the corresponding character into
 the buffer.  For example, both of the following insert the infinity
@@ -385,7 +385,7 @@ On some text terminals, Emacs may not recognize the @key{DEL} key
 properly.  @xref{DEL Does Not Delete}, if you encounter this problem.
 
   The @key{delete} (@code{delete-forward-char}) command deletes in the
-``opposite direction'': it deletes the character after point, i.e. the
+``opposite direction'': it deletes the character after point, i.e., the
 character under the cursor.  If point was at the end of a line, this
 joins the following line onto this one.  Like @kbd{@key{DEL}}, it
 deletes the text in the region if the region is active (@pxref{Mark}).

doc/emacs/buffers.texi

@@ -44,8 +44,8 @@ variables}---variables that can have a different value in each buffer.
 by the largest buffer position representable by @dfn{Emacs integers}.
 This is because Emacs tracks buffer positions using that data type.
 For typical 64-bit machines, this maximum buffer size is @math{2^61 -
-2} bytes, or about 2 EiB.  For typical 32-bit machines, the maximum is
-usually @math{2^29 - 2} bytes, or about 512 MiB.  Buffer sizes are
+2} bytes, or about 2 EiB@.  For typical 32-bit machines, the maximum is
+usually @math{2^29 - 2} bytes, or about 512 MiB@.  Buffer sizes are
 also limited by the amount of memory in the system.
 
 @menu
@@ -614,7 +614,7 @@ names (all but one of them).
 
 @vindex uniquify-buffer-name-style
   Other methods work by adding parts of each file's directory to the
-buffer name.  To select one, load the library @file{uniquify} (e.g.
+buffer name.  To select one, load the library @file{uniquify} (e.g.,
 using @code{(require 'uniquify)}), and customize the variable
 @code{uniquify-buffer-name-style} (@pxref{Easy Customization}).
 

doc/emacs/building.texi

@@ -261,7 +261,7 @@ or previous error message for a different source file.
 @findex next-error-follow-minor-mode
   You can type @kbd{C-c C-f} to toggle Next Error Follow mode.  In
 this minor mode, ordinary cursor motion in the compilation buffer
-automatically updates the source buffer, i.e.@: moving the cursor over
+automatically updates the source buffer, i.e., moving the cursor over
 an error message causes the locus of that error to be displayed.
 
   The features of Compilation mode are also available in a minor mode
@@ -324,7 +324,7 @@ nohup @var{command}; sleep 1
 @ifnottex
   On the MS-DOS ``operating system'', asynchronous subprocesses are
 not supported, so @kbd{M-x compile} runs the compilation command
-synchronously (i.e.@: you must wait until the command finishes before
+synchronously (i.e., you must wait until the command finishes before
 you can do anything else in Emacs).  @xref{MS-DOS}.
 @end ifnottex
 
@@ -589,7 +589,7 @@ to recompile and restart the program.
 @findex gud-tooltip-mode
 @vindex gud-tooltip-echo-area
   GUD Tooltip mode is a global minor mode that adds tooltip support to
-GUD.  To toggle this mode, type @kbd{M-x gud-tooltip-mode}.  It is
+GUD@.  To toggle this mode, type @kbd{M-x gud-tooltip-mode}.  It is
 disabled by default.  If enabled, you can move the mouse cursor over a
 variable, a function, or a macro (collectively called
 @dfn{identifiers}) to show their values in tooltips
@@ -625,7 +625,7 @@ Set a breakpoint on the source line that point is on.
 
   @kbd{C-x @key{SPC}} (@code{gud-break}), when called in a source
 buffer, sets a debugger breakpoint on the current source line.  This
-command is available only after starting GUD.  If you call it in a
+command is available only after starting GUD@.  If you call it in a
 buffer that is not associated with any debugger subprocess, it signals
 a error.
 
@@ -756,7 +756,7 @@ This key is available only in the GUD interaction buffer.
 that makes sense.
 
   Because @key{TAB} serves as a completion command, you can't use it to
-enter a tab as input to the program you are debugging with GDB.
+enter a tab as input to the program you are debugging with GDB@.
 Instead, type @kbd{C-q @key{TAB}} to enter a tab.
 
 @node GUD Customization
@@ -774,7 +774,7 @@ Instead, type @kbd{C-q @key{TAB}} to enter a tab.
 you are using DBX; @code{sdb-mode-hook}, if you are using SDB;
 @code{xdb-mode-hook}, if you are using XDB; @code{perldb-mode-hook},
 for Perl debugging mode; @code{pdb-mode-hook}, for PDB;
-@code{jdb-mode-hook}, for JDB.  @xref{Hooks}.
+@code{jdb-mode-hook}, for JDB@.  @xref{Hooks}.
 
   The @code{gud-def} Lisp macro (@pxref{Defining Macros,,, elisp, the
 Emacs Lisp Reference Manual}) provides a convenient way to define an

doc/emacs/cal-xtra.texi

@@ -103,7 +103,7 @@ knows about.  These are: @code{holiday-general-holidays},
 @code{holiday-bahai-holidays}, @code{holiday-christian-holidays},
 @code{holiday-hebrew-holidays}, @code{holiday-islamic-holidays},
 @code{holiday-oriental-holidays}, and @code{holiday-other-holidays}.
-The names should be self-explanatory; e.g.@: @code{holiday-solar-holidays}
+The names should be self-explanatory; e.g., @code{holiday-solar-holidays}
 lists sun- and moon-related holidays.
 
 You can customize these lists of holidays to your own needs, deleting or
@@ -628,7 +628,7 @@ of the diary entries, or add items.
 variables @code{diary-comment-start} and @code{diary-comment-end} to
 strings that delimit comments.  The fancy display does not print
 comments.  You might want to put meta-data for the use of other packages
-(e.g.@: the appointment package,
+(e.g., the appointment package,
 @iftex
 @pxref{Appointments,,,emacs, the Emacs Manual})
 @end iftex

doc/emacs/calendar.texi

@@ -1551,7 +1551,7 @@ diary file and iCalendar files, which are defined in ``RFC
 2445---Internet Calendaring and Scheduling Core Object Specification
 (iCalendar)'' (as well as the earlier vCalendar format).
 
-@c  Importing works for ``ordinary'' (i.e. non-recurring) events, but
+@c  Importing works for ``ordinary'' (i.e., non-recurring) events, but
 @c (at present) may not work correctly (if at all) for recurring events.
 @c Exporting of diary files into iCalendar files should work correctly
 @c for most diary entries.  This feature is a work in progress, so the

doc/emacs/cmdargs.texi

@@ -576,7 +576,7 @@ Emacs tries @env{TEMP}, then @env{TMPDIR}, then @env{TMP}, and finally
 This specifies the current time zone and possibly also daylight
 saving time information.  On MS-DOS, if @env{TZ} is not set in the
 environment when Emacs starts, Emacs defines a default value as
-appropriate for the country code returned by DOS.  On MS-Windows, Emacs
+appropriate for the country code returned by DOS@.  On MS-Windows, Emacs
 does not use @env{TZ} at all.
 @item USER
 The user's login name.  See also @env{LOGNAME}.  On MS-DOS, this
@@ -747,7 +747,7 @@ Use @var{font} as the default font.
 
 When passing a font name to Emacs on the command line, you may need to
 ``quote'' it, by enclosing it in quotation marks, if it contains
-characters that the shell treats specially (e.g.@: spaces).  For
+characters that the shell treats specially (e.g., spaces).  For
 example:
 
 @smallexample
@@ -839,7 +839,7 @@ otherwise use an appropriate standard mode for @var{num} colors.
 Depending on your terminal's capabilities, Emacs might be able to turn
 on a color mode for 8, 16, 88, or 256 as the value of @var{num}.  If
 there is no mode that supports @var{num} colors, Emacs acts as if
-@var{num} were 0, i.e.@: it uses the terminal's default color support
+@var{num} were 0, i.e., it uses the terminal's default color support
 mode.
 @end table
 If @var{mode} is omitted, it defaults to @var{ansi8}.
@@ -1070,7 +1070,7 @@ it.
 
   By default, Emacs uses an icon containing the Emacs logo.  On
 desktop environments such as Gnome, this icon is also displayed in
-other contexts, e.g.@: when switching into an Emacs frame.  The
+other contexts, e.g., when switching into an Emacs frame.  The
 @samp{-nbi} or @samp{--no-bitmap-icon} option tells Emacs to let the
 window manager choose what sort of icon to use---usually just a small
 rectangle containing the frame's title.

doc/emacs/commands.texi

@@ -53,7 +53,7 @@ holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
 to this as @kbd{C-a} for short.  Similarly @kbd{Meta-a}, or @kbd{M-a}
 for short, is entered by holding down the @key{Alt} key and pressing
 @kbd{a}.  Modifier keys can also be applied to non-alphanumerical
-characters, e.g. @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
+characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
 
 @cindex @key{ESC} replacing @key{Meta} key
   You can also type Meta characters using two-character sequences

doc/emacs/custom.texi

@@ -610,10 +610,10 @@ always considered safe.
 @vindex custom-enabled-themes
   Setting or saving Custom themes actually works by customizing the
 variable @code{custom-enabled-themes}.  The value of this variable is
-a list of Custom theme names (as Lisp symbols, e.g.@: @code{tango}).
+a list of Custom theme names (as Lisp symbols, e.g., @code{tango}).
 Instead of using the @file{*Custom Themes*} buffer to set
 @code{custom-enabled-themes}, you can customize the variable using the
-usual customization interface, e.g.@: with @kbd{M-x customize-option}.
+usual customization interface, e.g., with @kbd{M-x customize-option}.
 Note that Custom themes are not allowed to set
 @code{custom-enabled-themes} themselves.
 
@@ -2329,7 +2329,7 @@ Here a full file name is used, so no searching is done.
 @cindex loading Lisp libraries automatically
 @cindex autoload Lisp libraries
 Tell Emacs to find the definition for the function @code{myfunction}
-by loading a Lisp library named @file{mypackage} (i.e.@: a file
+by loading a Lisp library named @file{mypackage} (i.e., a file
 @file{mypackage.elc} or @file{mypackage.el}):
 
 @example
@@ -2496,7 +2496,7 @@ editor customizations even if you are running as the super user.
 
   More precisely, Emacs first determines which user's init file to use.
 It gets your user name from the environment variables @env{LOGNAME} and
-@env{USER}; if neither of those exists, it uses effective user-ID.
+@env{USER}; if neither of those exists, it uses effective user-ID@.
 If that user name matches the real user-ID, then Emacs uses @env{HOME};
 otherwise, it looks up the home directory corresponding to that user
 name in the system's data base of users.

doc/emacs/dired.texi

@@ -968,7 +968,7 @@ is the second argument.  The output of the @command{diff} program is
 shown in a buffer using Diff mode (@pxref{Comparing Files}).
 
   If the region is active, the default for the file read using the
-minibuffer is the file at the mark (i.e.@: the ordinary Emacs mark,
+minibuffer is the file at the mark (i.e., the ordinary Emacs mark,
 not a Dired mark; @pxref{Setting Mark}).  Otherwise, if the file at
 point has a backup file (@pxref{Backup}), that is the default.
 

doc/emacs/display.texi

@@ -249,14 +249,14 @@ variables @code{scroll-up-aggressively} and
 position of point after scrolling.  The value of
 @code{scroll-up-aggressively} should be either @code{nil} (the
 default), or a floating point number @var{f} between 0 and 1.  The
-latter means that when point goes below the bottom window edge (i.e.@:
+latter means that when point goes below the bottom window edge (i.e.,
 scrolling forward), Emacs scrolls the window so that point is @var{f}
 parts of the window height from the bottom window edge.  Thus, larger
 @var{f} means more aggressive scrolling: more new text is brought into
 view.  The default value, @code{nil}, is equivalent to 0.5.
 
   Likewise, @code{scroll-down-aggressively} is used when point goes
-above the bottom window edge (i.e.@: scrolling backward).  The value
+above the bottom window edge (i.e., scrolling backward).  The value
 specifies how far point should be from the top margin of the window
 after scrolling.  Thus, as with @code{scroll-up-aggressively}, a
 larger value is more aggressive.
@@ -1089,7 +1089,7 @@ buffer text, so blank lines at the end of the buffer stand out because
 they lack this image.  To enable this feature, set the buffer-local
 variable @code{indicate-empty-lines} to a non-@code{nil} value.  You
 can enable or disable this feature for all new buffers by setting the
-default value of this variable, e.g.@: @code{(setq-default
+default value of this variable, e.g., @code{(setq-default
 indicate-empty-lines t)}.
 
 @cindex Whitespace mode
@@ -1258,7 +1258,7 @@ line looks like this: