Merge from trunk.

113 files changed, 343 insertions, 212 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5bdc17136e1..56175a34eee 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,19 @@
+2011-08-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * modes.texi (Major Mode Conventions): Improve the documentation
+        of `mode-class' `special' modes.
+
+        * nonascii.texi (Character Properties): Document the `mirroring'
+        property.  Add index entries.
+
+        * syntax.texi (Categories): Add an example of defining a new
+        category and category table.
+
+        * searching.texi (Regexp Backslash): Document how to display
+        existing categories.  Mention the possibility of adding
+        categories, and add an xref to where this is described.  Add an
+        index entry.
+
 2011-08-09  Chong Yidong  <cyd@stupidchicken.com>
 
         * text.texi (Special Properties):
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index dd3b2e3038f..a354265b365 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -505,21 +505,26 @@ this mode to any other major mode, this mode can set up a buffer-local
 value for @code{change-major-mode-hook} (@pxref{Creating Buffer-Local}).
 
 @item
-If this mode is appropriate only for specially-prepared text, then the
-major mode command symbol should have a property named @code{mode-class}
-with value @code{special}, put on as follows:
+If this mode is appropriate only for specially-prepared text produced by
+the mode itself (rather than by the user typing at the keyboard or by an
+external file), then the major mode command symbol should have a
+property named @code{mode-class} with value @code{special}, put on as
+follows:
 
 @kindex mode-class @r{(property)}
-@cindex @code{special}
+@cindex @code{special} modes
 @example
 (put 'funny-mode 'mode-class 'special)
 @end example
 
 @noindent
-This tells Emacs that new buffers created while the current buffer is
-in Funny mode should not inherit Funny mode, in case the default value
-of @code{major-mode} is @code{nil}.  Modes such as Dired, Rmail,
-and Buffer List use this feature.
+This tells Emacs that new buffers created while the current buffer is in
+Funny mode should not be put in Funny mode, even though the default
+value of @code{major-mode} is @code{nil}.  By default, the value of
+@code{nil} for @code{major-mode} means to use the current buffer's major
+mode when creating new buffers (@pxref{Auto Major Mode}), but with such
+@code{special} modes, Fundamental mode is used instead.  Modes such as
+Dired, Rmail, and Buffer List use this feature.
 
 The @code{define-derived-mode} macro automatically marks the derived
 mode as special if the parent mode is special.  The special mode
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 77337899923..83f9f424834 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -388,6 +388,7 @@ character's classification.
 Corresponds to the @code{Canonical_Combining_Class} Unicode property.
 The value is an integer number.
 
+@cindex bidirectional class of characters
 @item bidi-class
 Corresponds to the Unicode @code{Bidi_Class} property.  The value is a
 symbol whose name is the Unicode @dfn{directional type} of the
@@ -426,10 +427,21 @@ superscripts, Roman numerals, currency numerators, and encircled
 numbers.  For example, the value of this property for the character
 @code{U+2155} (@sc{vulgar fraction one fifth}) is @code{0.2}.
 
+@cindex mirroring of characters
 @item mirrored
 Corresponds to the Unicode @code{Bidi_Mirrored} property.  The value
 of this property is a symbol, either @code{Y} or @code{N}.
 
+@item mirroring
+Corresponds to the Unicode @code{Bidi_Mirroring_Glyph} property.  The
+value of this property is a character whose glyph represents the
+mirror image of the character's glyph, or @code{nil} if there's no
+defined mirroring glyph.  All the characters whose @code{mirrored}
+property is @code{N} have @code{nil} as their @code{mirroring}
+property; however, some characters whose @code{mirrored} property is
+@code{Y} also have @code{nil} for @code{mirroring}, because no
+appropriate characters exist with mirrored glyphs.
+
 @item old-name
 Corresponds to the Unicode @code{Unicode_1_Name} property.  The value
 is a string.
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 6272301dbb4..fe7c805c6f7 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -717,11 +717,15 @@ the characters that stand for them.
 @cindex @samp{\S} in regexp
 matches any character whose syntax is not @var{code}.
 
+@cindex category, regexp search for
 @item \c@var{c}
 matches any character whose category is @var{c}.  Here @var{c} is a
 character that represents a category: thus, @samp{c} for Chinese
 characters or @samp{g} for Greek characters in the standard category
-table.
+table.  You can see the list of all the currently defined categories
+with @kbd{M-x describe-categories @key{RET}}.  You can also define
+your own categories in addition to the standard ones using the
+@code{define-category} function (@pxref{Categories}).
 
 @item \C@var{c}
 matches any character whose category is not @var{c}.
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index 31ee7eb4e7d..0d7a0c0bed4 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -1084,6 +1084,24 @@ defaults to the current buffer's category table.
 @defun define-category char docstring &optional table
 This function defines a new category, with name @var{char} and
 documentation @var{docstring}, for the category table @var{table}.
+
+Here's an example of defining a new category for characters that have
+strong right-to-left directionality (@pxref{Bidirectional Display})
+and using it in a special category table:
+
+@example
+(defvar special-category-table-for-bidi
+  (let ((category-table (make-category-table))
+        (uniprop-table (unicode-property-table-internal 'bidi-class)))
+    (define-category ?R "Characters of bidi-class R, AL, or RLO"
+                     category-table)
+    (map-char-table
+     #'(lambda (key val)
+         (if (memq val '(R AL RLO))
+             (modify-category-entry key ?R category-table)))
+     uniprop-table)
+    category-table))
+@end example
 @end defun
 
 @defun category-docstring category &optional table
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ac4bffdfb66..8260df911a8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,41 +1,31 @@
-2011-08-03  Michael Albinus  <michael.albinus@gmx.de>
-
-        * trampver.texi: Update release number.
-
-2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
-
-        Sync with Tramp 2.2.2.
-
-        * trampver.texi: Update release number.
-
-2011-07-28  Suvayu Ali  <fatkasuvayu+linux@gmail.com>  (tiny change)
+2011-08-15  Suvayu Ali  <fatkasuvayu+linux@gmail.com>  (tiny change)
 
         * org.texi (Images in LaTeX export): rewrite.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
+2011-08-15  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (Using the mapping API): mention 'region as a possible
         scope for `org-map-entries'.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Visibility cycling): Document `org-copy-visible'.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
+2011-08-15  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (Template expansion): order template sequences in the
         proper order.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (eval): Expand discussion of the :eval header argument.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
+2011-08-15  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (Languages): Add Lilypond and Awk as supported
         languages.
 
-2011-07-28  Achim Gratz  <stromeko@nexgo.de>
+2011-08-15  Achim Gratz  <stromeko@nexgo.de>
 
         * org.texi: document that both CLOCK_INTO_DRAWER and
         LOG_INTO_DRAWER can be used to override the contents of variable
@@ -43,240 +33,250 @@
 
         * org.texi: replace @xref->@pxref.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Evaluating code blocks): Documenting the new option
         for inline call lines.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Results of evaluation): More explicit about the
         mechanism through which interactive evaluation of code is
         performed.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (noweb-ref): New header argument documentation.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Extracting source code): Documentation of the new
         org-babel-tangle-named-block-combination variable.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Structure of code blocks): explicitly state that the
         behavior of multiple blocks of the same name is undefined
 
-2011-07-28  Christian Egli  <christian.egli@sbszh.ch>
+2011-08-15  Christian Egli  <christian.egli@sbszh.ch>
 
         * org.texi (TaskJuggler export): Modify the example to reflect the
         new effort durations.
 
-2011-07-28  David Maus  <dmaus@ictsoc.de>
+2011-08-15  David Maus  <dmaus@ictsoc.de>
 
         * org.texi (Images in LaTeX export): Escape curly brackets in
         LaTeX example.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (The clock table): Document the :properties and
         :inherit-props arguments for the clocktable.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Tables in LaTeX export): Document specifying placement
         options for tables.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Evaluating code blocks): More specific documentation
         about the different types of header arguments.
 
-2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
+2011-08-15  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
         * org.texi (Sitemap): Document `:sitemap-sans-extension' property.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Built-in table editor): Document the table field
         follow mode.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-08-15  Robert P. Goldman  <rpgoldman@real-time.com>
 
         * org.texi (Easy Templates): Document new template.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-08-15  Robert P. Goldman  <rpgoldman@real-time.com>
 
         * org.texi (Literal examples): Add a cross-reference from "Literal
         Examples" to "Easy Templates."
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (The clock table): Add link to match syntax.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Agenda commands): Document clock consistency checks.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Built-in table editor): Document that \vert represents
         a vertical bar in a table field.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Literal examples): Link from "Markup" > "Literate
         Examples" to "Working with Source Code".
 
-2011-07-28  Puneeth Chaganti  <punchagan@gmail.com>
+2011-08-15  Puneeth Chaganti  <punchagan@gmail.com>
 
         * org.texi (Agenda commands): Doc for function option to bulk
         action.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Template expansion): Document new %<...> template
         escape.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Selective export): Document exclusion of any tasks
         from export.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Selective export): Document how to exclude DONE tasks
         from export.
         (Publishing options): Document the properties to be used to turn off
         export of DONE tasks.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (The date/time prompt): Document date range protection.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (padline): Documentation of the new padline header
         argument.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (var): Adding "[" to list of characters triggering
         elisp evaluation.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (var): Documentation of Emacs Lisp evaluation during
         variable assignment.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (colnames): Reference indexing into variables, and note
         that colnames are *not* removed before indexing occurs.
         (rownames): Reference indexing into variables, and note that
         rownames are *not* removed before indexing occurs.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (var): Clarification of indexing into tabular
         variables.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (results): Documentation of the `:results wrap' header
         argument.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
+2011-08-15  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (LaTeX and PDF export): add a note about a limitation
         of the LaTeX export: the org file has to be properly structured.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
+2011-08-15  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (Dynamic blocks, Structure editing): Mention
         the function `org-narrow-to-block'.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Languages): Updating list of code block supported
         languages.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Special properties): CATEGORY is a special property,
         but it may also used in the drawer.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (mkdirp): Documentation of the :mkdirp header argument.
 
-2011-07-28  Puneeth Chaganti  <punchagan@gmail.com>
+2011-08-15  Puneeth Chaganti  <punchagan@gmail.com>
 
         * org.texi (Include files): Document :lines.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (comments): Documentation of the ":comments noweb" code
         block header argument.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Conflicts): Changed "yasnippets" to "yasnippet" and
         added extra whitespace around functions to be consistent with the
         rest of the section.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Evaluating code blocks):  Expanded discussion of
         #+call: line syntax.
         (Header arguments in function calls): Expanded discussion of
         #+call: line syntax.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Evaluating code blocks): More explicit about how to
         pass variables to #+call lines.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Results of evaluation): Link to the :results header
         argument list from the "Results of evaluation" section.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Conflicts): Adding additional information about
         resolving org/yasnippet conflicts.
 
-2011-07-28  David Maus  <dmaus@ictsoc.de>
+2011-08-15  David Maus  <dmaus@ictsoc.de>
 
         * org.texi (Publishing options): Document style-include-scripts
         publishing project property.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.texi (Sparse trees): Document the next-error /
         previous-error functionality.
 
-2011-07-28  Tom Dye  <tsd@tsdye.com>
+2011-08-15  Tom Dye  <tsd@tsdye.com>
 
         * org.texi (cache): Improved documentation of code block caches.
 
-2011-07-28  Tom Dye  <tsd@tsdye.com>
+2011-08-15  Tom Dye  <tsd@tsdye.com>
 
         * org.texi (Code block specific header arguments): Documentation
         of multi-line header arguments.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Code evaluation security): Add example for using a
         function.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * org.texi (Tables in LaTeX export): Documentation of new
         attr_latex options for tables.
 
+2011-08-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * trampver.texi: Update release number.
+
+2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.2.2.
+
+        * trampver.texi: Update release number.
+
 2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * flymake.texi (Example -- Configuring a tool called via make):
@@ -288,15 +288,15 @@
         global keymap parent, which doesn't seem to be accurate
         (bug#7045).
 
+2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * org.texi (Special agenda views): Fix double quoting (bug#3509).
+
 2010-07-10  Kevin Ryde  <user42@zip.com.au>
 
         * cl.texi (For Clauses): Add destructuring example processing an
         alist (bug#6596).
 
-2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
-
-        * org.texi (Special agenda views): Fix double quoting (bug#3509).
-
 2011-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * ediff.texi (Major Entry Points): Remove mention of `require',
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 3ecf897dfb5..f905d42c808 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -15589,10 +15589,6 @@ org-customize @key{RET}} and then click yourself through the tree.
 
 @bye
 
-@ignore
-        arch-tag: 7893d1Fe-cc57-4d13-b5e5-f494a1CBC7ac
-@end ignore
-
 @c Local variables:
 @c fill-column: 77
 @c indent-tabs-mode: nil
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index fd22fd68567..6f593d76639 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2011-05-23.16}
+\def\texinfoversion{2011-08-15.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -9620,6 +9620,3 @@ directory should work if nowhere else does.}
 
 @c vim:sw=2:
 
-@ignore
-   arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
-@end ignore
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6d89746ed05..0e31638a9af 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,27 +1,27 @@
-2011-07-30  Chong Yidong  <cyd@stupidchicken.com>
-
-        * grammars: New directory.
-
-2011-07-28  Andreas Schwab  <schwab@linux-m68k.org>
-
-        * NEWS: Document ## and #:.
-
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * refcards/orgcard.tex: Document `org-copy-visible'.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * refcards/orgcard.tex: Documentation of new Babel function.
 
-2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
+2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
         * refcards/orgcard.tex: Adding line for org-babel-check-src-block.
 
-2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
+2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * refcards/orgcard.tex: Document key for clock consistency check.
 
+2011-07-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * grammars: New directory.
+
+2011-07-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * NEWS: Document ## and #:.
+
 2011-07-18  Andreas Schwab  <schwab@linux-m68k.org>
 
         * charsets/GB180302.map: Update to 2005 edition.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index e4d5c62a4ea..09042786456 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -686,4 +686,4 @@ your own key as shown under INSTALLATION.
 % compile-command: "tex refcard"
 % End:
 
-% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290
+
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 814e5511d95..fe05fa685ed 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -5,6 +5,11 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
+        * org-pcomplete.el: New file.  Rename from org-complete.el.
+        * org-complete.el: Delete file.
+
+2011-07-28  Bastien Guerry  <bzg@gnu.org>
+
         * org-publish.el (org-publish-index-generate-theindex): rename
         from `org-publish-index-generate-theindex.inc'.  Use the file
         theindex.org directly instead of including theindex.inc.
@@ -702,8 +707,8 @@
 
 2011-07-28  Eric S Fraga  <e.fraga@ucl.ac.uk>
 
-        * Allow for a different markup for inactive time stamps on latex
-        export
+        * org-latex.el (org-export-latex-timestamp-inactive-markup):
+        New option to allow different markup for inactive timestamps.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2272,11 +2277,11 @@
 
 2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>  (tiny change)
 
-        * lisp/org-html.el (org-html-export-list-line): Fix regexp for
+        * org-html.el (org-html-export-list-line): Fix regexp for
         detecting description lists to allow "::" marker to be last
         visible element at end of line.
-        * lisp/org-docbook.el (org-docbook-export-list-line): Fix regexp
-        for detecting description lists to allow "::" marker to be last
+        * org-docbook.el (org-docbook-export-list-line): Fix regexp for
+        detecting description lists to allow "::" marker to be last
         visible element at end of line.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
@@ -4820,11 +4825,6 @@
 
         * ob-calc.el: No longer require `calc-trail' on XEmacs
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
-
-        * simple.el (mail-user-agent): Default to the
-        upwardly-UI-compatible and more featureful message-mode.
-
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-modules): Add `org-eshell'.
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index cc44ece4ea8..ba7142b342c 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -191,6 +191,6 @@ of the same value."
 
 (provide 'ob-C)
 
-;; arch-tag: 8f49e462-54e3-417b-9a8d-423864893b37
+
 
 ;;; ob-C.el ends here
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 35cdcb90926..83de72e98f6 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -312,6 +312,6 @@ Insert hline if column names in output have been requested."
 
 (provide 'ob-R)
 
-;; arch-tag: cd4c7298-503b-450f-a3c2-f3e74b630237
+
 
 ;;; ob-R.el ends here
diff --git a/lisp/org/ob-asymptote.el b/lisp/org/ob-asymptote.el
index d360cfc2274..b61c6db406d 100644
--- a/lisp/org/ob-asymptote.el
+++ b/lisp/org/ob-asymptote.el
@@ -160,6 +160,6 @@ of int, where every cell must be of int type."
 
 (provide 'ob-asymptote)
 
-;; arch-tag: f2f5bd0d-78e8-412b-8e6c-6dadc94cc06b
+
 
 ;;; ob-asymptote.el ends here
diff --git a/lisp/org/ob-awk.el b/lisp/org/ob-awk.el
index fe84b906d79..66e07bf175c 100644
--- a/lisp/org/ob-awk.el
+++ b/lisp/org/ob-awk.el
@@ -112,6 +112,6 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-awk)
 
-;; arch-tag: 844e2c88-6aad-4018-868d-a2df6bcdf68f
+
 
 ;;; ob-awk.el ends here
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index 0f88ccf4dae..48c8cf69b14 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -99,6 +99,6 @@
 
 (provide 'ob-calc)
 
-;; arch-tag: 5c57a3b7-5818-4c6c-acda-7a94831a6449
+
 
 ;;; ob-calc.el ends here
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index d9bc213dfa2..ac0a93328bf 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -92,6 +92,6 @@
 
 (provide 'ob-clojure)
 
-;; arch-tag: a43b33f2-653e-46b1-ac56-2805cf05b7d1
+
 
 ;;; ob-clojure.el ends here
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 4e238880ec2..5182a6dc166 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -158,6 +158,6 @@ FILE exists at end of evaluation."
 
 (provide 'ob-comint)
 
-;; arch-tag: 9adddce6-0864-4be3-b0b5-6c5157dc7889
+
 
 ;;; ob-comint.el ends here
diff --git a/lisp/org/ob-css.el b/lisp/org/ob-css.el
index 25d75ccf80a..7dbe034e141 100644
--- a/lisp/org/ob-css.el
+++ b/lisp/org/ob-css.el
@@ -44,6 +44,6 @@ CSS does not support sessions."
 
 (provide 'ob-css)
 
-;; arch-tag: f4447e8c-50ab-41f9-b322-b7b9574d9fbe
+
 
 ;;; ob-css.el ends here
diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 810af9411f4..b65f476f52c 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -74,6 +74,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-ditaa)
 
-;; arch-tag: 492cd006-07d9-4fac-bef6-5bb60b48842e
+
 
 ;;; ob-ditaa.el ends here
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index 4bb4d532a43..c9f9bb74ba0 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -85,6 +85,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-dot)
 
-;; arch-tag: 817d0516-7b47-4f77-a8b2-2aadd8e4d0e2
+
 
 ;;; ob-dot.el ends here
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index 5892aa5dc7a..e709600ee8b 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -76,6 +76,6 @@
 
 (provide 'ob-emacs-lisp)
 
-;; arch-tag: e9a3acca-dc84-472a-9f5a-23c35befbcd6
+
 
 ;;; ob-emacs-lisp.el ends here
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index cc089cbaa32..08fe830e5d7 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -257,6 +257,6 @@ This buffer is named by `org-babel-error-buffer-name'."
 
 (provide 'ob-eval)
 
-;; arch-tag: 5328b17f-957d-42d9-94da-a2952682d04d
+
 
 ;;; ob-eval.el ends here
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index d65441e95c5..39a8a89fe65 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -266,6 +266,6 @@ inhibit insertion of results into the buffer."
 
 (provide 'ob-exp)
 
-;; arch-tag: 523abf4c-76d1-44ed-9f27-e3bddf34bf0f
+
 
 ;;; ob-exp.el ends here
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 8259cf839e5..86003a48c8a 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -230,6 +230,6 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 
 (provide 'ob-gnuplot)
 
-;; arch-tag: 50490ace-a9e1-4b29-a6e5-0db9f16c610b
+
 
 ;;; ob-gnuplot.el ends here
diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index 63e76f6f139..ab372dc383d 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -213,6 +213,6 @@ constructs (header arguments, no-web syntax etc...) are ignored."
 
 (provide 'ob-haskell)
 
-;; arch-tag: b53f75f3-ba1a-4b05-82d9-a2a0d4e70804
+
 
 ;;; ob-haskell.el ends here
diff --git a/lisp/org/ob-java.el b/lisp/org/ob-java.el
index 3f349fea271..20824d4cb30 100644
--- a/lisp/org/ob-java.el
+++ b/lisp/org/ob-java.el
@@ -69,6 +69,6 @@
 
 (provide 'ob-java)
 
-;; arch-tag: dd1cfb00-7f76-4ecf-922c-f7031b68b85e
+
 
 ;;; ob-java.el ends here
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index f9c1722eb65..797b2038f16 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -160,6 +160,6 @@ then create.  Return the initialized session."
 
 (provide 'ob-js)
 
-;; arch-tag: 84401fb3-b8d9-4bb6-9a90-cbe2d103d494
+
 
 ;;; ob-js.el ends here
diff --git a/lisp/org/ob-keys.el b/lisp/org/ob-keys.el
index b55913599cc..246b5be24b5 100644
--- a/lisp/org/ob-keys.el
+++ b/lisp/org/ob-keys.el
@@ -97,6 +97,6 @@ a-list placed behind the generic `org-babel-key-prefix'.")
 
 (provide 'ob-keys)
 
-;; arch-tag: 01e348ee-4906-46fa-839a-6b7b6f989048
+
 
 ;;; ob-keys.el ends here
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 2121a8e5296..915dfb4cc96 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -176,6 +176,6 @@ Extracted from `org-export-as-pdf' in org-latex.el."
 
 (provide 'ob-latex)
 
-;; arch-tag: 1f13f7e2-26de-4c24-9274-9f331d4c6ff3
+
 
 ;;; ob-latex.el ends here
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index 425a3458685..ccaa1a66c8b 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -67,6 +67,6 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-ledger)
 
-;; arch-tag: 7bbb529e-95a1-4236-9d29-b0000b918c7c
+
 
 ;;; ob-ledger.el ends here
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index 557a898ff1a..23fc8f04c34 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -442,6 +442,6 @@ dependent on LY-ARRANGE-MODE"
 
 (provide 'ob-lilypond)
 
-;; arch-tag: ac449eea-2cf2-4dc5-ae33-426f57ba4894
+
 
 ;;; ob-lilypond.el ends here
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 97e8a97b24b..271099e2ee2 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -101,6 +101,6 @@ current directory string."
 
 (provide 'ob-lisp)
 
-;; arch-tag: 18086168-009f-4947-bbb5-3532375d851d
+
 
 ;;; ob-lisp.el ends here
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index 5c4894d4510..26b13680fd3 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -136,6 +136,6 @@ if so then run the appropriate source block from the Library."
 
 (provide 'ob-lob)
 
-;; arch-tag: ce0712c9-2147-4019-ba3f-42341b8b474b
+
 
 ;;; ob-lob.el ends here
diff --git a/lisp/org/ob-matlab.el b/lisp/org/ob-matlab.el
index 3ddb3065fc7..9fb41e17aca 100644
--- a/lisp/org/ob-matlab.el
+++ b/lisp/org/ob-matlab.el
@@ -43,6 +43,6 @@
 
 (provide 'ob-matlab)
 
-;; arch-tag: 6b234299-c1f7-4eb1-ace8-7b93344065ac
+
 
 ;;; ob-matlab.el ends here
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el
index 9e42017168d..279ba6b928b 100644
--- a/lisp/org/ob-maxima.el
+++ b/lisp/org/ob-maxima.el
@@ -74,6 +74,6 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-maxima)
 
-;; arch-tag: d86c97ac-7eab-4349-8d8b-302dd09779a8
+
 
 ;;; ob-maxima.el ends here
diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el
index f96ba9a600b..15c116cf83f 100644
--- a/lisp/org/ob-mscgen.el
+++ b/lisp/org/ob-mscgen.el
@@ -81,6 +81,6 @@ ERROR: no output file specified. Add \":file name.png\" to the src header"))
 
 (provide 'ob-mscgen)
 
-;; arch-tag: 74695b1e-715f-4b5a-a3a9-d78ee39ba5c8
+
 
 ;;; ob-msc.el ends here
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index c4b40c46cb8..5709c28f03e 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -140,6 +140,6 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-ocaml)
 
-;; arch-tag: 2e815f4d-365e-4d69-b1df-dd17fdd7b7b7
+
 
 ;;; ob-ocaml.el ends here
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index ac434b4abb6..e7abd923271 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -258,6 +258,6 @@ This removes initial blank and comment lines and then calls
 
 (provide 'ob-octave)
 
-;; arch-tag: d8e5f68b-ba13-440a-a495-b653e989e704
+
 
 ;;; ob-octave.el ends here
diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el
index 74071363747..35e6abcd166 100644
--- a/lisp/org/ob-org.el
+++ b/lisp/org/ob-org.el
@@ -66,6 +66,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-org)
 
-;; arch-tag: 130af5fe-cc56-46bd-9508-fa0ebd94cb1f
+
 
 ;;; ob-org.el ends here
diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el
index ec93c729e7b..249b86bef5d 100644
--- a/lisp/org/ob-perl.el
+++ b/lisp/org/ob-perl.el
@@ -113,6 +113,6 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-perl)
 
-;; arch-tag: 88ef9396-d857-4dc3-8946-5a72bdfa2337
+
 
 ;;; ob-perl.el ends here
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index b226a5342ff..9bc896348af 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -80,6 +80,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-plantuml)
 
-;; arch-tag: 451f50c5-e779-407e-ad64-70e0e8f161d1
+
 
 ;;; ob-plantuml.el ends here
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 0fe0b4fefd8..3c1460c6740 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -294,6 +294,6 @@ last statement in BODY, as elisp."
 
 (provide 'ob-python)
 
-;; arch-tag: f19b6c3d-dfcb-4a1a-9ce0-45ade1ebc212
+
 
 ;;; ob-python.el ends here
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index d6ad39ed073..47a5d240409 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -263,6 +263,6 @@ Supported reference types are tables and source blocks."
 
 (provide 'ob-ref)
 
-;; arch-tag: ace4a4f4-ea38-4dac-8fe6-6f52fcc43b6d
+
 
 ;;; ob-ref.el ends here
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index f0ed1a16676..1f5e6fafab5 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -241,6 +241,6 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-ruby)
 
-;; arch-tag: 3e9726db-4520-49e2-b263-e8f571ac88f5
+
 
 ;;; ob-ruby.el ends here
diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index c51a4433426..a94458ff22d 100644
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -68,6 +68,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sass)
 
-;; arch-tag: 2954b169-eef4-45ce-a8e5-3e619f0f07ac
+
 
 ;;; ob-sass.el ends here
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index a772151aee4..a4f170fff6a 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -134,6 +134,6 @@ then create.  Return the initialized session."
 
 (provide 'ob-scheme)
 
-;; arch-tag: 6b2fe76f-4b25-4e87-ad1c-225b2f282a71
+
 
 ;;; ob-scheme.el ends here
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index a9a3c5c794a..3298077cb33 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -142,6 +142,6 @@ The terminal should shortly flicker."
 
 (provide 'ob-screen)
 
-;; arch-tag: 908e5afe-89a0-4f27-b982-23f1f2e3bac9
+
 
 ;;; ob-screen.el ends here
diff --git a/lisp/org/ob-sh.el b/lisp/org/ob-sh.el
index 9349a842a60..03683b66eaf 100644
--- a/lisp/org/ob-sh.el
+++ b/lisp/org/ob-sh.el
@@ -193,6 +193,6 @@ return the value of the last statement in BODY."
 
 (provide 'ob-sh)
 
-;; arch-tag: 416dd531-c230-4b0a-a5bf-8d948f990f2d
+
 
 ;;; ob-sh.el ends here
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 8fc7d3b4f84..552bb617266 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -140,6 +140,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sql)
 
-;; arch-tag: a43ff944-6de1-4566-a83c-626814e3dad2
+
 
 ;;; ob-sql.el ends here
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 3162fcca81f..ff4687f0095 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -145,6 +145,6 @@ Prepare SESSION according to the header arguments specified in PARAMS."
 
 (provide 'ob-sqlite)
 
-;; arch-tag: 5c03d7f2-0f72-48b8-bbd1-35aafea248ac
+
 
 ;;; ob-sqlite.el ends here
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index 91e238f254b..17f845eb76e 100644
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -121,6 +121,6 @@ example above."
 
 (provide 'ob-table)
 
-;; arch-tag: 4234cc7c-4fc8-4e92-abb0-2892de1a493b
+
 
 ;;; ob-table.el ends here
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index d4fb60618be..65e189b6c29 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -494,6 +494,6 @@ which enable the original code blocks to be found."
 
 (provide 'ob-tangle)
 
-;; arch-tag: 413ced93-48f5-4216-86e4-3fc5df8c8f24
+
 
 ;;; ob-tangle.el ends here
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 44173fdb789..538158469c3 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -2198,6 +2198,6 @@ of `org-babel-temporary-directory'."
 
 (provide 'ob)
 
-;; arch-tag: 01a7ebee-06c5-4ee4-a709-e660d28c0af1
+
 
 ;;; ob.el ends here
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index d47013b76f1..cb471202f8b 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8446,6 +8446,6 @@ belonging to the \"Work\" category."
 
 (provide 'org-agenda)
 
-;; arch-tag: 77f7565d-7c4b-44af-a2df-9f6f7070cff1
+
 
 ;;; org-agenda.el ends here
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 6c46b511786..87637f08298 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -483,6 +483,6 @@ This command is set with the variable `org-archive-default-command'."
 
 (provide 'org-archive)
 
-;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85
+
 
 ;;; org-archive.el ends here
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el
index 8c37f9c08df..e139773d486 100644
--- a/lisp/org/org-ascii.el
+++ b/lisp/org/org-ascii.el
@@ -726,5 +726,5 @@ publishing directory."
 
 (provide 'org-ascii)
 
-;; arch-tag: aa96f882-f477-4e13-86f5-70d43e7adf3c
+
 ;;; org-ascii.el ends here
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 809ec159496..c2688f2dced 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -437,5 +437,5 @@ prefix."
 
 (provide 'org-attach)
 
-;; arch-tag: fce93c2e-fe07-4fa3-a905-e10dcc7a6248
+
 ;;; org-attach.el ends here
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index b405718a49a..1ca5bfe44e8 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -392,6 +392,6 @@ END:VEVENT\n"
 
 (provide 'org-bbdb)
 
-;; arch-tag: 9e4f275d-d080-48c1-b040-62247f66b5c2
+
 
 ;;; org-bbdb.el ends here
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 97f17c043af..bf965e3a5c4 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -632,6 +632,6 @@ include square brackets."
 
 (provide 'org-beamer)
 
-;; arch-tag: 68bac91a-a946-43a3-8173-a9269306f67c
+
 
 ;;; org-beamer.el ends here
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index da6c1fec58c..084ea9674d3 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -642,6 +642,6 @@ This function relies `org-search-view' to locate results."
 
 (provide 'org-bibtex)
 
-;; arch-tag: 83987d5a-01b8-41c7-85bc-77700f1285f5
+
 
 ;;; org-bibtex.el ends here
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index d2a011249c9..2fac42d56dc 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1505,6 +1505,6 @@ The template may still contain \"%?\" for cursor positioning."
 
 (provide 'org-capture)
 
-;; arch-tag: 986bf41b-8ada-4e28-bf20-e8388a7205a0
+
 
 ;;; org-capture.el ends here
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 91d4ef11193..aa342d2be19 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2640,7 +2640,7 @@ The details of what will be saved are regulated by the variable
 
 (provide 'org-clock)
 
-;; arch-tag: 7b42c5d4-9b36-48be-97c0-66a869daed4c
+
 
 ;;; org-clock.el ends here
 
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index debc92a101d..fabe5525c69 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1526,6 +1526,6 @@ The string should be two numbers joined with a \"-\"."
 
 (provide 'org-colview)
 
-;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
+
 
 ;;; org-colview.el ends here
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index e96918cbcb5..49b07d3287a 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -444,6 +444,6 @@ With two arguments, return floor and remainder of their quotient."
 
 (provide 'org-compat)
 
-;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe
+
 
 ;;; org-compat.el ends here
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 28d92cc63f7..9c509139706 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -252,6 +252,6 @@ nil      : Leave auto-save-mode enabled.
 
 (provide 'org-crypt)
 
-;; arch-tag: 8202ed2c-221e-4001-9e4b-54674a7e846e
+
 
 ;;; org-crypt.el ends here
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index f28823f30e9..cb30e400862 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -539,5 +539,5 @@ a new topic."
 
 (provide 'org-ctags)
 
-;; arch-tag: 4b1ddd5a-8529-4b17-bcde-96a922d26343
+
 ;;; org-ctags.el ends here
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 11e81a8a155..6d12f6ec644 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -195,6 +195,6 @@ before running this command, even though the command tries to be smart."
 
 (provide 'org-datetree)
 
-;; arch-tag: 1daea962-fd08-448b-9f98-6e8b511b3601
+
 
 ;;; org-datetree.el ends here
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index bb17a4dcde2..2ecc48c41c1 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -1445,5 +1445,5 @@ the alist of previous items."
 
 (provide 'org-docbook)
 
-;; arch-tag: a24a127c-d365-4c2a-9e9b-f7dcb0ebfdc3
+
 ;;; org-docbook.el ends here
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index e13cdfd666a..2affe1f6922 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -88,6 +88,6 @@ and append it."
 
 (provide 'org-docview)
 
-;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
+
 
 ;;; org-docview.el ends here
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 0146abb07cf..9c929f2533c 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -568,6 +568,6 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: e6bd163f-7419-4009-9c93-a74623016424
+
 
 ;;; org-entities.el ends here
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 43cb9d10f03..45eb2c9de66 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -377,5 +377,5 @@ other backends, it converts the comment into an EXAMPLE segment."
 
 (provide 'org-exp-blocks)
 
-;; arch-tag: 1c365fe9-8808-4f72-bb15-0b00f36d8024
+
 ;;; org-exp-blocks.el ends here
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index b00e86dabf6..5499486f813 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -3231,6 +3231,6 @@ The depends on the variable `org-export-copy-to-kill'."
 
 (provide 'org-exp)
 
-;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95
+
 
 ;;; org-exp.el ends here
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 960eb615450..3d989fc8065 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -736,6 +736,6 @@ level org-n-level-faces"
 
 (provide 'org-faces)
 
-;; arch-tag: 9dab5f91-c4b9-4d6f-bac3-1f6211ad0a04
+
 
 ;;; org-faces.el ends here
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index a05463a2875..acc775ad5a3 100644
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -674,5 +674,5 @@ formatted as a string, not the original XML data."
 
 (provide 'org-feed)
 
-;; arch-tag: 0929b557-9bc4-47f4-9633-30a12dbb5ae2
+
 ;;; org-feed.el ends here
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 9a92bd5db1d..5587e3eaa94 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -862,6 +862,6 @@ If LABEL is non-nil, delete that footnote instead."
 
 (provide 'org-footnote)
 
-;; arch-tag: 1b5954df-fb5d-4da5-8709-78d944dbfc37
+
 
 ;;; org-footnote.el ends here
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 6664bf1f4f2..903707071e0 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -1237,7 +1237,7 @@ PATH should be a list of steps, where each step has the form
 
 (provide 'org-freemind)
 
-;; arch-tag: e7b0d776-94fd-404a-b35e-0f855fae3627
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; org-freemind.el ends here
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index da0712b9249..6bf00537ea0 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -291,6 +291,6 @@ If `org-store-link' was called with a prefix arg the meaning of
 
 (provide 'org-gnus)
 
-;; arch-tag: 512e0840-58fa-45b3-b456-71e10fa2376d
+
 
 ;;; org-gnus.el ends here
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index ebdfa0c773c..da105a2bd78 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -358,6 +358,6 @@ current time."
 
 (provide 'org-habit)
 
-;; arch-tag: 64e070d9-bd09-4917-bd44-44465f5ed348
+
 
 ;;; org-habit.el ends here
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index c150b3d8dd2..e91391e00a9 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -2607,5 +2607,5 @@ the alist of previous items."
 
 (provide 'org-html)
 
-;; arch-tag: 8109d84d-eb8f-460b-b1a8-f45f3a6c7ea1
+
 ;;; org-html.el ends here
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index bc0efce6a81..61ce98717d5 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -685,5 +685,5 @@ a time), or the day by one (if it does not contain a time)."
 
 (provide 'org-icalendar)
 
-;; arch-tag: 2dee2b6e-9211-4aee-8a47-a3c7e5bc30cf
+
 ;;; org-icalendar.el ends here
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index d724dff3060..a90753a390a 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -643,6 +643,6 @@ optional argument MARKERP, return the position as a new marker."
 
 ;;; org-id.el ends here
 
-;; arch-tag: e5abaca4-e16f-4b25-832a-540cfb63a712
+
 
 
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index 68821a4f772..398121e2880 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -322,5 +322,5 @@ Point is assumed to be at the beginning of a headline."
 
 (provide 'org-indent)
 
-;; arch-tag: b76736bc-9f4a-43cd-977c-ecfd6689846a
+
 ;;; org-indent.el ends here
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index d1bfc53e5e3..fb73509b8c2 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -78,6 +78,6 @@
 
 (provide 'org-info)
 
-;; arch-tag: 1e289f54-7176-487f-b575-dd4854bab15e
+
 
 ;;; org-info.el ends here
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index bc0e94450b7..0e74144973c 100644
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -253,6 +253,6 @@ default."
 
 (provide 'org-irc)
 
-;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
+
 
 ;;; org-irc.el ends here
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index cdefef8428c..b41df42df51 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -205,6 +205,6 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
 (provide 'org-infojs)
 (provide 'org-jsinfo)
 
-;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac
+
 
 ;;; org-jsinfo.el ends here
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index bd9c1138c7f..e976bd5c584 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -2769,6 +2769,6 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (provide 'org-export-latex)
 (provide 'org-latex)
 
-;; arch-tag: 23c2b87d-da04-4c2d-ad2d-1eb6487bc3ad
+
 
 ;;; org-latex.el ends here
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 2339c4d1bc1..7f3a66dff46 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -3201,5 +3201,5 @@ with overruling parameters for `org-list-to-generic'."
 
 (provide 'org-list)
 
-;; arch-tag: 73cf50c1-200f-4d1d-8a53-4e842a5b11c8
+
 ;;; org-list.el ends here
diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index 9c1089994ba..27caa10c2dc 100644
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -214,6 +214,6 @@ list of message:// links to flagged mail after heading."
 
 (provide 'org-mac-message)
 
-;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32
+
 
 ;;; org-mac-message.el ends here
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 906be613a9c..d6a2688147c 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -372,6 +372,6 @@ The number of levels is controlled by `org-inlinetask-min-level'"
 
 (provide 'org-macs)
 
-;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668
+
 
 ;;; org-macs.el ends here
diff --git a/lisp/org/org-mew.el b/lisp/org/org-mew.el
index 2f095949858..1439c1cb544 100644
--- a/lisp/org/org-mew.el
+++ b/lisp/org/org-mew.el
@@ -135,6 +135,6 @@
 
 (provide 'org-mew)
 
-;; arch-tag: 07ccdca7-6020-4941-a593-588a1e51b870
+
 
 ;;; org-mew.el ends here
diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index c75bed37b8c..d02b00808e1 100644
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -226,6 +226,6 @@ folders."
 
 (provide 'org-mhe)
 
-;; arch-tag: dcb05484-8627-491d-a8c1-01dbd2bde4ae
+
 
 ;;; org-mhe.el ends here
diff --git a/lisp/org/org-mks.el b/lisp/org/org-mks.el
index c71db81b52f..1a0f91e7478 100644
--- a/lisp/org/org-mks.el
+++ b/lisp/org/org-mks.el
@@ -132,6 +132,6 @@ only the bare key is returned."
 
 (provide 'org-mks)
 
-;; arch-tag: 4ea90d0e-c6e4-4684-bd61-baf878712f9f
+
 
 ;;; org-mks.el ends here
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 40fe7031c6f..f3c515ac519 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -1099,7 +1099,7 @@ A and B must be strings or nil."
 
 (provide 'org-mobile)
 
-;; arch-tag: ace0e26c-58f2-4309-8a61-05ec1535f658
+
 
 ;;; org-mobile.el ends here
 
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 8d59073ce40..e5947281cc8 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1146,6 +1146,6 @@ This means, between the beginning of line and the point."
 
 (provide 'org-mouse)
 
-;; arch-tag: ff1ae557-3529-41a3-95c6-baaebdcc280f
+
 
 ;;; org-mouse.el ends here
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index 9b3e49b5101..cede736d929 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -276,6 +276,6 @@ Complete a language in the first field, the header arguments and switches."
 
 (provide 'org-pcomplete)
 
-;; arch-tag: 
+
 
 ;;; org-pcomplete.el ends here
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 7f1bbac06b6..b65de575648 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -350,5 +350,5 @@ line directly before or after the table."
 
 (provide 'org-plot)
 
-;; arch-tag: 5763f7c6-0c75-416d-b070-398ee4ec0eca
+
 ;;; org-plot.el ends here
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 42a71224aea..42da94220b4 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -645,5 +645,5 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse
 
 (provide 'org-protocol)
 
-;; arch-tag: b5c5c2ac-77cf-4a94-a649-2163dff95846
+
 ;;; org-protocol.el ends here
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 67bccae15a2..d7e64c8859b 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -1183,6 +1183,6 @@ Returns value on success, else nil."
 
 (provide 'org-publish)
 
-;; arch-tag: 72807f3c-8af0-4a6b-8dca-c3376eb25adb
+
 
 ;;; org-publish.el ends here
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 40bf6888dff..ee8af35231a 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1153,7 +1153,7 @@ See also the variable `org-reverse-note-order'."
 
 (provide 'org-remember)
 
-;; arch-tag: 497f30d0-4bc3-4097-8622-2d27ac5f2698
+
 
 ;;; org-remember.el ends here
 
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index cbb63365985..064577e3499 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -115,6 +115,6 @@
 
 (provide 'org-rmail)
 
-;; arch-tag: c6cf4a8b-6639-4b7f-821f-bdf10746b173
+
 
 ;;; org-rmail.el ends here
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 30ffc34a6eb..d963339126b 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -814,5 +814,5 @@ LANG is a string, and the returned major mode is a symbol."
 
 (provide 'org-src)
 
-;; arch-tag: 6a1fc84f-dec7-47be-a416-64be56bea5d8
+
 ;;; org-src.el ends here
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 82d1e1309b1..097505598fe 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -4721,7 +4721,7 @@ list of the fields in the rectangle ."
 
 (provide 'org-table)
 
-;; arch-tag: 4d21cfdd-0268-440a-84b0-09237a0fe0ef
+
 
 ;;; org-table.el ends here
 
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index e612d45b145..acb5cdb4001 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -403,6 +403,6 @@ replace any running timer."
 
 (provide 'org-timer)
 
-;; arch-tag: 97538f8c-3871-4509-8f23-1e7b3ff3d107
+
 
 ;;; org-timer.el ends here
diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index d7e69e35092..981e6aa3fe2 100644
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -140,6 +140,6 @@
 
 (provide 'org-vm)
 
-;; arch-tag: cbc3047b-935e-4d2a-96e7-c5b0117aaa6d
+
 
 ;;; org-vm.el ends here
diff --git a/lisp/org/org-w3m.el b/lisp/org/org-w3m.el
index dcdd02230d8..8071a1d3066 100644
--- a/lisp/org/org-w3m.el
+++ b/lisp/org/org-w3m.el
@@ -168,6 +168,6 @@ Return t if there is no previous link; otherwise, return nil."
 
 (provide 'org-w3m)
 
-;; arch-tag: 851d7447-488d-49f0-a14d-46c092e84352
+
 
 ;;; org-w3m.el ends here
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 1a0a357d4fd..ebb8decd59f 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -310,6 +310,6 @@ for namazu index."
 
 (provide 'org-wl)
 
-;; arch-tag: 29b75a0f-ef2e-430b-8abc-acff75bde54a
+
 
 ;;; org-wl.el ends here
diff --git a/lisp/org/org-xoxo.el b/lisp/org/org-xoxo.el
index e81e4e74381..fcad14985c0 100644
--- a/lisp/org/org-xoxo.el
+++ b/lisp/org/org-xoxo.el
@@ -124,5 +124,5 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 
 (provide 'org-xoxo)
 
-;; arch-tag: 16e6a31f-f4f5-46f1-af18-48dc89faa702
+
 ;;; org-xoxo.el ends here
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c29ef115400..fb8821550a8 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -20537,6 +20537,6 @@ Still experimental, may disappear in the future."
 
 (run-hooks 'org-load-hook)
 
-;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
+
 
 ;;; org.el ends here
diff --git a/src/ChangeLog b/src/ChangeLog
index 6866daf9f38..4613192187e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -416,6 +416,28 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
+2011-08-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Don't accept a previous candidate
+        if it fails the cursor_row_p test.  Fixes cursor positioning at ZV.
+
+2011-08-16  Ken Brown  <kbrown@cornell.edu>
+
+        Fix memory allocation problems in Cygwin build (Bug#9273).
+
+        * unexcw.c ( __malloc_initialized): Declare external variable.
+        (fixup_executable): Force the dumped emacs to reinitialize malloc.
+
+        * gmalloc.c [CYGWIN] (bss_sbrk_heapbase, bss_sbrk_heapinfo): New
+        variables.
+        (malloc_initialize_1) [CYGWIN]: Prepare for reinitializing the
+        dumped emacs.
+        (_free_internal_nolock) [CYGWIN]: Ignore requests to free storage
+        in the static heap.
+        [CYGWIN] (special_realloc): New function.
+        (_realloc_internal_nolock) [CYGWIN]: Use the new function on
+        requests to realloc storage in the static heap.
+
 2011-08-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         * bidi.c (bidi_initialize): Remove unused local.
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 916bb300fe1..61046ad9d1b 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -351,10 +351,17 @@ Fifth Floor, Boston, MA 02110-1301, USA.
 #endif
 #include <errno.h>
 
-/* How to really get more memory.  */
-#if defined(CYGWIN)
+/* On Cygwin there are two heaps.  temacs uses the static heap
+   (defined in sheap.c and managed with bss_sbrk), and the dumped
+   emacs uses the Cygwin heap (managed with sbrk).  When emacs starts
+   on Cygwin, it reinitializes malloc, and we save the old info for
+   use by free and realloc if they're called with a pointer into the
+   static heap. */
+#ifdef CYGWIN
 extern __ptr_t bss_sbrk PP ((ptrdiff_t __size));
 extern int bss_sbrk_did_unexec;
+char *bss_sbrk_heapbase;        /* _heapbase for static heap */
+malloc_info *bss_sbrk_heapinfo; /* _heapinfo for static heap */
 #endif
 __ptr_t (*__morecore) PP ((__malloc_ptrdiff_t __size)) = __default_morecore;
 
@@ -584,6 +591,16 @@ malloc_initialize_1 ()
   mcheck (NULL);
 #endif
 
+#ifdef CYGWIN
+  if (bss_sbrk_did_unexec)
+    /* we're reinitializing the dumped emacs */
+    {
+      bss_sbrk_heapbase = _heapbase;
+      bss_sbrk_heapinfo = _heapinfo;
+      memset (_fraghead, 0, BLOCKLOG * sizeof (struct list));
+    }
+#endif
+
   if (__malloc_initialize_hook)
     (*__malloc_initialize_hook) ();
 
@@ -1054,6 +1071,12 @@ _free_internal_nolock (ptr)
   if (ptr == NULL)
     return;
 
+#ifdef CYGWIN
+  if (ptr < _heapbase)
+    /* We're being asked to free something in the static heap. */
+    return;
+#endif
+
   PROTECT_MALLOC_STATE (0);
 
   LOCK_ALIGNED_BLOCKS ();
@@ -1349,6 +1372,31 @@ Fifth Floor, Boston, MA 02110-1301, USA.
 
 #define min(A, B) ((A) < (B) ? (A) : (B))
 
+/* On Cygwin the dumped emacs may try to realloc storage allocated in
+   the static heap.  We just malloc space in the new heap and copy the
+   data.  */
+#ifdef CYGWIN
+__ptr_t
+special_realloc (ptr, size)
+     __ptr_t ptr;
+     __malloc_size_t size;
+{
+  __ptr_t result;
+  int type;
+  __malloc_size_t block, oldsize;
+
+  block = ((char *) ptr - bss_sbrk_heapbase) / BLOCKSIZE + 1;
+  type = bss_sbrk_heapinfo[block].busy.type;
+  oldsize =
+    type == 0 ? bss_sbrk_heapinfo[block].busy.info.size * BLOCKSIZE
+    : (__malloc_size_t) 1 << type;
+  result = _malloc_internal_nolock (size);
+  if (result != NULL)
+    memcpy (result, ptr, min (oldsize, size));
+  return result;
+}
+#endif
+
 /* Debugging hook for realloc.  */
 __ptr_t (*__realloc_hook) PP ((__ptr_t __ptr, __malloc_size_t __size));
 
@@ -1375,6 +1423,12 @@ _realloc_internal_nolock (ptr, size)
   else if (ptr == NULL)
     return _malloc_internal_nolock (size);
 
+#ifdef CYGWIN
+  if (ptr < _heapbase)
+    /* ptr points into the static heap */
+    return special_realloc (ptr, size);
+#endif
+
   block = BLOCK (ptr);
 
   PROTECT_MALLOC_STATE (0);
diff --git a/src/unexcw.c b/src/unexcw.c
index f643c196de0..62df82ec3bc 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -33,6 +33,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 extern int bss_sbrk_did_unexec;
 
+extern int __malloc_initialized;
+
 /* emacs symbols that indicate where bss and data end for emacs internals */
 extern char my_endbss[];
 extern char my_edata[];
@@ -210,9 +212,12 @@ fixup_executable (int fd)
             lseek (fd, (long) (exe_header->section_header[i].s_scnptr),
                    SEEK_SET);
           assert (ret != -1);
+          /* force the dumped emacs to reinitialize malloc */
+          __malloc_initialized = 0;
           ret =
             write (fd, (char *) start_address,
                    my_endbss - (char *) start_address);
+          __malloc_initialized = 1;
           assert (ret == (my_endbss - (char *) start_address));
           if (debug_unexcw)
             printf ("         .bss, mem start 0x%08x mem length %d\n",
diff --git a/src/xdisp.c b/src/xdisp.c
index 5cbdee41009..ea70c916762 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13749,11 +13749,13 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
       /* that candidate is not the row we are processing */
       && MATRIX_ROW (matrix, w->cursor.vpos) != row
       /* Make sure cursor.vpos specifies a row whose start and end
-         charpos occlude point.  This is because some callers of this
-         function leave cursor.vpos at the row where the cursor was
-         displayed during the last redisplay cycle.  */
+         charpos occlude point, and it is valid candidate for being a
+         cursor-row.  This is because some callers of this function
+         leave cursor.vpos at the row where the cursor was displayed
+         during the last redisplay cycle.  */
       && MATRIX_ROW_START_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos)) <= pt_old
-      && pt_old <= MATRIX_ROW_END_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos)))
+      && pt_old <= MATRIX_ROW_END_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos))
+      && cursor_row_p (MATRIX_ROW (matrix, w->cursor.vpos)))
     {
       struct glyph *g1 =
         MATRIX_ROW_GLYPH_START (matrix, w->cursor.vpos) + w->cursor.hpos;