upstream, fix conflicts

27 files changed, 1415 insertions, 128 deletions

diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index 06b9a9e45a5..aff350f9642 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -1,4 +1,4 @@
-Copyright (C) 2006-2012  Free Software Foundation, Inc.
+Copyright (C) 2006-2012 Free Software Foundation, Inc.
 See end for license conditions.
 
 
@@ -44,13 +44,24 @@ Ref: The "Tips" Appendix in the Emacs Lisp Reference.
 
 * Copyright Assignment
 
-We can accept small changes (roughly, fewer than 15 lines) without
-legal papers.  Anything more substantial requires a copyright
-disclaimer or assignment (the latter is preferred, especially for
-larger changes).  Both of these involved filling out a short form and
-filing it with the FSF.  The process is straightforward -- contact us
-at emacs-devel@gnu.org to obtain the relevant forms.
+The FSF (Free Software Foundation) is the copyright holder for GNU Emacs.
+The FSF is a nonprofit with a worldwide mission to promote computer
+user freedom and to defend the rights of all free software users.
+For general information, see the website http://www.fsf.org/ .
+
+Generally speaking, for non-trivial contributions to GNU Emacs we
+require that the copyright be assigned to the FSF.  For the reasons
+behind this, see: http://www.gnu.org/licenses/why-assign.html .
 
+Copyright assignment is a simple process.  If you live in the US, you
+can do it entirely electronically.  We can help you get started, and
+answer any questions you may have (or point you to the people with the
+answers), at the emacs-devel@gnu.org mailing list.
+
+A copyright disclaimer is also a possibility, but we prefer an assignment.
+We can accept small changes (roughly, fewer than 15 lines) without
+an assignment.  This is a cumulative limit (e.g. three separate 5 line
+patches) over all your contributions.
 
 * Getting the Source Code
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9353b617cb2..ffd9f7d31f6 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,25 @@
+2012-05-07  Glenn Morris  <rgm@gnu.org>
+
+        * forms/forms-d2.el, forms/forms-pass.el: Move here from ../lisp.
+        * forms/forms-d2.dat: Move to forms/ subdirectory.
+        * forms/README: New.
+
+2012-05-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * NEWS: Do not limit current-time-string to years 1000..9999.
+
+2012-04-27  Jambunathan K  <kjambunathan@gmail.com>
+
+        * org/OrgOdtStyles.xml (OrgDescriptionList): Modify style.  With
+        this change, in a description list, if the description paragraph
+        spawns multiple lines then it will correctly indented.
+
+2012-04-20  Glenn Morris  <rgm@gnu.org>
+
+        * CONTRIBUTE: Expand a bit on copyright assignments.
+
+        * MORE.STUFF: General update.  Mention list-packages.
+        Remove many old/outdated URLs.
 2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * publicsuffix.txt: New file (bug#1401).
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 84a34d24585..7186047dfb6 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -1,99 +1,87 @@
 More Neat Stuff for your Emacs
 
-Copyright (C) 1993, 1999, 2001-2012  Free Software Foundation, Inc.
+Copyright (C) 1993, 1999, 2001-2012 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-This file describes GNU Emacs programs and resources that are
-maintained by other people.  Some of these may become part of the
-Emacs distribution in the future.  Others we unfortunately can't
-distribute, even though they are free software, because we lack legal
-papers for copyright purposes.  Also included are sites where
-development versions of some packages distributed with Emacs may be
-found.
+The easiest way to add more features to your Emacs is to use the command
+M-x list-packages.  This contacts the server at <URL:http://elpa.gnu.org>,
+where many Emacs Lisp packages are stored.  These are distributed
+separately from Emacs itself for reasons of space, etc.  You can browse
+the resulting *Packages* buffer to see what is available, and then
+Emacs can automatically download and install the packages that you
+select.  See the section "Emacs Lisp Packages" in the Emacs manual
+for more details.
 
-You might also look at the Emacs web page
-<URL:http://www.gnu.org/software/emacs/emacs.html>.  If you use the
-Windows-32 version of Emacs, see the NTEmacs sites listed in the FAQ.
+Below we describe some GNU Emacs programs and resources that are
+maintained by other people.  Some of these may become part of the
+Emacs distribution, or GNU ELPA, in the future.  Others we unfortunately
+can't distribute, even though they are free software, because we lack
+legal papers for copyright purposes.
 
-Please submit a bug report if you find that any of the addresses
-listed here fail.
+Also listed are sites where development versions of some packages
+distributed with Emacs may be found.
 
-* The `Emacs Lisp List' at
-  <URL:http://www.damtp.cam.ac.uk/user/eglen/emacs/ell.html> has pointers
-  to sources of a large number of packages.
+It is difficult to keep this file up-to-date, and it only lists a fraction
+of the Emacs modes that are available.  If you are interested in
+a particular feature, then after checking Emacs itself and GNU ELPA,
+a web search is often the best way to find results.
 
-* gnu.emacs.sources
+* The gnu-emacs-sources mailing list
+  <URL:https://lists.gnu.org/mailman/listinfo/gnu-emacs-sources>
+  which is gatewayed to the gnu.emacs.sources newsgroup (although the
+  connection between the two can be unreliable) is an official
+  place where people can post or announce their extensions to Emacs.
 
-Packages posted to the gnu.emacs.sources newsgroup (see
-etc/MAILINGLISTS) might be archived specifically (try a web search
-engine) or retrievable from general Usenet archive services.
+* The `Emacs Lisp List' at
+  <URL:http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html> has pointers
+  to sources of a large number of packages.  Unfortunately, at the time
+  of writing it seems to no longer be updating.
 
 * emacswiki.org
+  The Emacs Wiki has an area for storing elisp files
+  <URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
 
-The Emacs Wiki has an area for storing elisp files
-<URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
-
-* Emacs tutorials and manuals
+* WikEmacs
+  <URL:http://wikemacs.org> is an alternative wiki for Emacs.
 
- * Emacs slides and tutorials can be found here:
+* Emacs slides and tutorials can be found here:
    <URL:http://web.psung.name/emacs/>
 
 * Maintenance versions of some packages distributed with Emacs
 
 You might find bug-fixes or enhancements in these places.
+In many cases, however, development of these packages has shifted to Emacs,
+so you will find the latest version in Emacs.
 
  * Ada-mode: <URL:http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html>
 
  * Battery and Info Look: <URL:http://ralph-schleicher.de/emacs.html>
 
- * BS: <URL:http://www.geekware.de/software/emacs/index.html>
-
- * Calculator: <URL:http://www.barzilay.org/misc/calculator.el>
-
  * CC mode: <URL:http://cc-mode.sourceforge.net/>
 
  * CPerl: <URL:http://math.berkeley.edu/~ilya/software/emacs/>
 
  * Ediff and Viper: <URL:http://www.cs.sunysb.edu/~kifer/emacs.html>
 
- * Eldoc and Rlogin:
-   <URL:http://www.splode.com/~friedman/software/emacs-lisp/>
-
  * ERC: <URL:http://savannah.gnu.org/projects/erc/>
 
- * Etags: <URL:http://fly.isti.cnr.it/software/>
-
  * Gnus: <URL:http://www.gnus.org/>
 
- * Ispell: <URL:http://www.kdstevens.com/stevens/ispell-page.html>
-
  * MH-E: <URL:http://mh-e.sourceforge.net/>
 
  * nXML: <URL:http://www.thaiopensource.com/nxml-mode/>
 
  * Org mode: <URL:http://orgmode.org/>
 
- * PS mode: <URL:http://odur.let.rug.nl/%7Ekleiweg/postscript/>
-
- * PS-print: <URL:http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage>
-
- * Python: <URL:http://www.loveshack.ukfsn.org/emacs/>
-
- * QuickURL: <URL:http://www.davep.org/emacs/>
-
  * RefTeX: <URL:http://www.gnu.org/software/auctex/reftex.html>
 
  * Remember: <URL:https://gna.org/p/remember-el>
 
- * Speedbar, Checkdoc etc: <URL:http://cedet.sourceforge.net/>
-
- * SQL: <URL:http://www.emacswiki.org/cgi-bin/wiki/sql.el>
+ * CEDET: <URL:http://cedet.sourceforge.net/>
 
  * Tramp: Remote file access via rsh/ssh
    <URL:http://savannah.gnu.org/projects/tramp/>
 
- * Webjump: <URL:http://www.neilvandyke.org/webjump>
-
 * Auxiliary files
 
  * (Tex)info files for use with Info-look that don't come from GNU
@@ -114,18 +102,16 @@ Emacs for various reasons, sometimes because their authors haven't made
 a copyright assignment to the FSF.  Some of them may be integrated in
 the future.
 
-You might like to check whether they are packaged for your system.
-Several are for Debian GNU/Linux in particular.
+Your operating system distribution may include several of these as optional
+packages that you can install.
 
  * AUCTeX: <URL:http://www.gnu.org/software/auctex/>
    An extensible package that supports writing and formatting TeX
    files (including AMS-TeX, LaTeX, Texinfo, ConTeXt, and docTeX).
+   Available from GNU ELPA.
 
  * BBDB: personal Info Rolodex integrated with mail/news:
-   <URL:http://bbdb.sourceforge.net/>
-   [You might want to set the coding system of your .bbdb file to
-   emacs-mule, say by adding `("\\.bbdb\\'" . emacs-mule)' to
-   `file-coding-system-alist' for non-ASCII characters.]
+   <URL:http://savannah.nongnu.org/projects/bbdb>
 
  * Boxquote: <URL:http://www.davep.org/emacs/>
 
@@ -143,13 +129,6 @@ Several are for Debian GNU/Linux in particular.
  * Ee: categorizing information manager:
    <URL:http://www.jurta.org/en/emacs/ee/>
 
- * EFS: enhanced version of ange-ftp:
-   <URL:http://www-pu.informatik.uni-tuebingen.de/users/sperber/software/efs/>
-
- * Elib library: <URL:http://www.gnu.org/software/elib/elib.html>
-   From GNU distribution mirrors.  (Much of this functionality is now
-   in Emacs.)
-
  * EMacro: <URL:http://emacro.sourceforge.net/>
    EMacro is a portable configuration file that configures itself.
 
@@ -168,33 +147,19 @@ Several are for Debian GNU/Linux in particular.
  * Emacs Wiki Mode: <URL:http://mwolson.org/projects/EmacsWikiMode.html>
    A wiki-like publishing tool and personal information manager
 
- * Gnuserv:
-   <URL:http://www.hpl.hp.com/personal/ange/gnuserv/home.html>
-   Alternative emacsclient/emacsserver.  Also available from this Web
-   page: eiffel-mode.el.
-
  * Go in a buffer: Go Text Protocol client:
    <URL:http://www.gnuvola.org/software/personal-elisp/dist/lisp/diversions/gnugo.el>
    A modified version is also bundled with GNU Go:
    <URL:http://www.gnu.org/software/gnugo/gnugo.html>
 
- * hm--html-menus:
-   <URL:ftp://sunsite.unc.edu/pub/Linux/apps/editors/emacs/>
-   HTML-specific editing.  Can work with PSGML.
-
  * Hyperbole:
-   <URL:http://directory.fsf.org/hyperbole.html>
+   <URL:http://directory.fsf.org/wiki/Hyperbole>
    Hyperbole is an open, efficient, programmable information
    management and hypertext system.
 
  * JDEE: <URL:http://jdee.sourceforge.net/>
    Provides a Java development environment for Emacs.
 
- * Mailcrypt:
-   <URL:http://mailcrypt.sourceforge.net/>
-   PGP and GPG support.  PGP isn't free software, but GPG, the GNU
-   Privacy Guard, is a free replacement <URL:http://www.gnupg.org/>.
-
  * Mew: <URL:http://www.mew.org/>
    A MIME mail reader for Emacs/XEmacs.
 
@@ -208,9 +173,6 @@ Several are for Debian GNU/Linux in particular.
  * Preview LaTeX: embed preview LaTeX images in source buffer.
    <URL:http://www.gnu.org/software/auctex/preview-latex.html>
 
- * PSGML: <URL:http://www.lysator.liu.se/projects/about_psgml.html>
-   DTD-aware serious SGML/XML editing.
-
  * Quack: <URL:http://www.neilvandyke.org/quack/>
    Quack enhances Emacs support for Scheme.
 
@@ -227,26 +189,17 @@ Several are for Debian GNU/Linux in particular.
  * Tamago: Chinese/Japanese/Korean input method
    <URL:http://www.m17n.org/tamago/index.en.html>
    Emacs Lisp package to provide input methods for CJK characters.
-   It can use these background conversion servers:
-        FreeWnn (jserver, cserver, tserver),
-        Wnn6,
-        SJ3 Ver.2
 
- * Tiny Tools: <URL:http://freshmeat.net/projects/emacs-tiny-tools>
+ * Tiny Tools: <URL:https://savannah.nongnu.org/projects/emacs-tiny-tools>
 
  * VM (View Mail): Alternative mail reader
    <URL:http://launchpad.net/vm>
    Previously hosted at: <URL:http://www.nongnu.org/viewmail/>
-   There are VM newsgroups: <URL:news:gnu.emacs.vm.info>, and
-   <URL:news:gnu.emacs.vm.bug>.
 
- * W3: <URL:http://savannah.gnu.org/projects/w3/>
-   Web browser.  There's a W3 mail list/newsgroup
-   <URL:http://savannah.gnu.org/mail/?group=w3>.
+ * W3 Web browser: <URL:http://savannah.gnu.org/projects/w3/>
 
  * Wanderlust: <URL:http://www.gohome.org/wl/>
-   Yet Another Message Interface on Emacsen. Wanderlust is a mail/news
-   reader supporting IMAP4rev1 for emacsen.
+   Wanderlust is a mail/news reader for Emacs.
 
  * WhizzyTex: <URL:http://cristal.inria.fr/whizzytex/>
    WhizzyTeX provides a minor mode for Emacs or XEmacs, a (bash)
@@ -257,8 +210,8 @@ Several are for Debian GNU/Linux in particular.
 
 Local Variables:
 mode: text
-mode: view
-mode: goto-address
+eval: (view-mode 1)
+eval: (goto-address-mode 1)
 End:
 
 This file is part of GNU Emacs.
diff --git a/etc/NEWS b/etc/NEWS
index 56a0c9bf95d..f6a5bcda480 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -22,6 +22,25 @@ so we will look at it and add it to the manual.
 
 
 * Installation Changes in Emacs 24.2
+
+** New configure option '--enable-gcc-warnings', intended for developers.
+If building with GCC, this enables compile-time checks that warn about
+possibly-questionable C code.  On a recent GNU system there should be
+no warnings; on older and on non-GNU systems the generated warnings
+may be useful.
+
+---
+** Emacs uses libtinfo in preference to libncurses, if available.
+
+---
+** On FreeBSD and NetBSD, configure no longer adds /usr/local/lib and
+/usr/pkg/lib to the linker search path.  You must add them yourself if
+you want them.
+
+---
+** On Mac OS X, configure no longer automatically adds the Fink /sw
+directories to the search path.  You must add them yourself if you want them.
+
 
 * Startup Changes in Emacs 24.2
 
@@ -32,9 +51,32 @@ been adding them there, put them somewhere else, eg site-lisp.
 
 * Changes in Emacs 24.2
 
+** New functions `system-users', `system-groups' return lists of the user
+name, group names known to the system (where possible).
+
 ** If your Emacs was built from a bzr checkout, the new variable
 `emacs-bzr-version' contains information about which bzr revision was used.
 
+** ImageMagick support, if available, is automatically enabled.
+It is no longer necessary to call `imagemagick-register-types'
+explicitly to install ImageMagick image types; that function is called
+automatically when setting `imagemagick-types-inhibit'.
+
+*** Setting `imagemagick-types-inhibit' to t now disables the use of
+ImageMagick to view images, set
+
+** String values for `initial-buffer-choice' also apply to emacsclient
+frames, if emacsclient is only told to open a new frame without
+specifying any file to visit or expression to evaluate.
+
++++
+** You can prevent the creation of lock files by setting `create-lockfiles'
+to nil.  Use with caution, and only if you really need to.
+
++++
+** Using "unibyte: t" in Lisp source files is obsolete.
+Use "coding: raw-text" instead.
+
 
 * Editing Changes in Emacs 24.2
 
@@ -52,20 +94,157 @@ character when doing minibuffer filename prompts.
 
 * Changes in Specialized Modes and Packages in Emacs 24.2
 
-** which-function-mode now applies to all applicable major modes by default.
+** `sh-script'
+*** Pairing of parens/quotes uses electric-pair-mode instead of skeleton-pair.
+*** `sh-electric-here-document-mode' now controls auto-insertion of here-docs.
+*** `sh-use-smie' lets you choose a new indentation and navigation code.
+
+** reStructuredText mode
+
+*** Nearly all keys are rebound making room for more keys and comply
+better to usage in other modes.  Bindings are described with C-c C-h.
+
+*** Major revision of indentation.  Now works very similarly to other modes.
+TAB is your friend.
+
+*** Major revision of filling.  Works fine with most of
+reStructuredText syntax.  Auto-filling is also supported.
+
+*** Major revision of comment handling.
+
+*** Major revision of fontification.  Now works with `jit-lock-mode'.
+
+*** reStructuredText syntax is covered more closely in many cases.
+Among other things this improves the experience for Sphinx users.
+
+*** `rst-insert-list' inserts a new list or continues existing lists.
+
+*** Customization is extended, corrected and improved.
+
+*** Negative prefix argument always works for `rst-adjust'.
+
+*** Window configuration is reset after displaying TOC.
+
+*** There is a package version in `rst-version'.
+
+** New `derived-mode' filter for Ibuffer, bound to `/ M'.
+`/ m' is now bound to filter by used-mode, which used to be bound to `/ M'.
+
+** Apropos
+
+*** The faces used by Apropos are now directly customizable.
+These faces are named `apropos-symbol', `apropos-keybinding', and so on;
+see the `apropos' Custom group for details.
+
+**** The old options whose values specified faces to use were removed
+(i.e. `apropos-symbol-face', `apropos-keybinding-face', etc.).
+
+** Calendar
+
+*** The calendars produced by cal-html include holidays.
+Customize cal-html-holidays to change this.
+
+** Customize
+
+*** `custom-reset-button-menu' now defaults to t.
+
+*** Non-option variables are never matched in `customize-apropos' and
+`customize-apropos-options' (i.e. the prefix argument does nothing for
+these commands now).
 
 ** erc will look up server/channel names via auth-source and use the
 channel keys found, if any.
 
+** FFAP
+
+*** The option `ffap-url-unwrap-remote' can now be a list of strings,
+specifying URL types which should be converted to remote file names at
+the FFAP prompt.  The default is now '("ftp").
+
+** Follow mode
+
+*** The obsolete variable `follow-mode-off-hook' has been removed.
+
+*** Follow mode no longer works by using advice.
+The option `follow-intercept-processes' has been removed.
+
 ** The `server-auth-key' variable can be used to set a permanent
 shared key for Emacs Server.
-   
+
+** In Perl mode, new option `perl-indent-parens-as-block' causes non-block
+closing brackets to be aligned with the line of the opening bracket.
+
+** FIXME something happened to ses.el, 2012-04-17.
+
+** which-function-mode now applies to all applicable major modes by default.
+
+** D-Bus
+
++++
+*** New variables `dbus-compiled-version' and `dbus-runtime-version'.
+
++++
+*** The D-Bus object manager interface is implemented.
+
++++
+*** Variables of type :(u)int32 and :(u)int64 accept floating points,
+if their value does not fit into Emacs's integer range.
+
++++
+*** The function `dbus-call-method' works non-blocking now, it can be
+interrupted by C-g.  `dbus-call-method-non-blocking' is obsolete.
+
++++
+*** Signals can be sent also as unicast message.
+
++++
+*** The argument list of `dbus-register-signal' has been extended,
+according to the new match rule types of D-Bus.  See the manual for
+details.
+
++++
+*** `dbus-init-bus' supports private connections.
+
++++
+*** There is a new function `dbus-setenv'.
+
++++
+** notifications.el supports now version 1.2 of the Notifications API.
+The function `notifications-get-capabilities' returns the supported
+server properties.
+
+** Tabulated List and packages derived from it
+
+*** New command `tabulated-list-sort', bound to `S', sorts the column
+at point, or the Nth column if a numeric prefix argument is given.
+
+** URL
+
+*** Structs made by `url-generic-parse-url' have nil `attributes' slot.
+Previously, this slot stored semicolon-separated attribute-value pairs
+appended to some imap URLs, but this is not compatible with RFC 3986.
+So now the `filename' slot stores the entire path and query components
+and the `attributes' slot is always nil.
+
+*** New function `url-encode-url' for encoding a URI string.
+The `url-retrieve' function now uses this to encode its URL argument,
+in case that is not properly encoded.
+
 ** Obsolete packages:
 
+*** assoc.el
+In most cases, assoc+member+push+delq work just as well.
+And in any case it's just a terrible package: ugly semantics, terrible
+inefficiency, and not namespace-clean.
+
+*** bruce.el
+
 *** mailpost.el
 
 *** mouse-sel.el
 
+*** patcomp.el
+
 
 * New Modes and Packages in Emacs 24.2
 
@@ -77,8 +256,43 @@ Only variables defined using `defcustom' are considered user options.
 The function `user-variable-p' is now an obsolete alias for
 `custom-variable-p'.
 
+** `face-spec-set' no longer sets frame-specific attributes when the
+third argument is a frame (that usage was obsolete since Emacs 22.2).
+
++++
+** The arguments of `dbus-register-signal' are no longer just strings,
+but keywords or keyword-string pairs.  The old argument list will
+still be supported for Emacs 24.x.
+
+** The following obsolete variables and varaliases have been removed:
+
+*** `facemenu-unlisted-faces'
+*** `rmail-decode-mime-charset'
+
 
 * Lisp changes in Emacs 24.2
+
+** New function `set-temporary-overlay-map'.
+
+** New macros `setq-local' and `defvar-local'.
+
+** New error type and new function `user-error'.  Doesn't trigger the debugger.
+
+** Completion
+
+*** New function `completion-table-with-quoting' to handle completion
+in the presence of quoting, such as file completion in shell buffers.
+
+*** New function `completion-table-subvert' to use an existing completion
+table, but with a different prefix.
+
+** Time
+
+*** `current-time-string' no longer requires that its argument's year
+must be in the range 1000..9999.  It now works with any year supported
+by the underlying C implementation.
+
+** `automount-dir-prefix' is obsolete.
 
 * Changes in Emacs 24.2 on non-free operating systems
 
@@ -730,7 +944,7 @@ by default.
 (Its name is misleading, since it has nothing to do with MIME
 attachments.)  The old name is now an obsolete alias to the new name.
 
-** MH-E has been upgraded to MH-E version 8.3.1.
+** MH-E has been updated to MH-E version 8.3.1.
 See MH-E-NEWS for details.
 
 ** Modula-2 mode provides auto-indentation.
@@ -742,6 +956,9 @@ Completion is now performed via `completion-at-point', bound to C-M-i
 or M-TAB.  If `nxml-bind-meta-tab-to-complete-flag' is non-nil (the
 default), this performs tag completion.
 
+** Org mode has been updated to version 7.8.09.
+See ORG-NEWS for details.
+
 ** Prolog mode has been completely revamped, with lots of additional
 functionality such as more intelligent indentation, electricity,
 support for more variants, including Mercury, and a lot more.
@@ -1125,6 +1342,8 @@ So do `defcustom' and other forms that call `defvar' as a subroutine.
 *** New function `special-variable-p' to check whether a variable is
 declared as dynamically bound.
 
+*** The form ((lambda ...) ...) is deprecated.
+
 ** An Emacs Lisp testing tool is now included.
 Emacs Lisp developers can use this tool to write automated tests for
 their code.  See the ERT info manual for details.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
new file mode 100644
index 00000000000..a6b31cf1249
--- /dev/null
+++ b/etc/ORG-NEWS
@@ -0,0 +1,948 @@
+ORG NEWS -- history of user-visible changes.           -*- org -*-
+
+Copyright (C) 2012  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+Please send Org bug reports to emacs-orgmode@gnu.org.
+
+* Incompatible changes
+
+** New keys for TODO sparse trees
+   :PROPERTIES:
+   :OrgVersion:  7.01
+   :END:
+
+   The key =C-c C-v= is now reserved for Org Babel action.  TODO sparse
+   trees can still be made with =C-c / t= (all not-done states) and =C-c /
+   T= (specific states).
+
+** The Agenda =org-agenda-ndays= is now obsolete
+   :PROPERTIES:
+   :OrgVersion:  7.4
+   :END:
+   
+   The variable =org-agenda-ndays= is obsolete - please use
+   =org-agenda-span= instead.
+
+   Thanks to Julien Danjou for this.
+
+** Changes to the intended use of =org-export-latex-classes=
+   :PROPERTIES:
+   :OrgVersion:  6.35
+   :END:
+
+   So far this variable has been used to specify the complete header of the
+   LaTeX document, including all the =\usepackage= calls necessary for the
+   document.  This setup makes it difficult to maintain the list of
+   packages that Org itself would like to call, for example for the special
+   symbol support it needs.
+
+   First of all, you can *opt out of this change* in the following way: You
+   can say: /I want to have full control over headers, and I will take
+   responsibility to include the packages Org needs/.  If that is what you
+   want, add this to your configuration and skip the rest of this section
+   (except maybe for the description of the =[EXTRA]= place holder):
+
+   #+begin_src emacs-lisp
+  (setq org-export-latex-default-packages-alist nil
+        org-export-latex-packages-alist nil)
+   #+end_src
+
+   /Continue to read here if you want to go along with the modified setup./
+
+   There are now two variables that should be used to list the LaTeX
+   packages that need to be included in all classes.  The header definition
+   in =org-export-latex-classes= should then not contain the corresponding
+   =\usepackage= calls (see below).
+
+   The two new variables are:
+
+   1. =org-export-latex-default-packages-alist= :: This is the variable
+        where Org-mode itself puts the packages it needs.  Normally you
+        should not change this variable.  The only reason to change it
+        anyway is when one of these packages causes a conflict with another
+        package you want to use.  Then you can remove that packages and
+        hope that you are not using Org-mode functionality that needs it.
+
+   2. =org-export-latex-packages-alist= :: This is the variable where you
+        can put the packages that you'd like to use across all classes.
+
+   The sequence how these customizations will show up in the LaTeX
+   document are:
+
+   1. Header from =org-export-latex-classes=
+   2. =org-export-latex-default-packages-alist=
+   3. =org-export-latex-packages-alist=
+   4. Buffer-specific things set with =#+LaTeX_HEADER:=
+
+   If you want more control about which segment is placed where, or if you
+   want, for a specific class, have full control over the header and
+   exclude some of the automatic building blocks, you can put the following
+   macro-like place holders into the header:
+
+   #+begin_example
+   [DEFAULT-PACKAGES]      \usepackage statements for default packages
+   [NO-DEFAULT-PACKAGES]   do not include any of the default packages
+   [PACKAGES]              \usepackage statements for packages
+   [NO-PACKAGES]           do not include the packages
+   [EXTRA]                 the stuff from #+LaTeX_HEADER
+   [NO-EXTRA]              do not include #+LaTeX_HEADER stuff
+   #+end_example
+
+   If you have currently customized =org-export-latex-classes=, you should
+   revise that customization and remove any package calls that are covered
+   by =org-export-latex-default-packages-alist=.  This applies to the
+   following packages:
+
+   - inputenc
+   - fontenc
+   - fixltx2e
+   - graphicx
+   - longtable
+   - float
+   - wrapfig
+   - soul
+   - t1enc
+   - textcomp
+   - marvosym
+   - wasysym
+   - latexsym
+   - amssymb
+   - hyperref
+
+   If one of these packages creates a conflict with another package you are
+   using, you can remove it from =org-export-latex-default-packages-alist=.
+   But then you risk that some of the advertised export features of Org
+   will not work properly.
+
+   You can also consider moving packages that you use in all classes to
+   =org-export-latex-packages-alist=.  If necessary, put the place holders
+   so that the packages get loaded in the right sequence.  As said above,
+   for backward compatibility, if you omit the place holders, all the
+   variables will dump their content at the end of the header.
+
+** The constant =org-html-entities= is obsolete
+   :PROPERTIES:
+   :OrgVersion:  6.35
+   :END:
+
+   Its content is now part of the new constant =org-entities=, which is
+   defined in the file org-entities.el.  =org-html-entities= was an internal
+   variable, but it is possible that some users did write code using it.
+
+** `org-bbdb-anniversary-format-alist' has changed
+   :PROPERTIES:
+   :OrgVersion:  7.5
+   :END:
+
+   Please check the docstring and update your settings accordingly.
+
+** Deleted =org-mode-p=
+   :PROPERTIES:
+   :OrgVersion:  7.8
+   :END:
+
+   This function has been deleted: please update your code.
+
+* Important new features
+
+** New Org to ODT exporter
+   :PROPERTIES:
+   :OrgVersion:  7.8
+   :END:
+
+   Jambunathan's Org to ODT exporter is now part of Org.
+
+   To use it, it `C-c C-e o' in an Org file.  See the documentation for more
+   information on how to customize it.
+
+** org-capture.el is now the default capture system
+   :PROPERTIES:
+   :OrgVersion:  7.01
+   :END:
+
+   This replaces the earlier system org-remember.  The manual only describes
+   org-capture, but for people who prefer to continue to use org-remember,
+   we keep a static copy of the former manual section [[http://orgmode.org/org-remember.pdf][chapter about
+   remember]].
+
+   The new system has a technically cleaner implementation and more
+   possibilities for capturing different types of data.  See [[http://thread.gmane.org/gmane.emacs.orgmode/26441/focus%3D26441][Carsten's
+   announcement]] for more details.
+
+   To switch over to the new system:
+
+   1. Run
+
+    : M-x org-capture-import-remember-templates RET
+
+    to get a translated version of your remember templates into the
+    new variable =org-capture-templates=.  This will "mostly" work,
+    but maybe not for all cases.  At least it will give you a good
+    place to modify your templates.  After running this command,
+    enter the customize buffer for this variable with
+
+    : M-x customize-variable RET org-capture-templates RET
+
+    and convince yourself that everything is OK.  Then save the
+    customization.
+
+   2. Bind the command =org-capture= to a key, similar to what you did
+      with org-remember:
+
+    : (define-key global-map "\C-cc" 'org-capture)
+
+    If your fingers prefer =C-c r=, you can also use this key once
+    you have decided to move over completely to the new
+    implementation.  During a test time, there is nothing wrong
+    with using both system in parallel.
+
+* New libraries
+
+** New Org libraries
+*** org-eshell.el (Konrad Hinsen)
+    :PROPERTIES:
+    :OrgVersion:  7.8
+    :END:
+
+    Implement links to eshell buffers.
+
+*** org-special-blocks (Carsten Dominik)
+   :PROPERTIES:
+   :OrgVersion:  7.8
+   :END:
+
+This package generalizes the #+begin_foo and #+end_foo tokens.
+
+To use, put the following in your init file:
+
+#+BEGIN_EXAMPLE
+(require 'org-special-blocks)
+#+END_EXAMPLE
+
+The tokens #+begin_center, #+begin_verse, etc. existed previously.  This
+package generalizes them (at least for the LaTeX and html exporters).  When
+a #+begin_foo token is encountered by the LaTeX exporter, it is expanded
+into \begin{foo}.  The text inside the environment is not protected, as
+text inside environments generally is.  When #+begin_foo is encountered by
+the html exporter, a div with class foo is inserted into the HTML file.  It
+is up to the user to add this class to his or her stylesheet if this div is
+to mean anything.
+
+*** org-taskjuggler.el (Christian Egli)
+    :PROPERTIES:
+    :OrgVersion:  7.01
+    :END:
+
+    Christian Egli's /org-taskjuggler.el/ module is now part of Org.  He
+    also wrote a [[http://orgmode.org/worg/org-tutorials/org-taskjuggler.php][tutorial]] for it.
+
+*** org-ctags.el (Paul Sexton)
+    :PROPERTIES:
+    :OrgVersion:  6.34
+    :END:
+
+    Targets like =<<my target>>= can now be found by Emacs' etag
+    functionality, and Org-mode links can be used to to link to etags, also
+    in non-Org-mode files.  For details, see the file /org-ctags.el/.
+
+    This feature uses a new hook =org-open-link-functions= which will call
+    function to do something special with text links.
+
+    Thanks to Paul Sexton for this contribution.
+
+*** org-docview.el (Jan Böcker)
+    :PROPERTIES:
+    :OrgVersion:  6.34
+    :END:
+
+    This new module allows links to various file types using docview, where
+    Emacs displays images of document pages.  Docview link types can point
+    to a specific page in a document, for example to page 131 of the
+    Org-mode manual:
+
+    : [[docview:~/.elisp/org/doc/org.pdf::131][Org-Mode Manual]]
+
+    Thanks to Jan Böcker for this contribution.
+
+** New Babel libraries
+
+- ob-picolisp.el (Thorsten Jolitz)
+- ob-fortran.el (Sergey Litvinov)
+- ob-shen.el (Eric Schulte)
+- ob-maxima.el (Eric S Fraga)
+- ob-java.el (Eric Schulte)
+- ob-lilypond.el (Martyn Jago)
+- ob-awk.el (Eric Schulte)
+
+* Other new features and various enhancements
+
+** Hyperlinks
+
+*** Org-Bibtex -- major improvements
+    :PROPERTIES:
+    :OrgVersion:  7.6
+    :END:
+
+    Provides support for managing bibtex bibliographical references
+    data in headline properties.  Each headline corresponds to a
+    single reference and the relevant bibliographic meta-data is
+    stored in headline properties, leaving the body of the headline
+    free to hold notes and comments.  Org-bibtex is aware of all
+    standard bibtex reference types and fields.
+
+    The key new functions are
+
+- org-bibtex-check :: queries the user to flesh out all required
+     (and with prefix argument optional) bibtex fields available
+     for the specific reference =type= of the current headline.
+
+- org-bibtex-create :: Create a new entry at the given level,
+     using org-bibtex-check to flesh out the relevant fields.
+
+- org-bibtex-yank :: Yank a bibtex entry on the kill ring as a
+     formatted Org-mode headline into the current buffer
+
+- org-bibtex-export-to-kill-ring :: Export the current headline
+     to the kill ring as a formatted bibtex entry.
+
+
+
+*** org-gnus.el now allows link creation from messages
+    :PROPERTIES:
+    :OrgVersion:  7.5
+    :END:
+
+    You can now create links from messages.  This is particularily
+    useful when the user wants to stored messages that he sends, for
+    later check.  Thanks to Ulf Stegemann for the patch.
+
+
+
+*** Modified link escaping
+    :PROPERTIES:
+    :OrgVersion:  7.5
+    :END:
+
+    David Maus worked on `org-link-escape'.  See [[http://article.gmane.org/gmane.emacs.orgmode/37888][his message]]:
+
+: Percent escaping is used in Org mode to escape certain characters
+: in links that would either break the parser (e.g. square brackets
+: in link target oder description) or are not allowed to appear in
+: a particular link type (e.g. non-ascii characters in a http:
+: link).
+:
+: With this change in place Org will apply percent escaping and
+: unescaping more consistently especially for non-ascii characters.
+: Additionally some of the outstanding bugs or glitches concerning
+: percent escaped links are solved.
+
+    Thanks a lot to David for this work.
+
+
+
+*** Make =org-store-link= point to directory in a dired buffer
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    When, in a dired buffer, the cursor is not in a line listing a
+    file, `org-store-link' will store a link to the directory.
+
+    Patch by Stephen Eglen.
+
+
+
+*** Allow regexps in =org-file-apps= to capture link parameters
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    The way extension regexps in =org-file-apps= are handled has
+    changed.  Instead of matching against the file name, the regexps
+    are now matched against the whole link, and you can use grouping
+    to extract link parameters which you can then use in a command
+    string to be executed.
+
+    For example, to allow linking to PDF files using the syntax
+    =file:/doc.pdf::<page number>=, you can add the following entry to
+    org-file-apps:
+
+    #+begin_example
+    Extension: \.pdf::\([0-9]+\)\'
+    Command:   evince "%s" -p %1
+    #+end_example
+
+    Thanks to Jan Böcker for a patch to this effect.
+
+** Dates and time
+
+*** Allow relative time when scheduling/adding a deadline
+    :PROPERTIES:
+    :OrgVersion:  7.7
+    :END:
+
+    You can now use relative duration strings like "-2d" or "++3w"
+    when calling =org-schedule= or =org-deadline=: it will schedule
+    (or set the deadline for) the item respectively two days before
+    today and three weeks after the current timestamp, if any.
+
+    You can use this programmatically: =(org-schedule nil "+2d")=
+    will work on the current entry.
+
+    You can also use this while (bulk-)rescheduling and
+    (bulk-)resetting the deadline of (several) items from the agenda.
+
+    Thanks to Memnon Anon for a heads up about this!
+
+
+
+
+*** American-style dates are now understood by =org-read-date=
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    So when you are prompted for a date, you can now answer like this
+
+    #+begin_example
+    2/5/3         --> 2003-02-05
+    2/5           --> <CURRENT-YEAR>-02-05
+    #+end_example
+
+** Agenda
+
+*** =org-agenda-custom-commands= has a default value
+    :PROPERTIES:
+    :OrgVersion:  7.8
+    :END:
+
+    This option used to be `nil' by default.  This now has a default
+    value, displaying an agenda and all TODOs.  See the docstring for
+    details.  Thanks to Carsten for this.
+
+
+*** Improved filtering through =org-agenda-to-appt=
+    :PROPERTIES:
+    :OrgVersion:  7.8
+    :END:
+
+    The new function allows the user to refine the scope of entries
+    to pass to =org-agenda-get-day-entries= and allows to filter out
+    entries using a function.
+
+    Thanks to Peter Münster for raising a related issue and to
+    Tassilo Horn for this idea.  Also thanks to Peter Münster for
+    [[git:68ffb7a7][fixing a small bug]] in the final implementation.
+
+
+
+*** Allow ap/pm times in agenda time grid
+    :PROPERTIES:
+    :OrgVersion:  7.4
+    :END:
+
+    Times in the agenda can now be displayed in am/pm format.  See the new
+    variable =org-agenda-timegrid-use-ampm=.  Thanks to C. A. Webber for
+    a patch to this effect.
+
+
+
+*** Agenda: Added a bulk "scattering" command
+    :PROPERTIES:
+    :OrgVersion:  7.4
+    :END:
+
+    =B S= in the agenda buffer will cause tasks to be rescheduled a random
+    number of days into the future, with 7 as the default.  This is useful
+    if you've got a ton of tasks scheduled for today, you realize you'll
+    never deal with them all, and you just want them to be distributed
+    across the next N days.  When called with a prefix arg, rescheduling
+    will avoid weekend days.
+
+    Thanks to John Wiegley for this.
+
+** Exporting
+
+*** Simplification of org-export-html-preamble/postamble
+    :PROPERTIES:
+    :OrgVersion:  7.5
+    :END:
+
+    When set to `t', export the preamble/postamble as usual, honoring the
+    =org-export-email/author/creator-info= variables.
+
+    When set to a formatting string, insert this string.  See the docstring
+    of these variable for details about available %-sequences.
+
+    You can set =:html-preamble= in publishing project in the same way: `t'
+    means to honor =:email/creator/author-info=, and a formatting string
+    will insert a string.
+
+*** New exporters to Latin-1 and UTF-8
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    While Ulf Stegemann was going through the entities list to improve the
+    LaTeX export, he had the great idea to provide representations for many
+    of the entities in Latin-1, and for all of them in UTF-8.  This means
+    that we can now export files rich in special symbols to Latin-1 and to
+    UTF-8 files.  These new exporters can be reached with the commands =C-c
+    C-e n= and =C-c C-e u=, respectively.
+
+    When there is no representation for a given symbol in the targeted
+    coding system, you can choose to keep the TeX-macro-like
+    representation, or to get an "explanatory" representation.  For
+    example, =\simeq= could be represented as "[approx. equal to]".  Please
+    use the variable =org-entities-ascii-explanatory= to state your
+    preference.
+
+*** HTML export: Add class to outline containers using property
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    The =HTML_CONTAINER_CLASS= property can now be used to add a class name
+    to the outline container of a node in HTML export.
+
+*** Throw an error when creating an image from a LaTeX snippet fails
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    This behavior can be configured with the new option variable
+    =org-format-latex-signal-error=.
+
+*** Support for creating BEAMER presentations from Org-mode documents
+    :PROPERTIES:
+    :OrgVersion:  6.34
+    :END:
+
+    Org-mode documents or subtrees can now be converted directly in to
+    BEAMER presentation.  Turning a tree into a simple presentations is
+    straight forward, and there is also quite some support to make richer
+    presentations as well.  See the [[http://orgmode.org/manual/Beamer-class-export.html#Beamer-class-export][BEAMER section]] in the manual for more
+    details.
+
+    Thanks to everyone who has contributed to the discussion about BEAMER
+    support and how it should work.  This was a great example for how this
+    community can achieve a much better result than any individual could.
+
+** Refiling
+
+*** Refile targets can now be cached
+    :PROPERTIES:
+    :OrgVersion:  7.01
+    :END:
+
+    You can turn on caching of refile targets by setting the variable
+    =org-refile-use-cache=.  This should speed up refiling if you have many
+    eligible targets in many files.  If you need to update the cache
+    because Org misses a newly created entry or still offers a deleted one,
+    press =C-0 C-c C-w=.
+
+*** New logging support for refiling
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    Whenever you refile an item, a time stamp and even a note can be added
+    to this entry.  For details, see the new option =org-log-refile=.
+
+    Thanks to Charles Cave for this idea.
+
+** Completion
+
+*** In-buffer completion is now done using John Wiegleys pcomplete.el
+    :PROPERTIES:
+    :OrgVersion:  7.4
+    :END:
+
+    Thanks to John Wiegley for much of this code.
+
+** Tables
+
+*** New command =org-table-transpose-table-at-point=
+    :PROPERTIES:
+    :OrgVersion:  7.8
+    :END:
+
+    See the docstring.  This hack from Juan Pechiar is now part of Org's
+    core.  Thanks to Juan!
+
+*** Display field's coordinates when editing it with =C-c `=
+    :PROPERTIES:
+    :OrgVersion:  7.7
+    :END:
+
+    When editing a field with =C-c `=, the field's coordinate will the
+    displayed in the buffer.
+
+    Thanks to Michael Brand for a patch to this effect.
+
+*** Spreadsheet computation of durations and time values
+    :PROPERTIES:
+    :OrgVersion:  7.6
+    :END:
+
+    If you want to compute time values use the =T= flag, either in Calc
+    formulas or Elisp formulas:
+
+    | Task 1 | Task 2 |   Total |
+    |--------+--------+---------|
+    |  35:00 |  35:00 | 1:10:00 |
+    #+TBLFM: @2$3=$1+$2;T
+
+    Values must be of the form =[HH:]MM:SS=, where hours are optional.
+
+    Thanks to Martin Halder, Eric Schulte and Carsten for code and feedback
+    on this.
+
+*** Implement formulas applying to field ranges
+    :PROPERTIES:
+    :OrgVersion:  7.5
+    :END:
+
+    Carsten implemented this field-ranges formulas.
+
+    : A frequently requested feature for tables has been to be able to define
+    : row formulas in a way similar to column formulas.  The patch below allows
+    : things like
+    :
+    : @3=
+    : @2$2..@5$7=
+    : @I$2..@II$4=
+    :
+    : as the left hand side for table formulas in order to write a formula that
+    : is valid for an entire column or for a rectangular section in a
+    : table.
+
+    Thanks a lot to Carsten for this.
+
+*** Sending radio tables from org buffers is now allowed
+    :PROPERTIES:
+    :OrgVersion:  7.4
+    :END:
+
+    Org radio tables can no also be sent inside Org buffers.  Also, there
+    is a new hook which get called after a table has been sent.
+
+    Thanks to Seweryn Kokot.
+
+** Lists
+
+*** Improved handling of lists
+    :PROPERTIES:
+    :OrgVersion:  7.5
+    :END:
+
+    Nicolas Goaziou extended and improved the way Org handles lists.
+
+    1. Indentation of text determines again end of items in lists. So, some
+       text less indented than the previous item doesn't close the whole
+       list anymore, only all items more indented than it.
+
+    2. Alphabetical bullets are implemented, through the use of the
+       variable `org-alphabetical-lists'. This also adds alphabetical
+       counters like [@c] or [@W].
+
+    3. Lists can now safely contain drawers, inline tasks, or various
+       blocks, themselves containing lists. Two variables are controlling
+       this: `org-list-forbidden-blocks', and `org-list-export-context'.
+
+    4. Improve `newline-and-indent' (C-j): used in an item, it will keep
+       text from moving at column 0. This allows to split text and make
+       paragraphs and still not break the list.
+
+    5. Improve `org-toggle-item' (C-c -): used on a region with standard
+       text, it will change the region into one item. With a prefix
+       argument, it will fallback to the previous behavior and make every
+       line in region an item. It permits to easily integrate paragraphs
+       inside a list.
+
+    6. `fill-paragraph' (M-q) now understands lists. It can freely be used
+       inside items, or on text just after a list, even with no blank line
+       around, without breaking list structure.
+
+    Thanks a lot to Nicolas for all this!
+
+** Inline display of linked images
+   :PROPERTIES:
+   :OrgVersion:  6.36
+   :END:
+
+   Images can now be displayed inline.  The key C-c C-x C-v does toggle the
+   display of such images.  Note that only image links that have no
+   description part will be inlined.
+
+** Implement offsets for ordered lists
+   :PROPERTIES:
+   :OrgVersion:  6.36
+   :END:
+
+   If you want to start an ordered plain list with a number different from
+   1, you can now do it like this:
+
+   : 1. [@start:12] will star a lit a number 12
+
+** Babel: code block body expansion for table and preview
+   :PROPERTIES:
+   :OrgVersion:  6.36
+   :END:
+
+   In org-babel, code is "expanded" prior to evaluation. I.e. the code that
+   is actually evaluated comprises the code block contents, augmented with
+   the extra code which assigns the referenced data to variables. It is now
+   possible to preview expanded contents, and also to expand code during
+   during tangling. This expansion takes into account all header arguments,
+   and variables.
+
+   A new key-binding `C-c M-b p' bound to `org-babel-expand-src-block' can
+   be used from inside of a source code block to preview its expanded
+   contents (which can be very useful for debugging).  tangling
+
+   The expanded body can now be tangled, this includes variable values
+   which may be the results of other source-code blocks, or stored in
+   headline properties or tables. One possible use for this is to allow
+   those using org-babel for their emacs initialization to store values
+   (e.g. usernames, passwords, etc...) in headline properties or in tables.
+
+   Org-babel now supports three new header arguments, and new default
+   behavior for handling horizontal lines in tables (hlines), column names,
+   and rownames across all languages.
+
+** Editing Convenience and Appearance
+
+*** New command =org-copy-visible= (=C-c C-x v=)
+    :PROPERTIES:
+    :OrgVersion:  7.7
+    :END:
+
+    This command will copy the visible text in the region into the kill
+    ring.  Thanks to Florian Beck for this function and to Carsten for
+    adding it to org.el and documenting it!
+
+*** Make it possible to protect hidden subtrees from being killed by =C-k=
+    :PROPERTIES:
+    :OrgVersion:  7.01
+    :END:
+
+    See the new variable =org-ctrl-k-protect-subtree=.  This was a request
+    by Scott Otterson.
+
+*** Implement pretty display of entities, sub-, and superscripts.
+    :PROPERTIES:
+    :OrgVersion:  7.01
+    :END:
+
+    The command =C-c C-x \= toggles the display of Org's special entities
+    like =\alpha= as pretty unicode characters.  Also, sub and superscripts
+    are displayed in a pretty way (raised/lower display, in a smaller
+    font).  If you want to exclude sub- and superscripts, see the variable
+    =org-pretty-entities-include-sub-superscripts=.
+
+    Thanks to Eric Schulte and Ulf Stegeman for making this possible.
+
+*** New faces for title, date, author and email address lines
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    The keywords in these lines are now dimmed out, and the title is
+    displayed in a larger font, and a special font is also used for author,
+    date, and email information.  This is implemented by the following new
+    faces:
+
+    =org-document-title=
+    =org-document-info=
+    =org-document-info-keyword=
+
+    In addition, the variable =org-hidden-keywords= can be used to make the
+    corresponding keywords disappear.
+
+    Thanks to Dan Davison for this feature.
+
+*** Simpler way to specify faces for tags and todo keywords
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    The variables =org-todo-keyword-faces=, =org-tag-faces=, and
+    =org-priority-faces= now accept simple color names as specifications.
+    The colors will be used as either foreground or background color for
+    the corresponding keyword.  See also the variable
+    =org-faces-easy-properties=, which governs which face property is
+    affected by this setting.
+
+    This is really a great simplification for setting keyword faces.  The
+    change is based on an idea and patch by Ryan Thompson.
+
+*** <N> in tables now means fixed width, not maximum width
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    Requested by Michael Brand.
+
+*** Better level cycling function
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    =TAB= in an empty headline cycles the level of that headline through
+    likely states.  Ryan Thompson implemented an improved version of this
+    function, which does not depend upon when exactly this command is used.
+    Thanks to Ryan for this improvement.
+
+*** Adaptive filling
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    For paragraph text, =org-adaptive-fill-function= did not handle the
+    base case of regular text which needed to be filled.  This is now
+    fixed.  Among other things, it allows email-style ">" comments to be
+    filled correctly.
+
+    Thanks to Dan Hackney for this patch.
+
+*** `org-reveal' (=C-c C-r=) also decrypts encrypted entries (org-crypt.el)
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    Thanks to Richard Riley for triggering this change.
+
+*** Better automatic letter selection for TODO keywords
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    When all first letters of keywords have been used, Org now assigns more
+    meaningful characters based on the keywords.
+
+    Thanks to Mikael Fornius for this patch.
+
+** Clocking
+
+*** Clock: Allow synchronous update of timestamps in CLOCK log
+    :PROPERTIES:
+    :OrgVersion:  7.7
+    :END:
+
+    Using =S-M-<up/down>= on CLOCK log timestamps will increase/decrease
+    the two timestamps on this line so that duration will keep the same.
+    Note that duration can still be slightly modified in case a timestamp
+    needs some rounding.
+
+    Thanks to Rainer Stengele for this idea.
+
+*** Localized clock tables
+    :PROPERTIES:
+    :OrgVersion:  7.5
+    :END:
+
+    Clock tables now support a new new =:lang= parameter, allowing the user
+    to customize the localization of the table headers.  See the variable
+    =org-clock-clocktable-language-setup= which controls available
+    translated strings.
+
+*** Show clock overruns in mode line
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    When clocking an item with a planned effort, overrunning the planned
+    time is now made visible in the mode line, for example using the new
+    face =org-mode-line-clock-overrun=, or by adding an extra string given
+    by =org-task-overrun-text=.
+
+    Thanks to Richard Riley for a patch to this effect.
+
+*** Clock reports can now include the running, incomplete clock
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    If you have a clock running, and the entry being clocked falls into the
+    scope when creating a clock table, the time so far spent can be added
+    to the total.  This behavior depends on the setting of
+    =org-clock-report-include-clocking-task=.  The default is =nil=.
+
+    Thanks to Bernt Hansen for this useful addition.
+
+** Misc
+
+*** Improvements with inline tasks and indentation
+    :PROPERTIES:
+    :OrgVersion:  7.4
+    :END:
+
+    There is now a configurable way on how to export inline tasks.  See the
+    new variable =org-inlinetask-export-templates=.
+
+    Thanks to Nicolas Goaziou for coding these changes.
+
+*** A property value of "nil" now means to unset a property
+    :PROPERTIES:
+    :OrgVersion:  7.01
+    :END:
+
+    This can be useful in particular with property inheritance, if some
+    upper level has the property, and some grandchild of it would like to
+    have the default settings (i.e. not overruled by a property) back.
+
+    Thanks to Robert Goldman and Bernt Hansen for suggesting this change.
+
+*** New helper functions in org-table.el
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    There are new functions to access and write to a specific table field.
+    This is for hackers, and maybe for the org-babel people.
+
+    #+begin_example
+    org-table-get
+    org-table-put
+    org-table-current-line
+    org-table-goto-line
+    #+end_example
+
+*** Archiving: Allow to reverse order in target node
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    The new option =org-archive-reversed-order= allows to have archived
+    entries inserted in a last-on-top fashion in the target node.
+
+    This was requested by Tom.
+
+*** Org-reveal: Double prefix arg shows the entire subtree of the parent
+    :PROPERTIES:
+    :OrgVersion:  6.35
+    :END:
+
+    This can help to get out of an inconsistent state produced for example
+    by viewing from the agenda.
+
+    This was a request by Matt Lundin.
+
+* License
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/etc/TODO b/etc/TODO
index 6aa74df5a79..2c361ede993 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -1,6 +1,6 @@
 Emacs TODO List                                                   -*-outline-*-
 
-Copyright (C) 2001-2012  Free Software Foundation, Inc.
+Copyright (C) 2001-2012 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -24,7 +24,6 @@ to the FSF.
 ** Improve the "code snippets" support: consolidate skeleton.el, tempo.el,
   and expand.el (any other?) and then advertise/use/improve it.
 ** Improve VC: yes, there's a lot of work to be done there :-(
-  And most of it could/should make it into Emacs-23.3.
 
 ** Random things that cross my mind right now that I'd like to see (some of
 them from my local hacks), but it's not obvious at all whether they'll
@@ -433,18 +432,13 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
 ** Highlight rectangles (`mouse-track-rectangle-p' in XEmacs).  Already in CUA,
   but it's a valuable feature worth making more general.
 
-** Provide MIME support for Rmail using the Gnus MIME library.  [Maybe
-  not now feasible, given Gnus maintenance decisions.  fx looked at
-  this and can say where some of the problems are.]
-
 ** Eliminate the storm of warnings concerning char/unsigned char
   mismatches that we get with GCC 4.x and proprietary compilers on
   various systems.  They make it difficult to spot the important warnings.
 
 ** Fix anything necessary to use `long long' EMACS_INTs with GCC.
 
-** Split out parts of lisp.h [and generate Makefile dependencies automatically.]
-[the last bit is done, see DEPFLAGS etc in src/Makefile.in ]
+** Split out parts of lisp.h.
 
 ** Update the FAQ.
 
diff --git a/etc/forms/README b/etc/forms/README
new file mode 100644
index 00000000000..4d728450ac4
--- /dev/null
+++ b/etc/forms/README
@@ -0,0 +1 @@
+This directory contains some example files for the forms.el library.
diff --git a/etc/forms-d2.dat b/etc/forms/forms-d2.dat
index f6c599c9aa8..f6c599c9aa8 100644
--- a/etc/forms-d2.dat
+++ b/etc/forms/forms-d2.dat
diff --git a/etc/forms/forms-d2.el b/etc/forms/forms-d2.el
new file mode 100644
index 00000000000..9fa2145e4d0
--- /dev/null
+++ b/etc/forms/forms-d2.el
@@ -0,0 +1,103 @@
+;;; forms-d2.el --- demo forms-mode
+
+;; Copyright (C) 1991, 1994-1997, 2001-2012 Free Software Foundation, Inc.
+
+;; Author: Johan Vromans <jvromans@squirrel.nl>
+;; Created: 1989
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This sample forms exploit most of the features of forms mode.
+
+;;; Code:
+
+;; Set the name of the data file.
+(setq forms-file (expand-file-name "forms/forms-d2.dat" data-directory))
+
+;; Use 'forms-enumerate' to set field names and number thereof.
+(setq forms-number-of-fields
+      (forms-enumerate
+       '(arch-newsgroup                 ; 1
+         arch-volume                    ; 2
+         arch-issue                     ; and ...
+         arch-article                   ; ... so
+         arch-shortname                 ; ... ... on
+         arch-parts
+         arch-from
+         arch-longname
+         arch-keywords
+         arch-date
+         arch-remarks)))
+
+;; The following functions are used by this form for layout purposes.
+;;
+(defun arch-tocol (target &optional fill)
+  "Produces a string to skip to column TARGET.  Prepends newline if needed.
+The optional FILL should be a character, used to fill to the column."
+  (if (null fill)
+      (setq fill ?\s))
+  (if (< target (current-column))
+      (concat "\n" (make-string target fill))
+    (make-string (- target (current-column)) fill)))
+;;
+(defun arch-rj (target field &optional fill)
+  "Produces a string to skip to column TARGET minus the width of field FIELD.
+Prepends newline if needed.  The optional FILL should be a character,
+used to fill to the column."
+  (arch-tocol (- target (length (nth field forms-fields))) fill))
+
+;; Record filters.
+;;
+(defun arch-new-record-filter (the-record)
+  "Form a new record with some defaults."
+  (aset the-record arch-from (user-full-name))
+  (aset the-record arch-date (current-time-string))
+  the-record                            ; return it
+)
+(setq forms-new-record-filter 'arch-new-record-filter)
+
+;; The format list.
+(setq forms-format-list
+     (list
+       "====== Public Domain Software Archive ======\n\n"
+       arch-shortname
+       " - "                    arch-longname
+       "\n\n"
+       "Article: "              arch-newsgroup
+       "/"                      arch-article
+       " "
+       '(arch-tocol 40)
+       "Issue: "                arch-issue
+       " "
+       '(arch-rj 73 10)
+       "Date: "                 arch-date
+       "\n\n"
+       "Submitted by: "         arch-from
+       "\n"
+       '(arch-tocol 79 ?-)
+       "\n"
+       "Keywords: "             arch-keywords
+       "\n\n"
+       "Parts: "                arch-parts
+       "\n\n====== Remarks ======\n\n"
+       arch-remarks
+     ))
+
+;; That's all, folks!
+
+;;; forms-d2.el ends here
diff --git a/etc/forms/forms-pass.el b/etc/forms/forms-pass.el
new file mode 100644
index 00000000000..34d4548434b
--- /dev/null
+++ b/etc/forms/forms-pass.el
@@ -0,0 +1,33 @@
+;;; forms-pass.el --- passwd file demo for forms-mode
+
+;; This file is part of GNU Emacs.
+
+;;; Commentary:
+
+;; This demo visits your passwd file.
+
+;;; Code:
+
+;; use yp if present
+(or (file-exists-p (setq forms-file "/var/yp/src/passwd"))
+    (setq forms-file "/etc/passwd"))
+
+(setq forms-read-only t)                ; to make sure
+(setq forms-field-sep ":")
+(setq forms-number-of-fields 7)
+
+(setq forms-format-list
+      (list
+       "====== Visiting " forms-file " ======\n\n"
+       "User : "        1
+       "   Uid: "       3
+       "   Gid: "       4
+       "\n\n"
+       "Name : "        5
+       "\n\n"
+       "Home : "        6
+       "\n\n"
+       "Shell: "        7
+       "\n"))
+
+;;; forms-pass.el ends here
diff --git a/etc/org/OrgOdtStyles.xml b/etc/org/OrgOdtStyles.xml
index 470b7b134a7..84125c96d8a 100644
--- a/etc/org/OrgOdtStyles.xml
+++ b/etc/org/OrgOdtStyles.xml
@@ -649,34 +649,34 @@
   <!-- Description List -->
   <text:list-style style:name="OrgDescriptionList">
    <text:list-level-style-number text:level="1" style:num-format="">
-    <style:list-level-properties text:space-before="0.635cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="0.635cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="2" style:num-format="">
-    <style:list-level-properties text:space-before="1.27cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="1.27cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="3" style:num-format="">
-    <style:list-level-properties text:space-before="1.905cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="1.905cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="4" style:num-format="">
-    <style:list-level-properties text:space-before="2.54cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="2.54cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="5" style:num-format="">
-    <style:list-level-properties text:space-before="3.175cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="3.175cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="6" style:num-format="">
-    <style:list-level-properties text:space-before="3.81cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="3.81cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="7" style:num-format="">
-    <style:list-level-properties text:space-before="4.445cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="4.445cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="8" style:num-format="">
-    <style:list-level-properties text:space-before="5.08cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="5.08cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="9" style:num-format="">
-    <style:list-level-properties text:space-before="5.715cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="5.715cm"/>
    </text:list-level-style-number>
    <text:list-level-style-number text:level="10" style:num-format="">
-    <style:list-level-properties text:space-before="6.35cm" text:min-label-width="0.635cm"/>
+    <style:list-level-properties text:space-before="6.35cm"/>
    </text:list-level-style-number>
   </text:list-style>
 
diff --git a/etc/refcards/README b/etc/refcards/README
index a1fa2f063b5..0372826416e 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -1,8 +1,11 @@
-Some of the *.tex files need special versions of TeX to typeset them.
-The files cs-*.tex and sk-*.tex need csTeX, a special version of TeX
-tailored to typesetting Czech and Slovak documents.  We provide
-generated files for these documents, so that you could print them
-without installing the modified TeX versions.
+To generate these refcards, you need to install the TeX document
+production system.  For example, http://www.tug.org/texlive/ .
+
+All modern GNU/Linux distributions provide TeX packages, so the
+easiest way is just to install those.  Your distribution may have
+split some of the files needed to process non-English output into
+separate, optional packages such as: texlive-lang-cyrillic,
+texlive-lang-czechslovak, texlive-lang-german, and texlive-lang-polish.
 
 
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
@@ -12,5 +15,5 @@ it is reproduced here for convenience.
 
 File: gnus-logo.eps, gnus-logo.pdf
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012 Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/refcards/calccard.pdf b/etc/refcards/calccard.pdf
index 58b203672de..5e97c2a9d92 100644
--- a/etc/refcards/calccard.pdf
+++ b/etc/refcards/calccard.pdf
diff --git a/etc/refcards/cs-dired-ref.pdf b/etc/refcards/cs-dired-ref.pdf
index cf16c1afd10..1b5a8612ed9 100644
--- a/etc/refcards/cs-dired-ref.pdf
+++ b/etc/refcards/cs-dired-ref.pdf
diff --git a/etc/refcards/cs-refcard.pdf b/etc/refcards/cs-refcard.pdf
index 7d0f92fa404..963adcc7bb9 100644
--- a/etc/refcards/cs-refcard.pdf
+++ b/etc/refcards/cs-refcard.pdf
diff --git a/etc/refcards/de-refcard.pdf b/etc/refcards/de-refcard.pdf
index c7a619b0486..bccc60993f6 100644
--- a/etc/refcards/de-refcard.pdf
+++ b/etc/refcards/de-refcard.pdf
diff --git a/etc/refcards/dired-ref.pdf b/etc/refcards/dired-ref.pdf
index 18a02e28ae7..0f579670808 100644
--- a/etc/refcards/dired-ref.pdf
+++ b/etc/refcards/dired-ref.pdf
diff --git a/etc/refcards/fr-dired-ref.pdf b/etc/refcards/fr-dired-ref.pdf
index 1bd84b84e75..32f12ab2088 100644
--- a/etc/refcards/fr-dired-ref.pdf
+++ b/etc/refcards/fr-dired-ref.pdf
diff --git a/etc/refcards/fr-refcard.pdf b/etc/refcards/fr-refcard.pdf
index 91f4fafe2d0..020ffbdeea0 100644
--- a/etc/refcards/fr-refcard.pdf
+++ b/etc/refcards/fr-refcard.pdf
diff --git a/etc/refcards/gnus-booklet.pdf b/etc/refcards/gnus-booklet.pdf
index f39af860394..6c8fa376234 100644
--- a/etc/refcards/gnus-booklet.pdf
+++ b/etc/refcards/gnus-booklet.pdf
diff --git a/etc/refcards/gnus-refcard.pdf b/etc/refcards/gnus-refcard.pdf
index 016f8fd7051..c64ed30f39f 100644
--- a/etc/refcards/gnus-refcard.pdf
+++ b/etc/refcards/gnus-refcard.pdf
diff --git a/etc/refcards/pl-refcard.pdf b/etc/refcards/pl-refcard.pdf
index 47299efa1bf..ddeeca97daa 100644
--- a/etc/refcards/pl-refcard.pdf
+++ b/etc/refcards/pl-refcard.pdf
diff --git a/etc/refcards/pt-br-refcard.pdf b/etc/refcards/pt-br-refcard.pdf
index dff1c3f6c00..dc61712a998 100644
--- a/etc/refcards/pt-br-refcard.pdf
+++ b/etc/refcards/pt-br-refcard.pdf
diff --git a/etc/refcards/refcard.pdf b/etc/refcards/refcard.pdf
index f6c47d8a5f6..f2a720d656b 100644
--- a/etc/refcards/refcard.pdf
+++ b/etc/refcards/refcard.pdf
diff --git a/etc/refcards/ru-refcard.pdf b/etc/refcards/ru-refcard.pdf
index 3bdc7895a9d..2289acff755 100644
--- a/etc/refcards/ru-refcard.pdf
+++ b/etc/refcards/ru-refcard.pdf
diff --git a/etc/refcards/sk-dired-ref.pdf b/etc/refcards/sk-dired-ref.pdf
index e14764bd8f8..2cd9ef12fd9 100644
--- a/etc/refcards/sk-dired-ref.pdf
+++ b/etc/refcards/sk-dired-ref.pdf
diff --git a/etc/refcards/sk-refcard.pdf b/etc/refcards/sk-refcard.pdf
index d0a34927a26..e02c7db3d4c 100644
--- a/etc/refcards/sk-refcard.pdf
+++ b/etc/refcards/sk-refcard.pdf