Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

9 files changed, 115 insertions, 40 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index fb17acc415a..70a9a0f1090 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * buffers.texi (Uniquify): Clarify the default uniquification.
+
+        * indent.texi (Tab Stops): Improve wording.
+
+        * cmdargs.texi (General Variables): Improve docs of
+        EMACSLOADPATH.  Index all the environment variables.
+        (Misc Variables): Index all the environment variables.
+
 2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (infoclean): Be consistent about reporting failures.
@@ -38,7 +48,7 @@
 2014-03-15  Dmitry Gutov  <dgutov@yandex.ru>
 
         * programs.texi (Matching): Update WRT to the new
-        `blink-matchin-paren' behavior.
+        `blink-matching-paren' behavior.
 
 2014-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index c96b657b481..3f55cf7076e 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -611,8 +611,12 @@ convenient to switch between buffers.
 the buffers distinct names.  The default method
 (@code{uniquify-buffer-name-style} set to
 @code{post-forward-angle-brackets}) for making buffer names unique
-adds @samp{<dir1>}, @samp{<dir2>}, etc. to the end of the buffer
-names.
+adds @samp{<dir1>}, @samp{<dir2>}, etc.@: to the end of the buffer
+names, where @file{dir1} and @file{dir2} are the minimal parts of the
+leading directories needed to make the buffer name unique.  For
+example, if you have files @file{/foo/bar/mumble/name} and
+@file{/baz/quux/mumble/name} visited, their buffers will be named
+@samp{name<bar/mumble>} and @samp{name<quux/mumble>} correspondingly.
 
 @vindex uniquify-buffer-name-style
   There are several styles to make buffer names unique.  To select
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 06e41a57681..ce7af79076e 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -439,7 +439,7 @@ special meanings in Emacs.  Most of these variables are also used by
 some other programs.  Emacs does not require any of these environment
 variables to be set, but it uses their values if they are set.
 
-@table @env
+@vtable @env
 @item CDPATH
 Used by the @code{cd} command to search for the directory you specify,
 when you specify a relative directory name.
@@ -464,7 +464,9 @@ Emacs Lisp files.  If set, it modifies the usual initial value of the
 @code{load-path} variable (@pxref{Lisp Libraries}).  An empty element
 stands for the default value of @code{load-path}; e.g., using
 @samp{EMACSLOADPATH="/tmp:"} adds @file{/tmp} to the front of
-the default @code{load-path}.
+the default @code{load-path}.  To specify an empty element in the
+middle of the list, use 2 colons in a row, as in
+@samp{EMACSLOADPATH="/tmp::/foo"}.
 @item EMACSPATH
 A colon-separated list of directories to search for executable files.
 If set, Emacs uses this in addition to @env{PATH} (see below) when
@@ -598,14 +600,14 @@ defaults to @samp{root}.
 @item VERSION_CONTROL
 Used to initialize the @code{version-control} variable (@pxref{Backup
 Names}).
-@end table
+@end vtable
 
 @node Misc Variables
 @appendixsubsec Miscellaneous Variables
 
 These variables are used only on particular configurations:
 
-@table @env
+@vtable @env
 @item COMSPEC
 On MS-DOS and MS-Windows, the name of the command interpreter to use
 when invoking batch files and commands internal to the shell.  On MS-DOS
@@ -657,7 +659,7 @@ rather than hard-coding an absolute path.  This allows multiple
 versions of Emacs to share the same environment variable settings, and
 it allows you to move the Emacs installation directory, without
 changing any environment or registry settings.
-@end table
+@end vtable
 
 @node MS-Windows Registry
 @appendixsubsec The MS-Windows System Registry
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index 4b44b9289b5..b254cfca43e 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -153,11 +153,11 @@ C-u -999 C-x @key{TAB}
 are used as stopping points by @key{TAB} when inserting whitespace in
 Text mode and related modes (@pxref{Indentation}), and by commands
 like @kbd{M-i} (@pxref{Indentation Commands}).  The variable
-@code{tab-stop-list} controls these positions.  The default value
-is @code{nil}, which means a tab stop every 8 columns.  The value
-can also be a list of column numbers (in increasing order) at which to
-place tab stops.  Emacs extends the list forever by repeating the
-difference between the last and next-to-last elements.
+@code{tab-stop-list} controls these positions.  The default value is
+@code{nil}, which means a tab stop every 8 columns.  The value can
+also be a list of zero-based column numbers (in increasing order) at
+which to place tab stops.  Emacs extends the list forever by repeating
+the difference between the last and next-to-last elements.
 
 @findex edit-tab-stops
 @kindex C-c C-c @r{(Edit Tab Stops)}
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7c368c126cd..e9ea1f7459e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * text.texi (Registers): Document register-read-with-preview.
+
+        * internals.texi (Building Emacs): Improve indexing.
+
 2014-04-17  Daniel Colascione  <dancol@dancol.org>
 
         * frames.texi (Terminal Parameters): Document new
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index d91b0349810..f85701f5396 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -111,6 +111,8 @@ drawback that the documentation strings take up space in Emacs all the
 time.)
 @end itemize
 
+@cindex change @code{load-path} at configure time
+@cindex @option{--enable-locallisppath} option to @command{configure}
   It is not advisable to put anything in @file{site-load.el} or
 @file{site-init.el} that would alter any of the features that users
 expect in an ordinary unmodified Emacs.  If you feel you must override
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 7c5603fd645..3c70f5f96b0 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4117,6 +4117,18 @@ a rectangle (a list), currently useless things happen.  This may be
 changed in the future.
 @end deffn
 
+@defun register-read-with-preview prompt
+@cindex register preview
+This function reads and returns a register name, prompting with
+@var{prompt} and possibly showing a preview of the existing registers
+and their contents.  The preview is shown in a temporary window, after
+the delay specified by the user option @code{register-preview-delay},
+if its value and @code{register-alist} are both non-@code{nil}.  The
+preview is also shown if the user requests help (e.g., by typing the
+help character).  We recommend that all interactive commands which
+read register names use this function.
+@end defun
+
 @node Transposition
 @section Transposition of Text
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index fb54cd30b12..4f336cdbce4 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,31 @@
+2014-04-22  Bastien Guerry  <bzg@gnu.org>
+
+        * org.texi (Installation): Be more clear on why installing Org
+        through ELPA should be done without loading any Org file.
+
+        * org.texi (Emphasis and monospace): Document the use of
+        =verbatim= and ~code~ to be consistent with
+        `org-element-text-markup-successor'.
+
+        * org.texi (In-buffer settings, Radio tables): Tiny fixes.
+
+        * org.texi (Initial visibility):
+        * org.texi (Literal examples): Fix typos.
+
+2014-04-22  Michael Brand  <michael.ch.brand@gmail.com>
+
+        * org.texi (Column attributes): Add a sentence to point out
+        the dependency on the format specifier.
+
+2014-04-22  Nicolas Goaziou  <n.goaziou@gmail.com>
+
+        * org.texi (The Export Dispatcher): Reformulation.
+
+        * org.texi (@LaTeX{} specific attributes): Update manual.
+
+        * org.texi (Top, Exporting): Org has its own documentation and
+        should therefore be removed from "Other build-in back-ends".
+
 2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * cl.texi (Structures): Remove cl-struct-set-slot-value.
@@ -1614,7 +1642,7 @@
         * ede.texi (Top): Rename from top, all uses changed.
         * eshell.texi: Add missing argument to @sp.
         * forms.texi (Top): Reorder menu to match structure.
-        * htmlfontify.texi (Customisation): Add missing @item in
+        * htmlfontify.texi (Customization): Add missing @item in
         @enumerate.
         * org.texi (Advanced features): Add missing argument for @item.
         (Property searches): Use @backslashchar{} in macro argument.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index c6b8c90293f..48a6fe56cf6 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename ../../info/org
 @settitle The Org Manual
-@set VERSION 8.2.5c
+@set VERSION 8.2.6
 
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}
@@ -275,7 +275,7 @@ modify this GNU manual.''
 
 @dircategory Emacs editing modes
 @direntry
-* Org Mode: (org).              Outline-based notes management and organizer.
+* Org Mode: (org).      Outline-based notes management and organizer
 @end direntry
 
 @titlepage
@@ -585,8 +585,8 @@ Exporting
 * OpenDocument Text export::    Exporting to OpenDocument Text
 * Org export::                  Exporting to Org
 * iCalendar export::            Exporting to iCalendar
-* Other built-in back-ends::    Exporting to @code{Texinfo}, a man page, or Org
-* Export in foreign buffers::   Author tables in lists in Org syntax
+* Other built-in back-ends::    Exporting to @code{Texinfo} or a man page
+* Export in foreign buffers::   Author tables and lists in Org syntax
 * Advanced configuration::      Fine-tuning the export output
 
 HTML export
@@ -877,7 +877,11 @@ We @b{strongly recommend} to stick to a single installation method.
 
 Recent Emacs distributions include a packaging system which lets you install
 Elisp libraries.  You can install Org with @kbd{M-x package-install RET org}.
-You need to do this in a session where no @code{.org} file has been visited.
+
+@noindent @b{Important}: you need to do this in a session where no @code{.org} file has
+been visited, i.e. where no Org built-in function have been loaded.
+Otherwise autoload Org functions will mess up the installation.
+
 Then, to make sure your Org configuration is taken into account, initialize
 the package system with @code{(package-initialize)} in your @file{.emacs}
 before setting any Org option.  If you want to use Org's package repository,
@@ -1339,7 +1343,7 @@ When Emacs first visits an Org file, the global state is set to OVERVIEW,
 i.e., only the top level headlines are visible@footnote{When
 @code{org-agenda-inhibit-startup} is non-@code{nil}, Org will not honor the default
 visibility state when first opening a file for the agenda (@pxref{Speeding up
-your agendas}).}  This can be configured through the variable
+your agendas}).}.  This can be configured through the variable
 @code{org-startup-folded}, or on a per-file basis by adding one of the
 following lines anywhere in the buffer:
 
@@ -5525,6 +5529,9 @@ of 5 to 20 days, representing what to expect if everything goes either
 extremely well or extremely poorly.  In contrast, @code{est+} estimates the
 full job more realistically, at 10--15 days.
 
+Numbers are right-aligned when a format specifier with an explicit width like
+@code{%5d} or @code{%5.1f} is used.
+
 Here is an example for a complete columns definition, along with allowed
 values.
 
@@ -9729,8 +9736,8 @@ multiple footnotes side by side.
 @vindex org-fontify-emphasized-text
 @vindex org-emphasis-regexp-components
 @vindex org-emphasis-alist
-You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=code=}
-and @code{~verbatim~}, and, if you must, @samp{+strike-through+}.  Text
+You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=verbatim=}
+and @code{~code~}, and, if you must, @samp{+strike-through+}.  Text
 in the code and verbatim string is not processed for Org mode specific
 syntax, it is exported verbatim.
 
@@ -9888,7 +9895,7 @@ Here is an example:
 @example
 #+BEGIN_SRC emacs-lisp -n -r
 (save-excursion                  (ref:sc)
-   (goto-char (point-min))       (ref:jump)
+   (goto-char (point-min)))      (ref:jump)
 #+END_SRC
 In line [[(sc)]] we remember the current position.  [[(jump)][Line (jump)]]
 jumps to point-min.
@@ -10358,8 +10365,8 @@ in the iCalendar format.
 * OpenDocument Text export::    Exporting to OpenDocument Text
 * Org export::                  Exporting to Org
 * iCalendar export::            Exporting to iCalendar
-* Other built-in back-ends::    Exporting to @code{Texinfo}, a man page, or Org
-* Export in foreign buffers::   Author tables in lists in Org syntax
+* Other built-in back-ends::    Exporting to @code{Texinfo} or a man page
+* Export in foreign buffers::   Author tables and lists in Org syntax
 * Advanced configuration::      Fine-tuning the export output
 @end menu
 
@@ -10400,10 +10407,10 @@ export dispatcher with the following key combinations:
 Toggle asynchronous export.  Asynchronous export uses an external Emacs
 process that is configured with a specified initialization file.
 
-While exporting asynchronously, the output is not displayed.  It is stored in
-a list called ``the export stack'', and can be viewed from there.  The stack
-can be reached by calling the dispatcher with a double @kbd{C-u} prefix
-argument, or with @kbd{&} key from the dispatcher.
+While exporting asynchronously, the output is not displayed, but stored in
+a place called ``the export stack''.  This stack can be displayed by calling
+the dispatcher with a double @kbd{C-u} prefix argument, or with @kbd{&} key
+from the dispatcher menu.
 
 @vindex org-export-in-background
 To make this behavior the default, customize the variable
@@ -11762,13 +11769,12 @@ the @LaTeX{} @code{\includegraphics} macro will be commented out.
 @cindex plain lists, in @LaTeX{} export
 
 Plain lists accept two optional attributes: @code{:environment} and
-@code{:options}.  The first one allows the use of a non-standard
-environment (e.g., @samp{inparaenum}).  The second one specifies
-optional arguments for that environment (square brackets may be
-omitted).
+@code{:options}.  The first one allows the use of a non-standard environment
+(e.g., @samp{inparaenum}).  The second one specifies additional arguments for
+that environment.
 
 @example
-#+ATTR_LATEX: :environment compactitem :options $\circ$
+#+ATTR_LATEX: :environment compactitem :options [$\circ$]
 - you need ``paralist'' package to reproduce this example.
 @end example
 
@@ -13773,8 +13779,13 @@ can be used to map arbitrary language names to existing major modes.
 @item org-src-window-setup
 Controls the way Emacs windows are rearranged when the edit buffer is created.
 @item org-src-preserve-indentation
-This variable is especially useful for tangling languages such as
-Python, in which whitespace indentation in the output is critical.
+By default, the value is @code{nil}, which means that when code blocks are
+evaluated during export or tangled, they are re-inserted into the code block,
+which may replace sequences of spaces with tab characters.  When non-nil,
+whitespace in code blocks will be preserved during export or tangling,
+exactly as it appears.  This variable is especially useful for tangling
+languages such as Python, in which whitespace indentation in the output is
+critical.
 @item org-src-ask-before-returning-to-edit-buffer
 By default, Org will ask before returning to an open edit buffer.  Set this
 variable to @code{nil} to switch without asking.
@@ -15827,7 +15838,7 @@ The corresponding variable is @code{org-archive-location}.
 This line sets the category for the agenda file.  The category applies
 for all subsequent lines until the next @samp{#+CATEGORY} line, or the
 end of the file.  The first such line also applies to any entries before it.
-@item #+COLUMNS: %25ITEM .....
+@item #+COLUMNS: %25ITEM ...
 @cindex property, COLUMNS
 Set the default format for columns view.  This format applies when
 columns view is invoked in locations where no @code{COLUMNS} property
@@ -15842,11 +15853,11 @@ The global version of this variable is
 @item #+FILETAGS: :tag1:tag2:tag3:
 Set tags that can be inherited by any entry in the file, including the
 top-level entries.
-@item #+DRAWERS: NAME1 .....
+@item #+DRAWERS: NAME1 ...
 @vindex org-drawers
 Set the file-local set of additional drawers.  The corresponding global
 variable is @code{org-drawers}.
-@item #+LINK:  linkword replace
+@item #+LINK: linkword replace
 @vindex org-link-abbrev-alist
 These lines (several are allowed) specify link abbreviations.
 @xref{Link abbreviations}.  The corresponding variable is
@@ -16862,7 +16873,7 @@ Orgtbl mode how to translate this table and where to install it.  For
 example:
 @cindex #+ORGTBL
 @example
-#+ORGTBL: SEND table_name translation_function arguments....
+#+ORGTBL: SEND table_name translation_function arguments...
 @end example
 
 @noindent