Merge from trunk.

9 files changed, 858 insertions, 766 deletions

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 79c1cc01eb4..1cf3a523596 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -7,9 +7,9 @@ Aaron Ecay: changed nsterm.m
 
 Aaron Larson: co-wrote bibtex.el
 
-Aaron S. Hawley: changed files.texi morse.el add-log.el autoinsert.el
-  building.texi custom.texi files.el glossary.texi isearch.el
-  jka-cmpr-hook.el misc.texi re-builder.el sgml-mode.el tar-mode.el
+Aaron S. Hawley: changed files.texi morse.el tar-mode.el add-log.el
+  autoinsert.el building.texi custom.texi files.el glossary.texi
+  isearch.el jka-cmpr-hook.el misc.texi re-builder.el sgml-mode.el
   texinfo.el thingatpt.el tutorial.el
 
 Abraham Nahum: changed configure.in dgux4.h sysdep.c
@@ -29,6 +29,8 @@ Adam Sjøgren: changed spam.el blink.xpm braindamaged.xpm cry.xpm dead.xpm
   reverse-smile.xpm sad.xpm smile.xpm wry.xpm xterm.c gnus-html.el
   gnus-start.el gnus-sum.el gnus.el gtkutil.c shr.el xterm.h
 
+Adam Spiers: changed calendar.el
+
 Adam W: changed mail-source.el
 
 Aditya Siram: changed ob.el
@@ -147,7 +149,7 @@ Alp Aker: changed nsfont.m nsterm.h nsterm.m buff-menu.el configure.in
   nsfns.m nsmenu.m
 
 Ami Fischman: changed bindings.el calendar.el diary-lib.el print.c
-  savehist.el
+  savehist.el vc-git.el
 
 Anand Mitra: changed gnus-sum.el
 
@@ -182,11 +184,13 @@ and changed erc.el erc-bbdb.el erc-button.el erc-log.el erc-stamp.el
 Andreas Jaeger: changed gnus-msg.el gnus-start.el gnus-xmas.el
   nnfolder.el nnml.el
 
+Andreas Leha: changed ob.el
+
 Andreas Leue: changed artist.el
 
 Andreas Luik: changed xfns.c xterm.c
 
-Andreas Politz: changed editfns.c elp.el ido.el term.el
+Andreas Politz: changed editfns.c elp.el ido.el outline.el term.el
 
 Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el
 
@@ -245,6 +249,8 @@ and changed erc.el
 
 Angelo Graziosi: changed sysdep.c term.c
 
+Anmol Khirbat: changed ido.el
+
 Anna M. Bigatti: wrote cal-html.el
 
 Antoine Levitt: changed gnus-group.el gnus-sum.el message.texi ada-prj.el
@@ -294,9 +300,9 @@ Bastien Guerry: wrote gnus-bookmark.el org-latex.el
 and co-wrote org-bibtex.el org-list.el org-protocol.el org-src.el
 and changed org.el org-agenda.el org-html.el org-clock.el org-exp.el
   org.texi org-table.el org-capture.el org-publish.el org-timer.el
-  org-export-latex.el org-archive.el ob.el org-ascii.el org-mobile.el
-  bookmark.el info.el org-attach.el org-colview.el org-crypt.el
-  org-eshell.el and 32 other files
+  org-export-latex.el org-archive.el org-ascii.el org-colview.el
+  org-exp-blocks.el org-mobile.el ob.el org-eshell.el bookmark.el info.el
+  org-attach.el and 36 other files
 
 Ben A. Mesander: co-wrote erc-dcc.el
 
@@ -492,9 +498,9 @@ Chong Yidong: wrote compile-tests.el dichromacy-theme.el
   font-parse-tests.el redisplay-testsuite.el tabulated-list.el
 and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed xdisp.c simple.el display.texi files.el frames.texi
-  cus-edit.el files.texi keyboard.c custom.el startup.el package.el
-  text.texi xterm.c emacs.texi faces.el misc.texi subr.el image.c
-  mouse.el custom.texi xfns.c and 841 other files
+  files.texi cus-edit.el keyboard.c custom.el text.texi package.el
+  startup.el faces.el xterm.c emacs.texi misc.texi subr.el image.c
+  mouse.el custom.texi xfns.c and 845 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -583,6 +589,8 @@ Christopher J. White: changed url-http.el
 
 Christopher Oliver: changed mouse.el
 
+Christopher Schmidt: changed ibuffer.el
+
 Christopher Suckling: co-wrote org-mac-message.el
 
 Chuck Blake: changed term.c
@@ -659,7 +667,8 @@ and changed vc.el Makefile.in configure.in vc-hg.el vc-git.el vc-bzr.el
 
 Dan Rosenberg: changed movemail.c
 
-Dani Moncayo: changed buffers.texi lists.texi makefile.w32-in text.texi
+Dani Moncayo: changed buffers.texi lists.texi custom.texi dired.texi
+  makefile.w32-in text.texi
 
 Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el rcirc.el
 
@@ -758,15 +767,15 @@ David Casperson: changed font-core.el menu-bar.el tex-mode.el
 David De La Harpe Golden: changed files.el mouse.el simple.el fileio.c
   cus-start.el nsselect.m select.el w32-fns.el x-win.el xterm.c
 
-David Edmondson: changed message.el gnus-cite.el imap.el mm-view.el
-  mml2015.el nnfolder.el nnimap.el nnml.el
+David Edmondson: changed message.el gnus-cite.el imap.el mm-uu.el
+  mm-view.el mml2015.el nnfolder.el nnimap.el nnml.el
 
 David Engster: wrote mairix.el nnmairix.el
-and changed gnus.texi insert.el registry.el gnus-msg.el
+and changed gnus.texi insert.el registry.el db-find.el gnus-msg.el
   analyze/complete.el base.el bovine-grammar.el cedet/srecode.el
-  cpp-root.el db-find.el db-typecache.el db.el dictionary.el display.texi
+  cpp-root.el db-typecache.el db.el dictionary.el display.texi
   document.el ede-grammar.el ede/custom.el ede/generic.el files.el
-  filters.el gnus-registry.el and 22 other files
+  filters.el gnus-registry.el and 23 other files
 
 David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el
   calc-comb.el calc-cplx.el calc-embed.el calc-ext.el calc-fin.el
@@ -824,11 +833,11 @@ David M. Smith: wrote ielm.el
 and changed imenu.el pgg-def.el xterm.c
 
 David Maus: co-wrote org-wl.el
-and changed org.el org-agenda.el org-feed.el org-html.el org-macs.el
-  org-exp.el org.texi org-gnus.el org-capture.el org-protocol.el
-  org-publish.el ob-haskell.el ob.el org-bibtex.el org-clock.el
-  org-compat.el org-footnote.el org-id.el org-latex.el org-list.el
-  org-mhe.el and 18 other files
+and changed org.el org-agenda.el org-feed.el org-exp.el org-html.el
+  org-macs.el org-capture.el org.texi org-gnus.el org-bbdb.el
+  org-clock.el org-protocol.el org-publish.el ob-haskell.el ob.el
+  org-bibtex.el org-compat.el org-footnote.el org-id.el org-latex.el
+  org-list.el and 20 other files
 
 David McCabe: changed lisp-mode.el
 
@@ -912,7 +921,7 @@ Derek Upham: changed nxml-mode.el
 
 Detlev Zundel: wrote re-builder.el
 
-Devon Sean McCullough: changed comint.el
+Devon Sean McCullough: changed comint.el url-http.el
 
 Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c
   sound.c w32proc.c
@@ -952,7 +961,7 @@ Dmitry Bolshakov: changed hideshow.el
 Dmitry Dzhus: changed gdb-mi.el gud.el fadr.el all.xpm building.texi
   emacs.texi process.c thread.xpm
 
-Dmitry Gutov: changed lisp.el
+Dmitry Gutov: changed lisp.el ruby-mode.el
 
 Dmitry Kurochkin: changed isearch.el
 
@@ -972,10 +981,10 @@ Drake Wilson: changed emacsclient.c files.el misc.texi
 
 Drew Adams: wrote light-blue-theme.el
 and co-wrote color.el
-and changed cus-edit.el dired.el faces.el files.el isearch.el menu-bar.el
-  mouse.el ange-ftp.el bindings.el bookmark.el custom.el descr-text.el
-  dired.texi etags.el finder.el frame.el help-fns.el help.el
-  image-dired.el info.el modes.texi and 7 other files
+and changed cus-edit.el dired.el faces.el files.el info.el isearch.el
+  menu-bar.el mouse.el ange-ftp.el bindings.el bookmark.el custom.el
+  descr-text.el dired.texi etags.el finder.el frame.el help-fns.el
+  help.el image-dired.el modes.texi and 7 other files
 
 E. Jay Berkenbilt: changed b2m.c flyspell.el ispell.el unrmail.el
   whitespace.el window.h
@@ -1020,10 +1029,10 @@ Eli Tziperman: wrote rmail-spam-filter.el
 
 Eli Zaretskii: wrote [bidirectional display in xdisp.c] bidi.c rxvt.el
   tty-colors.el
-and changed makefile.w32-in msdos.c xdisp.c Makefile.in files.el
+and changed makefile.w32-in xdisp.c msdos.c Makefile.in files.el
   config.bat fileio.c simple.el msdos.h info.el mainmake.v2 rmail.el
   sed1v2.inp display.texi w32.c pc-win.el process.c dispnew.c startup.el
-  dispextern.h dired.c and 700 other files
+  dispextern.h dired.c and 702 other files
 
 Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el
   gnus.el
@@ -1125,11 +1134,11 @@ Eric Schulte: wrote ob-C.el ob-asymptote.el ob-awk.el ob-calc.el
 and co-wrote ob-R.el ob-clojure.el ob-exp.el ob-fortran.el ob-lisp.el
   ob-lob.el ob-maxima.el ob-perl.el ob-picolisp.el ob-python.el ob-ref.el
   ob.el org-bibtex.el
-and changed org.texi org.el org-exp.el org-latex.el ob-plantuml.el
-  org-table.el org-macs.el org-src.el orgcard.tex ob-lilypond.el
-  ob-mscgen.el ob-octave.el ob-screen.el org-agenda.el org-ascii.el
-  org-html.el org-mouse.el gnus-art.el ob-ledger.el ob-matlab.el
-  org-attach.el and 4 other files
+and changed org.texi org.el org-exp.el org-latex.el org-src.el
+  ob-plantuml.el org-table.el org-agenda.el org-macs.el orgcard.tex
+  ob-lilypond.el ob-mscgen.el ob-octave.el ob-screen.el org-ascii.el
+  org-footnote.el org-html.el org-mouse.el gnus-art.el ob-ledger.el
+  ob-matlab.el and 5 other files
 
 Eric Youngdale: changed etags-vmslib.c
 
@@ -1169,7 +1178,7 @@ Fabian Ezequiel Gallina: changed progmodes/python.el
 Fabrice Bauzac: changed dired-aux.el
 
 Fabrice Popineau: changed config.nt etags.c fileio.c gnus-cache.el
-  inttypes.h lisp.h ms-w32.h nmake.defs regex.c stdint.h w32.c
+  inttypes.h lisp.h ms-w32.h nmake.defs regex.c stdint.h w32.c w32heap.c
 
 Fan Kai: changed esh-arg.el
 
@@ -1233,7 +1242,7 @@ Frank Weinberg: changed gnus-art.el
 
 François Pinard: co-wrote po.el
 and changed nndoc.el allout.el bytecomp.el gnus-sum.el gnus-util.el
-  gnus-uu.el make-mode.el nnmail.el rmailsum.el timezone.el
+  gnus-uu.el make-mode.el nnmail.el org.el rmailsum.el timezone.el
 
 François-David Collin: changed message.el mm-decode.el
 
@@ -1327,8 +1336,8 @@ Giuseppe Scrivano: changed browse-url.el buffer.c configure.in sysdep.c
 Glenn Morris: wrote automated/f90.el automated/vc-bzr.el check-declare.el
 and changed Makefile.in configure.in calendar.el diary-lib.el rmail.el
   progmodes/f90.el files.el cal-menu.el appt.el cal-hebrew.el fortran.el
-  bytecomp.el holidays.el calendar.texi emacs.texi make-dist simple.el
-  ack.texi sed1v2.inp cal-islam.el dired-x.el and 1242 other files
+  bytecomp.el holidays.el emacs.texi calendar.texi ack.texi make-dist
+  simple.el sed1v2.inp cal-islam.el dired-x.el and 1249 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1461,6 +1470,9 @@ Ilja Weis: co-wrote gnus-topic.el
 
 Ilya N. Golubev: changed mm-util.el shell.el
 
+Ilya Shlyakhter: changed org.el ob-lilypond.el org-clock.el
+  org-colview.el
+
 Ilya Zakharevich: wrote tmm.el
 and co-wrote cperl-mode.el
 and changed syntax.c syntax.h textprop.c dired.c font-lock.el interval.c
@@ -1518,12 +1530,14 @@ Jacob Morzinski: changed mh-comp.el
 
 Jacques Duthen: co-wrote ps-print.el ps-samp.el
 
+Jae-Hyeon Park: changed fontset.el
+
 Jaeyoun Chung: changed hangul3.el hanja3.el gnus-mule.el hangul.el
 
 Jambunathan K: wrote org-lparse.el org-odt.el
-and changed org.el org-exp.el org-inlinetask.el org.texi
-  OrgOdtContentTemplate.xml OrgOdtStyles.xml org-footnote.el org-html.el
-  package-x.el quail/indian.el tar-mode.el
+and changed org.el org-exp.el org.texi OrgOdtContentTemplate.xml
+  org-footnote.el org-inlinetask.el OrgOdtStyles.xml htmlfontify.el
+  org-html.el package-x.el quail/indian.el tar-mode.el
 
 James Clark: wrote nxml-enc.el nxml-glyph.el nxml-maint.el nxml-mode.el
   nxml-ns.el nxml-outln.el nxml-parse.el nxml-rap.el nxml-uchnm.el
@@ -1809,6 +1823,8 @@ and changed org-clock.el org-agenda.el erc-chess.el org.el erc.el
 
 John Williams: changed etags.el
 
+John Yates: changed hideshow.el
+
 Jon Anders Skorpen: changed org-publish.el
 
 Jon Ericson: changed gnus.el spam-report.el
@@ -1972,7 +1988,7 @@ Karl Fogel: wrote bookmark.el mail-hist.el saveplace.el
 and changed files.el doc-view.el image-mode.el info.el simple.el INSTALL
   autogen.sh isearch.el menu-bar.el thingatpt.el INSTALL.BZR configure
   configure.in editfns.c gnus-bookmark.el gnus-msg.el gnus-sum.el man.el
-  nnmail.el vc-svn.el window.c and 3 other files
+  nnmail.el org-agenda.el vc-svn.el and 4 other files
 
 Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
   alloc.c files.el frame.c window.c configure.in Makefile.in data.c
@@ -1998,6 +2014,8 @@ and changed gnus-art.el gnus-sum.el message.el gnus.texi mm-decode.el
   gnus-start.el gnus-msg.el gnus.el shr.el nntp.el gnus-agent.el nnrss.el
   mm-uu.el nnmail.el gnus-html.el and 135 other files
 
+Kaushik Srenevasan: changed gdb-mi.el
+
 Kaveh R. Ghazi: changed delta88k.h xterm.c
 
 Kayvan Sylvan: changed supercite.el
@@ -2215,10 +2233,10 @@ and changed nxml-mode.el tutorial.el window.el ada-xref.el buff-menu.el
 
 Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c
 
-Leo Liu: changed rcirc.el ido.el makefile.w32-in abbrev.el subr.el
+Leo Liu: changed rcirc.el ido.el abbrev.el makefile.w32-in subr.el
   Makefile.in deps.mk diff-mode.el dnd.el em-hist.el erc.el files.el
-  fns.c footnote.el gl-comp.m4 gnulib.mk help-mode.el iswitchb.el
-  minibuf.c minibuffer.el register.el and 57 other files
+  fns.c font-lock.el footnote.el gl-comp.m4 gnulib.mk help-mode.el
+  iswitchb.el minibuf.c minibuffer.el and 62 other files
 
 Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el
   rmailout.el sendmail.el
@@ -2229,6 +2247,8 @@ Lewis Perin: changed emacs.manifest
 
 Liam Healy: changed outline.el
 
+Liang Wang: changed etags.el
+
 Litvinov Sergey: changed ob-maxima.el ob-octave.el
 
 Lloyd Zusman: changed mml.el pgg-gpg.el
@@ -2412,7 +2432,7 @@ Martin Pohlack: changed iimage.el pc-select.el
 Martin Rudalics: changed window.el window.c windows.texi frame.c buffer.c
   help.el window.h cus-start.el frame.el cus-edit.el files.el
   buffers.texi dired.el subr.el add-log.el xdisp.c font-lock.el
-  help-fns.el lisp.h mouse.el wid-edit.el and 136 other files
+  help-fns.el lisp.h mouse.el wid-edit.el and 137 other files
 
 Martin Stjernholm: wrote cc-bytecomp.el
 and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el
@@ -2427,6 +2447,7 @@ Martin Svenson: changed progmodes/python.el
 Martin Thornquist: changed gnus-group.el gnus-topic.el
 
 Martyn Jago: wrote ob-lilypond.el
+and changed ob-emacs-lisp.el
 
 Masahiko Sato: wrote vip.el
 
@@ -2494,15 +2515,15 @@ Michael Albinus: wrote dbus.el secrets.el tramp-cmds.el tramp-compat.el
   zeroconf.el
 and co-wrote tramp-cache.el tramp-sh.el tramp.el
 and changed tramp.texi dbusbind.c trampver.texi dbus.texi trampver.el
-  ange-ftp.el tramp-fish.el files.el tramp-imap.el files.texi Makefile.in
-  tramp-vc.el tramp-util.el tramp-uu.el simple.el auth-source.el
-  dired-aux.el configure.in em-unix.el fileio.c keyboard.c
-  and 65 other files
+  ange-ftp.el tramp-fish.el files.el files.texi tramp-imap.el Makefile.in
+  tramp-vc.el tramp-util.el tramp-uu.el notifications.el simple.el
+  auth-source.el dired-aux.el configure.in em-unix.el fileio.c
+  and 66 other files
 
 Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
   unexec.c
 
-Michael Brand: changed org.el org-agenda.el org-table.el org.texi
+Michael Brand: changed org.el org-agenda.el org.texi org-table.el
 
 Michael D. Ernst: wrote reposition.el
 and changed dired-x.el uniquify.el ispell.el bibtex.el rmail.el dired.el
@@ -2725,8 +2746,8 @@ Nicolas Avrutin: changed url-http.el
 Nicolas Goaziou: changed org-list.el org.el org-footnote.el org-exp.el
   org-latex.el org-html.el org-inlinetask.el org-indent.el org-docbook.el
   org-timer.el ob-asymptote.el org-ascii.el org-capture.el ob.el
-  org-agenda.el org-archive.el org-clock.el org-macs.el org-mouse.el
-  ob-exp.el org-colview.el org-table.el
+  org-agenda.el org-archive.el ob-exp.el org-clock.el org-macs.el
+  org-mouse.el org.texi and 3 other files
 
 Niels Giesen: changed icalendar.el org-agenda.el org-clock.el
   org-docbook.el org-icalendar.el
@@ -2832,7 +2853,7 @@ Paul Eggert: wrote rcs2log vcdiff
 and co-wrote cal-dst.el
 and changed lisp.h Makefile.in editfns.c alloc.c xdisp.c configure.in
   fileio.c image.c process.c fns.c xterm.c dispextern.h keyboard.c data.c
-  lread.c sysdep.c xfns.c eval.c emacs.c config.in print.c
+  lread.c sysdep.c xfns.c eval.c emacs.c buffer.c config.in
   and 573 other files
 
 Paul Fisher: changed fns.c
@@ -2873,6 +2894,8 @@ Pavel Janík: changed keyboard.c xterm.c COPYING xdisp.c Makefile.in
 Pavel Kobiakov: wrote flymake.el
 and changed flymake.texi
 
+Peder O. Klingenberg: changed gnus.texi
+
 Per Abrahamsen: wrote cus-dep.el cus-edit.el cus-face.el cus-start.el
   custom.el double.el gnus-cite.el gnus-cus.el progmodes/cpp.el
   wid-browse.el wid-edit.el widget.el xt-mouse.el
@@ -3089,7 +3112,7 @@ and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-langs.el
   cc-menus.el cc-mode.el cc-styles.el cc-vars.el font-lock.el
 and changed files.el keyboard.c simple.el xterm.c xdisp.c rmail.el
   Makefile.in fileio.c process.c sysdep.c buffer.c xfns.c window.c
-  configure.in subr.el startup.el emacs.c sendmail.el editfns.c info.el
+  configure.in subr.el startup.el sendmail.el emacs.c editfns.c info.el
   dispnew.c and 1350 other files
 
 Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el rfc822.el
@@ -3225,9 +3248,10 @@ Sam Kendall: changed etags.c etags.el
 
 Sam Steingold: wrote gulp.el midnight.el
 and changed progmodes/compile.el cl-indent.el vc-cvs.el vc.el mouse.el
-  simple.el font-lock.el ange-ftp.el vc-hg.el add-log.el bookmark.el
-  bug-reference.el diary-lib.el dired.el pcvs.el tex-mode.el apropos.el
-  bindings.el emacs-lisp/debug.el etags.el files.el and 126 other files
+  simple.el font-lock.el ange-ftp.el vc-hg.el window.el add-log.el
+  bookmark.el bug-reference.el diary-lib.el dired.el etags.el pcvs.el
+  tex-mode.el apropos.el bindings.el emacs-lisp/debug.el
+  and 126 other files
 
 Samuel Bronson: changed custom.el
 
@@ -3313,7 +3337,7 @@ Sergio Pokrovskij: changed TUTORIAL.eo
 
 Seweryn Kokot: changed positions.texi searching.texi
 
-Shaun Johnson: changed ob-tangle.el
+Shaun Johnson: changed ob-tangle.el org-exp-blocks.el
 
 Shawn Boles: changed url-cookie.el
 
@@ -3336,6 +3360,8 @@ Shinichirou Sugou: changed etags.c
 
 Sho Nakatani: changed doc-view.el
 
+Shoji Nishimura: changed org.el
+
 Shuhei Kobayashi: wrote hex-util.el hmac-def.el hmac-md5.el
 and changed gnus-group.el message.el nnmail.el
 
@@ -3358,7 +3384,7 @@ and changed message.el gnus-sum.el gnus-art.el smtpmail.el pgg-gpg.el
   hashcash.el mm-view.el password.el gnus-cache.el and 99 other files
 
 Simon Leinen: changed Makefile.in smtpmail.el Makefile cm.c cm.h hpux9.h
-  indent.c process.c sc.texinfo sgml-mode.el term.c xfns.c xmenu.c
+  indent.c process.c sc.texinfo sgml-mode.el term.c vc.el xfns.c xmenu.c
   xterm.c
 
 Simon Marshall: wrote fast-lock.el lazy-lock.el regexp-opt.el
@@ -3500,7 +3526,7 @@ Sun Yijiang: changed TUTORIAL.cn
 
 Sundar Narasimhan: changed rnews.el
 
-Suvayu Ali: changed org-exp.el org-inlinetask.el org.texi
+Suvayu Ali: changed org.texi org-exp.el org-inlinetask.el org-src.el
 
 Sven Joachim: changed files.el de-refcard.tex dired-aux.el emacs.1
   arc-mode.el dired-x.el em-cmpl.el em-hist.el em-ls.el esh-cmd.el
@@ -3513,7 +3539,7 @@ Syver Enstad: changed gud.el
 
 Sébastien Delafond: changed org.el
 
-Sébastien Vauban: changed org-agenda.el org.el org-html.el org-latex.el
+Sébastien Vauban: changed org.el org-agenda.el org-html.el org-latex.el
 
 T.V. Raman: changed completion.el files.el json.el mairix.el mspools.el
   xml.c
@@ -3545,9 +3571,9 @@ Tassilo Horn: wrote doc-view.el
 and co-wrote org-gnus.el
 and changed subword.el image-mode.el Makefile.in cc-cmds.el emacsbug.el
   gnus-art.el gnus.texi nnimap.el files.el gnus-sum.el info.el
-  org-footnote.el org.el reftex-ref.el simple.el tsdh-dark-theme.el
-  tsdh-light-theme.el ack.texi bindings.el bookmark.el cc-mode.el
-  and 24 other files
+  org-footnote.el org.el reftex-ref.el saveplace.el simple.el
+  tsdh-dark-theme.el tsdh-light-theme.el ack.texi artist.el bindings.el
+  and 26 other files
 
 Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el
 
@@ -3581,17 +3607,17 @@ Thamer Mahmoud: changed arabic.el
 Theodore Jump: changed makefile.nt makefile.def w32-win.el w32faces.c
 
 Thien-Thi Nguyen: co-wrote hideshow.el
-and changed ewoc.el vc.el zone.el info.el Makefile.in processes.texi
+and changed ewoc.el vc.el info.el zone.el Makefile.in processes.texi
   lisp-mode.el text.texi vc-rcs.el display.texi fileio.c files.el
   scheme.el vc-git.el MORE.STUFF TUTORIAL.it bindat.el cc-vars.el
   configure.in dcl-mode.el diff-mode.el and 158 other files
 
 Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
 
-Thierry Volpiatto: changed bookmark.el eshell/eshell.el files.el
-  gnus-sum.el dired-aux.el image-mode.el info.el man.el woman.el dired.el
-  doc-view.el files.texi find-func.el gnus-art.el image-dired.el
-  vc-rcs.el
+Thierry Volpiatto: changed bookmark.el files.el dired-aux.el
+  eshell/eshell.el gnus-sum.el files.texi image-mode.el info.el man.el
+  woman.el dired.el doc-view.el find-func.el gnus-art.el gnus-msg.el
+  image-dired.el tramp.el vc-rcs.el
 
 Thomas Baumann: wrote org-mhe.el
 and co-wrote org-bbdb.el
@@ -3611,7 +3637,7 @@ Thomas Hühn: changed tutorial.el
 
 Thomas Link: wrote filesets.el
 
-Thomas Morgan: changed forms.el select.el
+Thomas Morgan: changed org-habit.el forms.el select.el
 
 Thomas Neumann: co-wrote make-mode.el
 and changed makefile.el
@@ -3639,7 +3665,7 @@ Tim Cross: changed keymaps.texi
 
 Tim Harper: changed ns-win.el
 
-Tim Landscheidt: changed gnus.texi
+Tim Landscheidt: changed gnus.texi icalendar.el sort.el ws-mode.el
 
 Tim Van Holder: changed emacsclient.c Makefile.in configure.in
   progmodes/compile.el which-func.el
@@ -3657,6 +3683,8 @@ Toby Allsopp: changed ldap.el eudc.el
 
 Toby Cubitt: co-wrote avl-tree.el
 
+Toby S. Cubitt: changed org.el
+
 Toby Speight: changed generic-x.el window.el
 
 Tokuya Kameshima: wrote org-mew.el
@@ -3697,6 +3725,8 @@ Torbjörn Axelsson: changed options.el
 Torbjörn Einarsson: wrote progmodes/f90.el
 and changed f90.el
 
+Torsten Anders: changed org-beamer.el
+
 Torsten Bronger: changed latin-ltx.el
 
 Toru Tomabechi: wrote language/tibetan.el quail/tibetan.el tibet-util.el
@@ -3714,6 +3744,8 @@ Trey Jackson: changed spam-stat.el
 
 Triet Hoai Lai: changed vntelex.el viet-util.el vietnamese.el
 
+Troels Nielsen: changed process.c
+
 Trung Tran-Duc: changed nntp.el
 
 Tsuchiya Masatoshi: changed gnus-art.el mm-view.el gnus-sum.el
@@ -3773,6 +3805,8 @@ Victor Zandy: wrote zone.el
 
 Vida Gábor: changed gnus-demon.el
 
+Viktor Rosenfeld: changed ob-sql.el
+
 Ville Skyttä: changed mh-comp.el pgg.el tcl.el
 
 Vincent Belaïche: changed ses.el 5x5.el calc-alg.el calc-vec.el calc.texi
@@ -3790,6 +3824,8 @@ and changed ps-prin1.ps ps-bdf.el ps-prin0.ps blank-mode.el ps-prin3.ps
   easymenu.el loading.texi menu-bar.el misc.texi progmodes/compile.el
   ps-print-def.el ps-print.ps ps-vars.el
 
+Vitalie Spinu: changed ob-R.el
+
 Vivek Dasmohapatra: wrote hfy-cmap.el htmlfontify.el
 and changed erc.el erc-backend.el emacs.c erc-join.el erc-services.el
   sh-script.el xterm.c xterm.h
@@ -3935,6 +3971,8 @@ Zoltan Kemenczy: changed gud.el
 
 Zoran Milojevic: changed avoid.el
 
+Йордан Миладинов: changed quail/cyrillic.el
+
 Local Variables:
 coding: utf-8
 End:
diff --git a/etc/ChangeLog b/etc/ChangeLog
index da9b8c180c4..adc4c941212 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,20 @@
+2012-04-02  Alan Mackenzie  <acm@muc.de>
+
+        * NEWS: Add CC Mode entries.
+
+2012-04-01  Jambunathan K  <kjambunathan@gmail.com>
+
+        * org/OrgOdtContentTemplate.xml (OrgIndentedSection-Level-*):
+        New section styles. These sections are indented to the same
+        level as the corresponding list entries.  These sections hold
+        tables that occur within a list.  (OrgTable): Increased
+        relative width from 90% to 96% for aesthetic reasons.
+
+2012-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * HELLO: Say that this is not a comprehensive list.
+        Remove "duplicate" entry.  (Bug#11024)
+
 2012-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
         * emacs-buffer.gdb ($valmask): Don't assume EMACS_INT fits in 'long'.
diff --git a/etc/HELLO b/etc/HELLO
index d95f010aa6e..d6857235f68 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -1,4 +1,6 @@
 This is a list of ways to say hello in various languages.
+It is not intended to be comprehensive, but to demonstrate
+some of the character sets that Emacs supports.
 
 Non-ASCII examples:
   Europe: ,A!(BHola!, Gr,A|_(B Gott, Hyv,Add(B p,Ad(Biv,Add(B, Tere ,Au(Bhtust, Bon,Cu(Bu
@@ -46,7 +48,6 @@ Lao ((1>RJRERG(B)	(1JP:R-4U(B / (1"mcKib*!4U(B
 Malayalam ($,1@N@R@O@^@S@"(B) $,1@H@N@X@m@5@^@P@"(B
 Maltese (il-Malti)      Bon,Cu(Bu / Sa,C11(Ba
 Mathematics     $,1x (B p $,1x((B world $,1s"(B hello p  $,2!a(B
-Nederlands, Vlaams      Hallo / Dag
 Norwegian (norsk)       Hei / God dag
 Oriya ($,1:s;\;?:f(B) $,1;6;A;#;?;,;G(B
 Polish  (j,Bj(Bzyk polski)    Dzie,Bq(B dobry! / Cze,B6f(B!
@@ -55,7 +56,7 @@ Sinhala ($,1B#B2ABB$A}(B)	$,1AFAzB4AvB=B AqB*(B
 Slovak (sloven,Bh(Bina)       Dobr,A}(B de,Br(B
 Slovenian (sloven,B9h(Bina)   Pozdravljeni!
 Spanish (espa,Aq(Bol) ,A!(BHola!
-Swedish (p,Ae(B svenska)      Hej / Goddag / Hall,Ae(B
+Swedish (svenska)       Hej / Goddag / Hall,Ae(B
 Tamil ($,1<D<N<_<T<m(B)       $,1<U<C<5<m<5<N<m(B
 Telugu ($,1=d>&=r>!=W>!(B)    $,1=h=n=x>-=U=~=p=B(B
 Thai (,T@RIRd7B(B)    ,TJGQJ4U$CQ:(B / ,TJGQJ4U$hP(B
diff --git a/etc/NEWS b/etc/NEWS
index 0180ff55dba..a1ef62c0bd6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2010-2012  Free Software Foundation, Inc.
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -14,422 +14,357 @@ and NEWS.1-17 for changes in older Emacs versions.
 You can narrow news to a specific version by calling `view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.
 
-
 Temporary note:
- +++ indicates that the appropriate manual has already been updated.
- --- means no change in the manuals is called for.
++++ indicates that the appropriate manual has already been updated.
+--- means no change in the manuals is called for.
 When you add a new item, please add it without either +++ or ---
 so we will look at it and add it to the manual.
 
 
+* Installation Changes in Emacs 24.2
+
+* Startup Changes in Emacs 24.2
+
+** Emacs no longer searches for `leim-list.el' files beneath the standard
+lisp/ directory.  There should not be any there anyway.  If you have
+been adding them there, put them somewhere else, eg site-lisp.
+
+
+* Changes in Emacs 24.2
+
+** If your Emacs was built from a bzr checkout, the new variable
+`emacs-bzr-version' contains information about which bzr revision was used.
+
+
+* Editing Changes in Emacs 24.2
+
+* Changes in Specialized Modes and Packages in Emacs 24.2
+
+* New Modes and Packages in Emacs 24.2
+
+* Incompatible Lisp Changes in Emacs 24.2
+
++++
+** Docstrings starting with `*' no longer indicate user options.
+Only variables defined using `defcustom' are considered user options.
+The function `user-variable-p' is now an obsolete alias for
+`custom-variable-p'.
+
+
+* Lisp changes in Emacs 24.2
+
+* Changes in Emacs 24.2 on non-free operating systems
+
+** New configure.bat options on MS-Windows:
+
+*** --without-libxml2 omits support for libxml2, even if its presence
+is detected.
+
+
 * Installation Changes in Emacs 24.1
 
----
 ** Emacs can be compiled with Gtk+ 3.0 if you pass --with-x-toolkit=gtk3
 to configure.  Note that other libraries used by Emacs, RSVG and GConf,
 also depend on Gtk+.  You can disable them with --without-rsvg and
 --without-gconf.
 
----
 ** Emacs can be compiled with GnuTLS support.
 This happens by default if a suitably recent version of the library is
 found at build time.  To prevent this, use the configure option
 `--without-gnutls'.  See below for GnuTLS features.
 
----
 ** Emacs can be compiled with SELinux support.
 This happens by default if a suitably recent version of the library is
 found at build time.  To prevent this, use the configure option
 `--without-selinux'.  See below for SELinux features.
 
----
 ** Emacs can be compiled with ImageMagick support.
 This happens by default if a suitably recent version of the library is
 found at build time.  To prevent this, use the configure option
 `--without-imagemagick'.  See below for ImageMagick features.
 This feature is not available for the Nextstep or MS ports.
 
----
 ** Emacs can be compiled with libxml2 support.
 This happens by default if a suitably recent version of the library is
 found at build time.  To prevent this, use the configure option
 `--without-xml2'.  See below for libxml2 features.
 
----
-** There is a new configure option --with-wide-int.
+** By default, the installed Info and man pages are compressed.
+You can disable this by configuring --without-compress-info.
+
+** New configure option --with-wide-int.
 With it, Emacs integers typically have 62 bits, even on 32-bit machines.
 On 32-bit hosts, this raises the limit on buffer sizes from about 512 MiB
 to about 2 GiB.
 
----
-** By default, the installed Info and man pages are compressed.
-You can disable this by configuring --without-compress-info.
-
----
-** There are new configure options:
---with-mmdf, --with-mail-unlink, --with-mailhost.
+** New configure options: --with-mmdf, --with-mail-unlink, --with-mailhost.
 These provide no new functionality, they just remove the need to edit
 lib-src/Makefile by hand in order to use the associated features.
 
----
-** There is a new configure option --enable-use-lisp-union-type.
+** New configure option --enable-use-lisp-union-type.
 This is only useful for Emacs developers to debug certain types of bugs.
 This is not a new feature; only the configure flag is new.
 
----
 ** The standalone programs digest-doc and sorted-doc are removed.
 Emacs now uses Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 
----
 ** The standalone program `fakemail' is removed.
 If you need it, feedmail.el provides a superset of the functionality.
 
 
 * Startup Changes in Emacs 24.1
 
----
 ** The --unibyte, --multibyte, --no-multibyte, and --no-unibyte
 command line arguments, and the EMACS_UNIBYTE environment variable, no
 longer have any effect.  (They were declared obsolete in Emacs 23.)
 
-+++
 ** New command line option `--no-site-lisp' removes site-lisp directories
 from load-path.  -Q now implies this.  This option does not affect the
 EMACSLOADPATH environment variable (and hence has no effect for
-Nextstep builds.)
+Nextstep builds).
 
 
 * Changes in Emacs 24.1
 
-+++
-** auto-mode-case-fold is now enabled by default.
-
 ** Completion
 
-*** shell-mode uses pcomplete rules, with the standard completion UI.
-+++
-*** Many packages have been changed to use `completion-at-point'
-rather than their own completion code.
-+++
+*** Many packages now use the `completion-at-point' command,
+rather than implementing separate completion commands.
+
 *** `completion-at-point' now handles tags and semantic completion.
----
+
 *** Completion in a non-minibuffer now tries to detect the end of completion
 and pops down the *Completions* buffer accordingly.
-+++
-*** Completion can cycle, depending on completion-cycle-threshold.
-+++
-*** New completion style `substring'.
-+++
-*** Completion style can be set per-category `completion-category-overrides'.
-+++
-*** Completion of buffers now uses substring completion by default.
 
-** Mail changes
+*** New option `completion-cycle-threshold' allows completion cycling.
 
-+++
-*** The default of `send-mail-function' is now `sendmail-query-once',
-which asks the user (once) whether to use the smtpmail package to send
-email, or to use the old defaults that rely on external mail
-facilities (`sendmail-send-it' on GNU/Linux and other Unix-like
-systems, and `mailclient-send-it' on Windows).
-
----
-*** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and
-passes it to the mail user agent function.  This argument specifies an
-action for returning to the caller after finishing with the mail.
-For example, this is used by Rmail to optionally delete a mail window.
+*** New option `completion-category-overrides' for overriding the
+default completion style in certain circumstances.
 
-*** smtpmail
-
-+++
-**** smtpmail now uses encrypted connections (via STARTTLS) by default
-if the mail server supports them.  This uses either built-in GnuTLS
-support, or the starttls.el library.  Customize `smtpmail-stream-type'
-to change this.
+*** New completion style `substring'.
 
-+++
-**** The variable `smtpmail-auth-credentials' has been removed.
-By default, the information is now stored in the file ~/.authinfo.
-This was the default value of smtpmail-auth-credentials.
-If you had customized smtpmail-auth-credentials to a list of user
-names and passwords, those settings will not be used.  Your first
-connection to the smtp server will prompt for the user name and password,
-and then offer to save them to the ~/.authinfo file.  Or you can
-manually copy the credentials to your ~/.authinfo files.  For example,
-if you had
+*** Completion of buffer names uses `substring' completion by default.
 
-  (setq smtpmail-auth-credentials
-        '(("mail.example.org" 25 "jim" "s!cret")))
+*** The option `widget-complete-field' has been removed.
 
-then the equivalent line in ~/.authinfo would be
+** Mail changes
 
-  machine mail.example.org port 25 login jim password s!cret
+*** The first time you try sending mail, Emacs asks for a mail method.
+This is implemented by a new default for `send-mail-function', which
+is `sendmail-query-once'.  This offers to use the smtpmail package, or
+to use the old defaults relying on external mail facilities
+(`sendmail-send-it' on GNU/Linux and other Unix-like systems, and
+`mailclient-send-it' on Windows).
 
-See the auth-source manual for more information, e.g. on encrypting
-the credentials file.
+*** Typing C-c m in the buffer made by M-x report-emacs-bug transfers
+the report to your desktop's preferred mail client, if there is one.
+This uses either the "xdg-email" utility, or Mac OS's "open" command.
 
-+++
-**** The variable `smtpmail-starttls-credentials' has been removed.
+*** See Changes in Specialized Modes and Packages for SMTPmail changes
+and Mail mode changes
 
-If you had that set, then you need to put
+** Emacs server and client changes
 
-  machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert"
+*** New option `server-port' specifies the port for TCP Emacs servers.
 
-in your ~/.authinfo file instead.
+*** New emacsclient argument -q/--quiet suppresses some status messages.
 
-*** Mail mode changes (this is the old Mail mode, not Message mode)
-+++
-**** New command `mail-add-attachment' for adding MIME attachments
----
-**** The command `mail-attach-file' was renamed to `mail-insert-file'.
-The old name is now an obsolete alias to the new name.
+*** New emacsclient argument --frame-parameters specifies the frame
+parameters of any newly-created graphical frame.
 
-+++
-*** You can type C-c m from M-x report-emacs-bug if you prefer, and if
-your system supports it, to transfer your report to your desktop's
-preferred mail client.  This uses either the "xdg-email" utility, or
-OS X's "open" command.
+*** If emacsclient shuts down due to Emacs signaling an error,
+its exit status is 1.
 
-** Emacs server and client changes
-+++
-*** New option `server-port' specifies the port on which the Emacs
-server should listen.
-+++
-*** New emacsclient argument -q/--quiet suppresses some status messages.
-+++
-*** New emacsclient argument --frame-parameters can be used to set the
-frame parameters of a newly-created graphical frame.
-+++
-*** If emacsclient shuts down as a result of Emacs signaling an
-error, its exit status is 1.
-+++
 *** New emacsclient argument --parent-id ID.
 This opens a client frame in parent X window ID, via XEmbed, similar
 to the --parent-id argument to Emacs.
 
 ** Internationalization changes
 
-+++
 *** Emacs now supports display and editing of bidirectional text.
+Right-to-left (RTL) scripts, such as Arabic, Farsi, and Hebrew, are
+displayed in the correct visual order as expected by users of those
+scripts.  The display reordering is a "full bidirectionality" class
+implementation of the Unicode Bidirectional Algorithm (UBA).  Buffers
+with no RTL text should look exactly the same as before.
 
-Text that includes characters from right-to-left (RTL) scripts, such
-as Arabic, Farsi, or Hebrew, is displayed in the correct visual order
-as expected by users of those scripts.  This display reordering is a
-"Full bidirectionality" class implementation of the Unicode
-Bidirectional Algorithm.  Buffers with no RTL text should look exactly
-the same as before.
-
-For more information, see the node "Bidirectional Editing" in the
-Emacs Manual.
-
-+++
 **** New buffer-local variable `bidi-display-reordering'.
-To disable display reordering in any given buffer, change this to nil.
+To disable display reordering in a buffer, change this to nil.
 
-+++
 **** New buffer-local variable `bidi-paragraph-direction'.
 If nil (the default), Emacs determines the base direction of each
-paragraph from its text, as specified by the Unicode Bidirectional
-Algorithm.
+paragraph from its text, as specified by the UBA.  Setting the value
+to `right-to-left' or `left-to-right' forces a base direction on each
+paragraph.
 
-Setting this to `right-to-left' or `left-to-right' forces a particular
-base direction on each paragraph in the buffer.
+Paragraphs with right-to-left base direction are displayed starting at
+the right window edge.
 
-Paragraphs whose base direction is right-to-left are displayed
-starting at the right margin of the window.
-
-+++
-*** Enhanced support for characters with no glyphs in available fonts.
-If a character has no glyphs in any of the available fonts, Emacs
-normally displays it either as a hexadecimal code in a box or as a
-thin 1-pixel space.  In addition to these two methods, Emacs can
-display these characters as empty box, as an acronym, or not display
-them at all.  To change how these characters are displayed, customize
-the variable `glyphless-char-display-control'.
+*** Enhanced support for characters with no glyphs in available fonts,
+or, on text terminals, characters that cannot be encoded by the
+terminal coding system.  The new option `glyphless-char-display-control'
+specifies how to display them: as a hexadecimal code in a box, a thin
+1-pixel space, an empty box, etc.
 
-On character terminals, these methods are used for characters that
-cannot be encoded by the `terminal-coding-system'.
+*** New input methods: farsi, farsi-translit, bulgarian-alt-phonetic.
 
----
-*** New input methods for Farsi: farsi and farsi-translit.
-
-+++
 *** `nobreak-char-display' now also highlights Unicode hyphen chars
 (U+2010 and U+2011).
 
----
-*** New translation of the Emacs Tutorial in Hebrew is available.
+*** New Hebrew translation of the Emacs Tutorial.
 Type `C-u C-h t' to choose it in case your language setup doesn't
 automatically select it.
 
+** An Emacs Lisp package manager is now included.
+This is a convenient way to download and install additional packages,
+from a package repository at http://elpa.gnu.org.
+
+*** M-x list-packages shows a list of packages, which can be
+selected for installation.
+
+*** New command `describe-package', bound to `C-h P'.
+
+*** By default, all installed packages are loaded automatically when
+Emacs starts up.  To disable this, set `package-enable-at-startup' to
+nil.  To specify the packages to load, customize `package-load-list'.
+
+** Custom theme changes
+
+*** New command `M-x customize-themes', which provides a convenient
+interface for enabling and disabling Custom themes.
+
+*** New option `custom-theme-load-path' is the load path for themes.
+Emacs no longer looks for Custom themes in `load-path'.  The default
+value of `custom-theme-load-path' says to look for themes in
+`custom-theme-directory', followed by a subdirectory of
+`data-directory' named "themes/", which contains a small selection of
+built-in Custom themes.
+
+*** New option `custom-safe-themes' records known-safe theme files.
+If a theme is not in this list, Emacs queries before loading it, and
+offers to save the theme to `custom-safe-themes' automatically.  By
+default, all themes included in Emacs are treated as safe.
+
 ** Improved GTK integration
-+++
+
 *** GTK scroll-bars are now placed on the right by default.
-Use `set-scroll-bar-mode' to change this.
-+++
+The function `set-scroll-bar-mode' can change this.
+
 *** GTK tool bars can have just text, just images or images and text.
-Customize `tool-bar-style' to choose style.  On a Gnome desktop, the default
-is taken from the desktop settings.
----
-*** GTK tool bars can be placed on the left/right or top/bottom of the frame.
-The frame-parameter tool-bar-position controls this.  It takes the values
-top, left, right or bottom.  The Options => Show/Hide menu has entries
-for this.
-+++
-*** The colors for selected text (the `region' face) are taken from
-the GTK theme when Emacs is built with GTK.
-+++
-*** Emacs uses GTK tooltips by default if built with GTK.  You can turn that
-off by customizing x-gtk-use-system-tooltips.
+Customize `tool-bar-style' to choose the style.  On a Gnome desktop,
+the default is taken from desktop settings.
 
-+++
-** New basic faces `error', `warning', `success' are available to
-highlight strings that indicate failure, caution or successful operation.
+*** GTK tool bars can be placed on any edge of the frame.
+The frame-parameter tool-bar-position controls this.  It takes the
+values top, left, right or bottom.  The Options => Show/Hide menu has
+entries for this.
 
----
-** Lucid menus and dialogs can display antialiased fonts if Emacs is built
-with Xft.  To change font, use the X resource font, for example:
-Emacs.pane.menubar.font:  Courier-12
+*** The default colors for selected text (the `region' face) are taken
+from the GTK theme when Emacs is built with GTK.
 
-+++
-** On graphical displays, the mode-line no longer ends in dashes.
+*** Emacs uses GTK tooltips by default if built with GTK.
+You can disable this by changing `x-gtk-use-system-tooltips' to nil.
+
+** Graphical interface changes
+
+*** On graphical displays, the mode-line no longer ends in dashes.
 Also, the first dash (which does not indicate anything) is just
 displayed as a space.
 
-+++
-** Basic SELinux support has been added.
-This requires Emacs to be linked with libselinux at build time.
+*** `menu-bar-select-buffer-function' lets you choose another operation
+instead of `switch-to-buffer' when selecting an item in the Buffers menu.
 
-+++
-*** Emacs preserves the SELinux file context when backing up, and
-optionally when copying files.  To this end, `copy-file' has an extra
-optional argument, and the return value of `backup-buffer' now
-includes the SELinux context.
+*** Lucid menus and dialogs can display antialiased fonts if Emacs is
+built with Xft.  These fonts can be set via X resources, for example:
+Emacs.pane.menubar.font: Courier-12
 
-+++
-*** The new functions file-selinux-context and set-file-selinux-context
-get and set the SELinux context of a file.
+** Exiting changes
 
-** Changes for exiting Emacs
-+++
-*** The function kill-emacs is now run upon receipt of the signals
-SIGTERM and SIGHUP, and upon SIGINT in batch mode.
-+++
-*** kill-emacs-hook is now also run in batch mode.
-If you have code that adds something to kill-emacs-hook, you should
-consider if it is still appropriate to add it in the noninteractive case.
+*** Emacs now calls `kill-emacs' if it receives SIGTERM or SIGHUP,
+or if it receives a SIGINT signal in batch mode.
+
+*** `kill-emacs-hook' is now also run in batch mode.
+Third-party code which adds to `kill-emacs-hook' should check if they
+do the right thing in batch mode.
 
 ** Scrolling changes
-+++
+
 *** New scrolling commands `scroll-up-command' and `scroll-down-command'
 (bound to C-v/[next] and M-v/[prior]) do not signal errors at top/bottom
-of buffer at first key-press (instead move to top/bottom of buffer)
+of buffer at first key-press (instead they move to top/bottom of buffer)
 when `scroll-error-top-bottom' is non-nil.
-+++
-*** New variable `scroll-error-top-bottom' (see above).
-+++
+
+*** New option `scroll-error-top-bottom' (see above).
+
 *** New scrolling commands `scroll-up-line' and `scroll-down-line'
 scroll a line instead of full screen.
-+++
+
 *** New property `scroll-command' should be set on a command's symbol to
 define it as a scroll command affected by `scroll-preserve-screen-position'.
-+++
+
 *** If you customize `scroll-conservatively' to a value greater than 100,
 Emacs will never recenter point in the window when it scrolls due to
 cursor motion commands or commands that move point (e.f., `M-g M-g').
 Previously, you needed to use `most-positive-fixnum' as the value of
 `scroll-conservatively' to achieve the same effect.
----
-*** ``Aggressive'' scrolling now honors the scroll margins.
+
+*** "Aggressive" scrolling now honors the scroll margins.
 If you customize `scroll-up-aggressively' or
 `scroll-down-aggressively' and move point off the window, Emacs now
 scrolls the window so as to avoid positioning point inside the scroll
 margin.
 
+** Basic SELinux support has been added.
+This requires Emacs to be linked with libselinux at build time.
+
+*** Emacs preserves the SELinux file context when backing up.
+Also, the function `copy-file' has an extra optional argument for
+preserving SELinux context, and the return value of `backup-buffer'
+now includes the SELinux context.
+
+*** New functions `file-selinux-context' and `set-file-selinux-context'
+get and set the SELinux context of a file.
+
 ** Trash changes
-+++
+
 *** `delete-by-moving-to-trash' now only affects commands that specify
 trashing.  This avoids inadvertently trashing temporary files.
-+++
+
 *** Calling `delete-file' or `delete-directory' with a prefix argument
 now forces true deletion, regardless of `delete-by-moving-to-trash'.
 
-+++
-** New option `list-colors-sort' defines the color sort order
-for `list-colors-display'.
-
-** An Emacs Lisp package manager is now included.
-This is a convenient way to download and install additional packages,
-from a package repository at http://elpa.gnu.org.
-+++
-*** `M-x list-packages' shows a list of packages, which can be
-selected for installation.
-+++
-*** New command `describe-package', bound to `C-h P'.
-+++
-*** By default, all installed packages are loaded and activated
-automatically when Emacs starts up.  To disable this, set
-`package-enable-at-startup' to nil.  To change which packages are
-loaded, customize `package-load-list'.
-
-** Custom Themes
-+++
-*** `M-x customize-themes' lists Custom themes which can be enabled.
-+++
-*** New option `custom-theme-load-path' is the load path for themes.
-Emacs no longer looks for custom themes in `load-path'.  The default
-is to search in `custom-theme-directory', followed by a built-in theme
-directory named "themes/" in `data-directory'.
-+++
-*** New option `custom-safe-themes' records known-safe theme files.
-If a theme is not in this list, Emacs queries before loading it, and
-offers to save the theme to `custom-safe-themes' automatically.  By
-default, all themes included in Emacs are treated as safe.
-
 ** File- and directory-local variable changes
-+++
+
 *** You can stop directory local vars from applying to subdirectories.
 Add an element (subdirs . nil) to the alist portion of any variables
 settings to indicate that the section should not apply to
 subdirectories.
-+++
+
 *** Directory local variables can apply to some file-less buffers.
 Affected modes include dired, vc-dir, and log-edit.  For example,
 adding "(diff-mode . ((mode . whitespace)))" to .dir-locals.el will
 turn on `whitespace-mode' for *vc-diff* buffers.  Modes should call
 `hack-dir-local-variables-non-file-buffer' to support this.
-+++
+
 *** Using "mode: MINOR-MODE" to enable a minor mode is deprecated.
 Instead, use "eval: (minor-mode 1)".
 
-+++
 *** The variable `inhibit-first-line-modes-regexps' has been renamed
 to `inhibit-local-variables-regexps'.  As the name suggests, it now
-applies to ALL file local variables, not just -*- mode ones.
-The associated `inhibit-first-line-modes-suffixes' has been renamed
-in the corresponding way.
-
-+++
-** The variable `focus-follows-mouse' now always defaults to nil.
-
-+++
-** New primitive `secure-hash' that supports many secure hash algorithms:
-md5, sha1, sha2, sha224, sha256, sha384, and sha512.  The lisp library
-sha1.el has been removed.  The `sha1' feature is provided by default.
-
-** Menu-bar changes
----
-*** `menu-bar-select-buffer-function' lets you choose another operation
-instead of `switch-to-buffer' when selecting an item in the Buffers menu.
+applies to ALL file local variables, not just -*- lines.  The
+associated `inhibit-first-line-modes-suffixes' has been renamed in the
+corresponding way.
 
 ** Window changes
 
-+++
+*** The `quit-window' command now restores the last buffer displayed
+in the quitted window.
+
 *** Resizing an Emacs frame now preserves proportional window sizes,
 modulo restrictions like window minimum sizes and fixed-size windows.
 
 *** The behavior of `display-buffer' is now customizable in detail.
-+++
+
 **** New option `display-buffer-base-action' specifies a list of
 user-determined display "actions" (functions and optional arguments
 for choosing the displaying window).
@@ -437,286 +372,291 @@ for choosing the displaying window).
 This takes precedence over the default display action, which is
 specified by `display-buffer-fallback-action'.
 
-+++
 **** New option `display-buffer-alist' maps buffer name regexps to
 display actions, taking precedence over `display-buffer-base-action'.
 
-+++
 *** New option `window-combination-limit'.
 The new option `window-combination-limit' allows to return the space
 obtained for resizing or creating a window more reliably to the window
 from which such space was obtained.
 
-+++
 *** New option `window-combination-resize'.
 The new option `window-combination-resize' allows to split a window that
 otherwise cannot be split because it's too small by stealing space from
 other windows in the same combination.  Subsequent resizing or deletion
 of the window will resize all windows in the same combination as well.
 
-+++
+*** New option `frame-auto-hide-function' lets you choose between
+iconifying or deleting a frame when burying a buffer in a dedicated
+frame, or quitting a window showing a buffer in a frame of its own.
+
 *** New commands `maximize-window' and `minimize-window'.
 These maximize and minimize the size of a window within its frame.
 
-+++
 *** New commands `switch-to-prev-buffer' and `switch-to-next-buffer'.
 These functions allow to navigate through the live buffers that have
 been shown in a specific window.
 
-+++
-** The inactive minibuffer has its own major mode `minibuffer-inactive-mode'.
+** Minibuffer changes
+
+*** The inactive minibuffer has its own major mode `minibuffer-inactive-mode'.
 This is handy for minibuffer-only frames, and is also used for the feature
 where mouse-1 pops up *Messages*"', which can now easily be changed.
 
+*** Minibuffers set `truncate-lines' to nil.
+If you want to change the value to something else, you could use
+for example `minibuffer-setup-hook'.
+
+** `auto-mode-case-fold' is now enabled by default.
+
+** `backup-by-copying-when-mismatch' now defaults to t.
+
+** New basic faces `error', `warning', `success'.
+These are used to highlight text indicating failure, caution or
+successful operation.
+
+** New option `list-colors-sort' defines the color sort order
+for `list-colors-display'.
+
+** The variable `focus-follows-mouse' now always defaults to nil.
+
 
 * Editing Changes in Emacs 24.1
 
 ** Search changes
-+++
-*** C-y in Isearch is now bound to isearch-yank-kill, instead of
-isearch-yank-line.
-+++
-*** M-y in Isearch is now bound to isearch-yank-pop, instead of
-isearch-yank-kill.
-+++
-*** M-s C-e in Isearch is now bound to isearch-yank-line.
 
-+++
-** New commands `count-words-region' and `count-words'.
+*** C-y in Isearch is now bound to `isearch-yank-kill', instead of
+`isearch-yank-line'.
 
-*** `count-lines-region' is now an alias for `count-words-region',
-bound to M-=, which shows the number of lines, words, and characters.
+*** M-y in Isearch is now bound to `isearch-yank-pop', instead of
+`isearch-yank-kill'.
 
-+++
-** The default value of `backup-by-copying-when-mismatch' is now t.
+*** M-s C-e in Isearch is now bound to `isearch-yank-line'.
+
+** New commands `count-words-region' and `count-words'.
+
+*** M-= is bound to `count-words-region', not `count-lines-region'.
+The `count-words-region' command, when called interactively, reports
+the number of lines, words, and characters in the region.  It is a
+superset of the old `count-lines-region', which is now an obsolete
+alias for it.
 
-+++
 ** The command `just-one-space' (M-SPC), if given a negative argument,
 also deletes newlines around point.
 
 ** Deletion changes
-+++
+
 *** New option `delete-active-region'.
 If non-nil, [delete] and DEL delete the region if it is active and no
-prefix argument is given.  If set to `kill', these commands kill
+prefix argument is given.  If set to `kill', those commands kill
 instead.
-+++
+
 *** New command `delete-forward-char', bound to [delete].
 This is meant for interactive use, and obeys `delete-active-region'.
 The command `delete-char' does not obey `delete-active-region'.
----
+
 *** `delete-backward-char' is now a Lisp function.
 Apart from obeying `delete-active-region', its behavior is unchanged.
-However, the byte compiler now warns if it is called from Lisp; you
-should use delete-char with a negative argument instead.
----
+However, the byte compiler now warns if it is called from Lisp; Lisp
+callers should use delete-char with a negative argument instead.
+
 *** The option `mouse-region-delete-keys' has been deleted.
 
 ** Selection changes.
 
-The default handling of clipboard and primary selections was changed
-to conform with modern X applications.  In short, most commands for
-killing and yanking text now use the clipboard, while mouse commands
-use the primary selection.
+The default handling of clipboard and primary selections has been
+changed to conform with modern X applications.  In short, most
+commands for killing and yanking text now use the clipboard, while
+mouse commands use the primary selection.
 
 In the following, we provide a list of these changes, followed by a
 list of steps to get the old behavior back if you prefer that.
 
-+++
 *** `select-active-regions' now defaults to t.
 Merely selecting text (e.g. with drag-mouse-1) no longer puts it in
 the kill ring.  The selected text is put in the primary selection, if
 the system possesses a separate primary selection facility (e.g. X).
 
-+++
 **** `select-active-regions' also accepts a new value, `only'.
 This means to only set the primary selection for temporarily active
 regions (usually made by mouse-dragging or shift-selection);
 "ordinary" active regions, such as those made with C-SPC followed by
 point motion, do not alter the primary selection.
 
----
 **** `mouse-drag-copy-region' now defaults to nil.
 
-+++
 *** mouse-2 is now bound to `mouse-yank-primary'.
 This pastes from the primary selection, ignoring the kill-ring.
 Previously, mouse-2 was bound to `mouse-yank-at-click'.
 
-+++
 *** `x-select-enable-clipboard' now defaults to t on all platforms.
-+++
+
 *** `x-select-enable-primary' now defaults to nil.
 Thus, commands that kill text or copy it to the kill-ring (such as
 M-w, C-w, and C-k) also use the clipboard---not the primary selection.
 
----
 **** The "Copy", "Cut", and "Paste" items in the "Edit" menu are now
-exactly equivalent to, respectively M-w, C-w, and C-y.
+exactly equivalent to M-w, C-w, and C-y respectively.
 
----
 **** Note that on MS-Windows, `x-select-enable-clipboard' was already
 non-nil by default, as Windows does not support the primary selection
 between applications.
 
----
 *** To return to the previous behavior, do the following:
+
 **** Change `select-active-regions' to nil.
 **** Change `mouse-drag-copy-region' to t.
 **** Change `x-select-enable-primary' to t (on X only).
 **** Change `x-select-enable-clipboard' to nil.
 **** Bind `mouse-yank-at-click' to mouse-2.
 
-+++
 *** Support for X cut buffers has been removed.
 
 *** X clipboard managers are now supported.
 To inhibit this, change `x-select-enable-clipboard-manager' to nil.
 
-+++
-** New command `rectangle-number-lines', bound to `C-x r N', numbers
-the lines in the current rectangle.  With a prefix argument, this
-prompts for a number to count from and for a format string.
+** New command `C-x r N' (`rectangle-number-lines') numbers the lines
+in the current rectangle.  With a prefix argument, this prompts for a
+number to count from and for a format string.
 
-+++
-** The default value of redisplay-dont-pause is now t
+** `redisplay-dont-pause' now defaults to t.
 This makes Emacs feel more responsive to editing commands that arrive
 at high rate, e.g. if you lean on some key, because stopping redisplay
 in the middle (when this variable is nil) forces more expensive
 updates later on, and Emacs appears to be unable to keep up.
 
-+++
 ** The behavior of <TAB> for active regions in Text mode has changed.
 In Text and related modes, typing <TAB> (`indent-for-tab-command')
 when the region is active causes Emacs to indent all the lines in the
 region, aligning them with the line previous to the first line in the
 region (or with the left margin if there is no previous line).
 
+** When `occur' is called with a prefix argument, matching strings are
+collected into the `*Occur*' buffer without line numbers.  If there
+are parenthesized subexpressions in the specified regexp, `occur'
+reads replacement text that may contain \\& and \\N whose convention
+follows `replace-match'.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
-+++
 ** Archive Mode has basic support for browsing and updating 7z archives.
 
 ** BibTeX mode
----
+
 *** BibTeX mode now supports biblatex.
-Use the variable bibtex-dialect to select different BibTeX dialects.
-bibtex-entry-field-alist is now an obsolete alias forbibtex-BibTeX-entry-alist.
----
-*** New command `bibtex-search-entries' bound to C-c C-a.
----
+Use the variable `bibtex-dialect' to select different BibTeX dialects.
+`bibtex-entry-field-alist' is now an obsolete alias for
+`bibtex-BibTeX-entry-alist'.
+
+*** New command `bibtex-search-entries', bound to C-c C-a.
+
 *** New `bibtex-entry-format' option `sort-fields', disabled by default.
----
+
 *** New variable `bibtex-search-entry-globally'.
 
+** Browse-url
+
+*** New option `browse-url-mailto-function' specifies how to handle "mailto:"s.
+
+*** The default browser used by the package is now the "xdg-open" program,
+on platforms that support it.  This calls your desktop's preferred browser.
+
 ** Calendar, Diary, and Appt
 
-+++
-*** Diary entries can contain non-printing `comments'.
+*** Diary entries can contain non-printing "comments".
 See the variable `diary-comment-start'.
 
-+++
 *** Appointments can specify their individual warning times.
 See the variable `appt-warning-time-regexp'.
 
----
 *** The function specified by `appt-disp-window-function' may be passed
 lists of arguments if multiple appointments are due at similar times.
 If you are using a custom function for this, you should update it.
 
-+++
 *** New function `diary-hebrew-birthday'.
 
----
 *** Elements of `calendar-day-abbrev-array' and `calendar-month-abbrev-array'
 may no longer be nil, but must all be strings.
 
----
-*** The obsolete (since Emacs 22.1) method of enabling the appt package
-by adding appt-make-list to diary-hook has been removed.  Use appt-activate.
+*** The obsolete (since Emacs 22.1) method of enabling the appt
+package by adding `appt-make-list' to `diary-hook' has been removed.
+Use `appt-activate' instead.
 
----
 *** Some appt variables (obsolete since Emacs 22.1) have been removed:
 appt-issue-message (use the function appt-activate)
 appt-visible/appt-msg-window (use the variable appt-display-format)
 
----
 *** Some diary function aliases (obsolete since Emacs 22.1) have been removed:
 view-diary-entries, list-diary-entries, show-all-diary-entries
 
-** Browse-url
+** CC Mode
 
-+++
-*** New option `browse-url-mailto-function' specifies how to handle "mailto:"s.
+*** New feature to "guess" the style in an existing buffer.
+The main entry point is M-x c-guess.
 
----
-*** The default browser used by the package is now the "xdg-open" program,
-on platforms that support it.  This calls your desktop's preferred browser.
+*** Java Mode now supports Java 5.0 (Tiger) and 6 (Mustang).
 
-+++
-** New CC Mode feature to "guess" the style in an existing buffer.
-The main entry is M-x c-guess.
+*** `c-beginning-of-defun' and `c-end-of-defun' now respect nested scopes.
+Thus C-M-a will, by default, go to the beginning of the immediate function,
+not the top level.
 
-** comint and modes derived from it use the generic completion code.
+*** "Macros with semicolons" can be registered for correct indentation.
+Where such a macro ends a line (no semicolon) the next statement is no longer
+parsed as a statement continuation.
+
+** Comint and modes derived from it use the standard completion code.
 
 ** Compilation mode
----
-*** Compilation mode can be used without font-lock-mode.
+
+*** Compilation mode can be used without Font Lock mode.
 `compilation-parse-errors-function' is now obsolete.
 
----
-*** New variable `compilation-filter-start', bound while
-compilation-filter-hook runs.  It records the start position of the
-text inserted by compilation-filter.
+*** New variable `compilation-filter-start', which is bound while
+`compilation-filter-hook' runs.  It records the start position of the
+text inserted by `compilation-filter'.
 
----
 *** `compilation-error-screen-columns' and `compilation-first-column'
 are obeyed in the editing buffer.  So programming language modes can
-set them, whereas previously only the value in the *compilation* buffer
-was used.
+set them, whereas previously only the value in the *Compilation*
+buffer was used.
 
 ** Customize
 
-+++
 *** Customize buffers now contain a search field.
 The search is performed using `customize-apropos'.
-To turn off the search field, set custom-search-field to nil.
+To turn off the search field, set `custom-search-field' to nil.
 
-+++
 *** Custom options now start out hidden if at their default values.
 Use the arrow to the left of the option name to toggle visibility.
 
----
 *** custom-buffer-sort-alphabetically now defaults to t.
 
-+++
 *** The color widget now has a "Choose" button, which allows you to
-choose a color via list-colors-display.
+choose a color via `list-colors-display'.
 
 ** D-Bus
 
 *** It is now possible to access buses other than the default system
 or session bus.
 
-*** The dbus-register-method and dbus-register-property functions 
+*** The `dbus-register-method' and `dbus-register-property' functions
 optionally do not register names.
 
-*** The new function dbus-register-service registers a known service name
-on a D-Bus without simultaneously registering a property or a method.
+*** The new function `dbus-register-service' registers a known service
+name on a D-Bus without also registering a property or a method.
 
 ** Dired-x
----
-*** dired-jump and dired-jump-other-window called with a prefix argument
-read a file name from the minibuffer instead of using buffer-file-name.
 
-+++
-*** The `dired local variables' feature provided by Dired-x is obsolete.
+*** C-x C-j (`dired-jump') and C-x 4 C-j (`dired-jump-other-window'),
+if called with a prefix argument, read a file name from the minibuffer
+instead of using the current buffer.
+
+*** The "dired local variables" feature of Dired-x is obsolete.
 The standard directory local variables feature replaces it.
 
 ** ERC changes
 
----
 *** New options `erc-autojoin-timing' and `erc-autojoin-delay',
 controlling attempts to autojoin a channel.
 
@@ -727,96 +667,127 @@ utf-8, and do the normal `undecided' decoding for the rest.
 
 ** Eshell changes
 
----
 *** The default value of `eshell-directory-name' has changed
 to be an "eshell" directory in `user-emacs-directory'.
 The old "~/.eshell/" directory is still used if it exists, though.
 
 ** gdb-mi
-+++
-*** The GDB User Interface has been migrated to GDB Machine Interface.
+
+*** The M-x gdb command now uses the GDB Machine Interface protocol.
 It now supports multithread non-stop debugging and simultaneous
 debugging of several threads.
 
 ** Image mode
 
-+++
 *** RET (`image-toggle-animation') toggles animation, if applicable.
 Animation plays once, unless the option `image-animate-loop' is non-nil.
 
 ** Info
 
-+++
-*** New command `info-display-manual' displays a named Info manual.
+*** New command M-x info-display-manual displays a named Info manual.
 If that manual is already visited in some Info buffer, it displays
 that buffer.  (This is handy if you have many manuals in many *info*
 buffers, and don't remember the name of the buffer visiting the manual
 you want to consult.)  Otherwise, it loads and displays the manual.
 
-+++
 *** `e' is now bound to `end-of-buffer' rather than to `Info-edit'.
 This is for compatibility with the stand-alone Info reader program,
 and also because `Info-edit' is a rarely used command that is disabled
 by default.
 
-+++
+** Mail mode changes (not Message mode)
+
+*** New command M-x mail-add-attachment for adding MIME attachments
+
+*** The command M-x mail-attach-file was renamed to M-x mail-insert-file.
+(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.
 See MH-E-NEWS for details.
 
----
 ** Modula-2 mode provides auto-indentation.
 
----
 ** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags.
 
----
+** nXML mode no longer binds C-RET to `nxml-complete'.
+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.
+
 ** 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.
+functionality such as more intelligent indentation, electricity,
+support for more variants, including Mercury, and a lot more.
 
 ** Rmail
 
-+++
 *** The command `rmail-epa-decrypt' decrypts OpenPGP data
 in the Rmail incoming message.
 
----
 *** The variable `rmail-message-filter' no longer has any effect.
 This change was made in Emacs 23.1 but was not advertised at the time.
 Try using `rmail-show-message-hook' instead.
 
 ** Shell mode
-+++
-*** Shell mode uses pcomplete rules, with the standard completion UI.
-+++
-*** The `shell' command prompts for the shell path name if the default
-directory is a remote file name and neither the environment variable
-$ESHELL nor the variable `explicit-shell-file-name' is set.
 
----
+*** M-x shell prompts for the shell path name if the default directory
+is a remote file name and neither the environment variable $ESHELL nor
+the variable `explicit-shell-file-name' is set.
+
+*** TAB is now bound to the standard `completion-at-point' command,
+which now implements the pcomplete rules for shell command completion.
+
+** SMTPmail
+
+*** SMTPmail now uses encrypted connections (via STARTTLS) by default
+if the mail server supports them.  This uses either built-in GnuTLS
+support, or the starttls.el library.  Customize `smtpmail-stream-type'
+to change this.
+
+*** The variable `smtpmail-auth-credentials' has been removed.
+By default, the information is now stored in the file ~/.authinfo.
+This was the default value of smtpmail-auth-credentials.  If you had
+customized smtpmail-auth-credentials to a list of user names and
+passwords, those settings are not used.  During your first connection
+to the smtp server, Emacs will prompt for the user name and password,
+and offer to save them to ~/.authinfo.  Or you can manually copy the
+credentials to ~/.authinfo.  For example, if you had
+
+  (setq smtpmail-auth-credentials
+        '(("mail.example.org" 25 "jim" "s!cret")))
+
+then the equivalent line in ~/.authinfo would be
+
+  machine mail.example.org port 25 login jim password s!cret
+
+See the auth-source manual for more information, e.g. on encrypting
+the credentials file.
+
+*** The variable `smtpmail-starttls-credentials' has been removed.
+If you had that set, you need to put
+
+  machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert"
+
+in your ~/.authinfo file instead.
+
 ** SQL mode
 
----
 *** New options `sql-port', `sql-connection-alist', `sql-send-terminator',
 and `sql-oracle-scan-on'.
 
----
-*** New custom variables control prompting for login parameters.
+*** New options controlling prompting for login parameters.
 Each supported product has a custom variable `sql-*-login-params',
 which is a list of the parameters to be prompted for before a
 connection is established.
 
----
 *** The command `sql-product-interactive' now takes a prefix argument,
 which causes it to prompt for an SQL product.
 
----
 *** Product-specific SQL interactive commands now take prefix arguments.
 These commands (`sql-sqlite', `sql-postgres', `sql-mysql', etc.),
 given a prefix argument, prompt for a name for the SQL interactive
 buffer.  This reduces the need for calling `sql-rename-buffer'.
 
----
 *** SQL interactive modes suppress command continuation prompts, and
 replace tabs with spaces.  The first change impacts multiple line SQL
 statements entered with C-j between each line, statements yanked into
@@ -824,98 +795,82 @@ the buffer and statements sent with `sql-send-*' functions.  The
 second prevents the MySQL and Postgres interpreters from listing
 object name completions when sent text via `sql-send-*' functions.
 
----
 *** New command `sql-connect' starts a predefined SQLi session,
 using the login parameters from `sql-connection-alist'.
 
----
 *** New "Save Connection" menu item in SQLi buffers.
 This gathers the login params specified for the SQLi session, if it
 was not started by a connection, and saves them as a new connection.
 
----
 *** New commands for listing database objects and details:
 sql-list-all and sql-list-table.
 
----
 *** An API for manipulating SQL product definitions has been added.
 
 ** TeX modes
 
-+++
 *** latex-electric-env-pair-mode keeps \begin..\end matched on the fly.
 
 ** Tramp
----
-*** There exists a new inline access method "ksu" (kerberized su).
----
+
+*** New inline access method "ksu" (kerberized su).
+
 *** The following access methods are discontinued: "ssh1_old",
 "ssh2_old", "scp1_old", "scp2_old", "imap", "imaps" and "fish".
-+++
+
 *** The user option `remote-file-name-inhibit-cache' controls whether
 remote file attributes are cached for better performance.
----
+
 *** The option `ange-ftp-binary-file-name-regexp' has changed its
 default value to "".
----
-*** Handlers for file-selinux-context and set-file-selinux-context for
-remote machines that support SELinux.
 
-+++
-** New function, `url-queue-retrieve', which behaves like url-retrieve,
+*** Handlers for `file-selinux-context' and `set-file-selinux-context'
+for remote machines which support SELinux.
+
+** New function `url-queue-retrieve', which behaves like url-retrieve,
 but with limits (`url-queue-parallel-processes', `url-queue-timeout') on
 the degree of parallelism.
 
 ** VC and related modes
 
-+++
 *** Support for pulling on distributed version control systems.
-`C-x v +' (`vc-pull') runs a "pull" operation, if it is supported
-(currently with Bzr, Git, and Mercurial), to update the current branch
-and working tree.  A prefix argument means to prompt the user for
-specifics, e.g. a pull location.
+The command C-x v + (`vc-pull') runs a "pull" operation, if it is
+supported (currently with Bzr, Git, and Mercurial), to update the
+current branch and working tree.  A prefix argument means to prompt
+the user for specifics, e.g. a pull location.
 
----
 *** `vc-update' is now an alias for `vc-pull'.
 
-+++
 *** Support for merging on distributed version control systems.
-The vc-merge command now runs a "merge" operation, if it is supported
-(currently with Bzr, Git, and Mercurial), to merge changes from
-another branch into the current one.  It prompts for specifics, e.g. a
-merge source.
+The command C-x v m (`vc-merge') now runs a "merge" operation, if it
+is supported (currently with Bzr, Git, and Mercurial), to merge
+changes from another branch into the current one.  It prompts for
+specifics, e.g. a merge source.
 
-+++
 *** New option `vc-revert-show-diff' controls whether `vc-revert'
 shows a diff while querying the user.  It defaults to t.
 
-+++
 *** Log entries in some Log View buffers can be toggled to display a
 longer description by typing RET (log-view-toggle-entry-display).
 This is currently supported for Bzr, Git, and Mercurial (to support
 another backend, define a `log-view-expanded-log-entry-function').
-In the Log View buffers made by `C-x v L' (vc-print-root-log), you can
+In the Log View buffers made by C-x v L (`vc-print-root-log'), you can
 use this to display the full log entry for the revision at point.
 
-+++
 *** New command `vc-ediff' allows visual comparison of two revisions
 of a file similar to `vc-diff', but using ediff backend.
 
-+++
 *** The option `vc-initial-comment' was removed in Emacs 23.2, but
 this was not advertised at the time.
 
-+++
 *** `vc-toggle-read-only' is an obsolete alias for `toggle-read-only'.
 Since Emacs 23, it has done the same thing as `toggle-read-only', but
 this was not advertised at the time.
 
 ** Obsolete modes
 
----
 *** abbrevlist.el
 
----
 *** erc-hecomplete.el (use erc-pcomplete.el instead)
 
 *** partial-completion-mode (complete.el) is obsolete.
@@ -923,71 +878,50 @@ You can get a comparable behavior with:
 (setq completion-styles '(partial-completion initials))
 (setq completion-pcm-complete-word-inserts-delimiters t)
 
----
 *** pc-mode.el is obsolete (CUA mode is much more comprehensive).
 
-[FIXME gnus.texi, message.texi need updating]
-*** pgg is obsolete (use EasyPG instead)
+*** pgg is obsolete (use EasyPG instead).
 
----
 *** sregex.el is obsolete, since rx.el is a strict superset.
 
----
 *** s-region.el and pc-select.el are obsolete.
 They are superseded by shift-select-mode, enabled by default since 23.1.
 
-+++
-*** vc-mcvs.el is obsolete (for lack of a maintainer)
+*** vc-mcvs.el is obsolete (for lack of a maintainer).
 
 ** Miscellaneous
 
-+++
 *** The Landmark game is now invoked with `landmark', not `lm'.
 Its functions and variables have been similarly renamed.
 
----
-*** In `ido-file-completion-map', C-v is no longer bound to ido-toggle-vc.
+*** In `ido-file-completion-map', C-v is no longer bound to `ido-toggle-vc'.
 (This interfered with cua-mode.)
 
-+++
 *** f90.el has some support for Fortran 2008 syntax.
 
----
 *** `copyright-fix-years' can optionally convert consecutive years to ranges.
 
-+++
 *** New command `nato-region' converts text to NATO phonetic alphabet.
 
 
 * New Modes and Packages in Emacs 24.1
 
-+++
 ** Occur Edit mode applies edits made in *Occur* buffers to the
 original buffers.  It is bound to "e" in Occur mode.
 
-** When `occur' is called with the prefix argument `C-u'
-the matching strings are collected into the `*Occur*' buffer
-without line numbers.  If there are parenthesized subexpressions
-in the specified regexp, `occur' reads replacement text that
-may contain \\& and \\N whose convention follows `replace-match'.
-
-+++
 ** New global minor mode electric-pair-mode.
 When enabled, typing an open parenthesis automatically inserts the
 matching closing one.
 
-+++
 ** New global minor mode electric-indent-mode.
 When enabled, typing certain characters triggers reindentation.
 Major modes wishing to use this can set electric-indent-chars or
 electric-indent-functions.
 
-+++
 ** New global minor mode electric-layout-mode.
 When enabled, typing certain characters automatically inserts newlines.
 Major modes wishing to use this can set electric-layout-rules.
 
-+++
 ** tabulated-list.el provides a generic major mode for tabulated data,
 from which other modes can be derived.
 
@@ -1005,133 +939,138 @@ Notifications API.  It requires D-Bus for communication.
 ** soap-client.el supports access to SOAP web services from Emacs.
 soap-inspect.el is an interactive inspector for SOAP WSDL structures.
 
----
 ** New generic mode, xmodmap-generic-mode, for xmodmap files.
 
----
 ** New emacs-lock.el package.
-(The previous version has been moved to obsolete/old-emacs-lock.el.)
-Now, there is a proper minor mode `emacs-lock-mode'.
-Protection against exiting Emacs and killing the buffer can be set
-separately.  The mechanism for automatically turning off protection
-for buffers with dead inferior processes has been generalized.
+The previous version has been moved to obsolete/old-emacs-lock.el.
+Now, there is a proper minor mode `emacs-lock-mode'.  Protection
+against exiting Emacs and killing the buffer can be set separately.
+The mechanism for automatically turning off protection for buffers
+with dead inferior processes has been generalized.
 
 
 * Incompatible Lisp Changes in Emacs 24.1
 
-+++
+** Passing a nil argument to a minor mode function call now ENABLES
+the minor mode unconditionally.  This is so that you can write e.g.
+
+ (add-hook 'text-mode-hook 'foo-mode)
+
+to enable foo-mode in Text mode buffers, removing the need for
+`turn-on-foo-mode' style functions.  This affects all mode commands
+defined by `define-minor-mode'.  If called interactively, the mode
+command still toggles the minor mode.
+
 ** The return value of `backup-buffer' has changed.
 It is now a list of three elements, where the second element is a list
 describing the original file's SELinux context.  If Emacs or the
-system lacks SELinux cupport, the context list is (nil nil nil nil).
-See the "Basic SELinux support" entry under "Changes in Emacs 24.1",
-above.
+system lacks SELinux support, the context list is (nil nil nil nil).
+See "Basic SELinux support" above, under "Changes in Emacs 24.1".
 
----
-** `char-direction-table' and the associated function `char-direction'
-were deleted.  They were buggy and inferior to the new support of
-bidirectional editing introduced in Emacs 24.  If you need the
-bidirectional properties of a character, use `get-char-code-property'
-with the last argument `bidi-class'.
+** `char-direction-table' and the `char-direction' function were deleted.
+They were buggy and inferior to the new support of bidirectional
+editing introduced in Emacs 24.  If you need the bidirectional
+properties of a character, use `get-char-code-property' with the last
+argument `bidi-class'.
 
-+++
 ** `copy-directory' now copies the source directory as a subdirectory
 of the target directory, if the latter is an existing directory.  The
 new optional arg COPY-CONTENTS, if non-nil, makes the function copy
 the contents directly into a pre-existing target directory.
 
-+++
 ** For mouse click input events in the text area, the Y pixel
 coordinate in the POSITION list now counts from the top of the text
 area, excluding any header line.  Previously, it counted from the top
 of the header line.
 
----
-** Support for "old-style" backquotes, which have been obsolete for
-more than 10 years, has been further reduced.  Now a backquote not
-followed by a space is always treated as a "new-style" backquote.
-Please consider completely removing all "old-style" backquotes from
-your code as a matter of some urgency.  If your code uses backquotes
+** Support for "old-style" backquotes, obsolete for 10+ years, has
+been further reduced.  Now a backquote not followed by a space is
+always treated as a "new-style" backquote.  Please remove all
+"old-style" backquotes from your code.  If your code uses backquotes
 as documented in the Elisp manual, and compiles without warning, then
 you have nothing to do in this regard.  Code not following the
-appropriate conventions may fail to compile.  The most common cause of
-trouble seems to be an old-style backquote followed by a newline.
+appropriate conventions may fail to compile.
 
----
-** view-buffer now treats special mode-class in the same way that
-view-file has since Emacs 22 (ie, it won't enable View mode if the
-major-mode is special).
+The most common cause of trouble seems to be an old-style backquote
+followed by a newline.  Another cause of trouble is vector notation
+for key sequence notation: instead of [(control ,)] and [(control ')],
+you should write [(control ?,)] and [(control ?')], which will work in
+older Emacsen too.
 
-+++
-** Passing a nil argument to a minor mode defined by define-minor-mode
-now turns the mode ON unconditionally.  This is so that you can write, e.g.
-  (add-hook 'text-mode-hook 'foo-minor-mode)
-to enable foo-minor-mode in Text mode buffers, thus removing the need
-for `turn-on-foo-minor-mode' style functions.
+** The macro `eval-at-startup' was removed in Emacs 23.2, but this
+was not advertised at the time.  The function `custom-initialize-delay'
+replaced all known uses.
 
-+++
-** During startup, Emacs no longer adds entries for `menu-bar-lines'
+** `view-buffer' now treats special mode-class in the same way that
+`view-file' has since Emacs 22 (i.e. it won't enable View mode if the
+major mode is special).
+
+** Menu and tool bar changes
+
+*** During startup, Emacs no longer adds entries for `menu-bar-lines'
 and `tool-bar-lines' to `default-frame-alist' and `initial-frame-alist'.
 With these alist entries omitted, `make-frame' checks the value of the
 variable `menu-bar-mode'/`tool-bar-mode' to determine whether to create
 a menu-bar or tool-bar, respectively.  If the alist entries are added,
 they override the value of `menu-bar-mode'/`tool-bar-mode'.
 
-+++
+*** The menu bar bindings's caches are not used any more.
+Use (where-is-internal <def> nil t) instead.
+
 ** Regions created by mouse dragging are now normal active regions,
-similar to the ones created by shift-selection.  In previous Emacs
-versions, these regions were delineated by `mouse-drag-overlay', which
-has now been removed.
+similar to those created by shift-selection (see Selection changes
+above).  In previous Emacs versions, these regions were delineated by
+`mouse-drag-overlay'; that variable has been removed.
 
-+++
-** The fourth argument of filter-buffer-substring, which says to remove
-text properties from the final result, has been removed.
-Eg simply pass the result through substring-no-properties if you need this.
+** The fourth argument of `filter-buffer-substring' has been removed.
+If you want to remove text properties from the final result, simply
+pass the result through substring-no-properties.
 
----
 ** cl.el no longer provides `cl-19'.
 
-+++
-** The menu bar bindings's caches are not used any more.
-Use (where-is-internal <def> nil t) instead.
-
-+++
-** The following obsolete (mostly since at least 21.1) functions and aliases
-have been removed (the appropriate new function is given in parentheses):
-comint-kill-output (comint-delete-output),
-decompose-composite-char (char-to-string),
-outline-visible (outline-invisible-p),
-internal-find-face (facep), internal-get-face (facep and check-face),
-frame-update-faces (not needed),
-frame-update-face-colors (frame-set-background-mode),
-x-frob-font-weight and x-frob-font-slant (appropriate make-face-* function),
-x-make-font-bold and x-make-font-demibold (make-face-bold),
-x-make-font-italic and x-make-font-oblique (make-face-italic),
-x-make-font-bold-italic (make-face-bold-italic),
-x-make-font-unbold (make-face-unbold),
-x-make-font-unitalic (make-face-unitalic),
-mldrag-drag-mode-line (mouse-drag-mode-line),
-mldrag-drag-vertical-line (mouse-drag-vertical-line),
-iswitchb-default-keybindings (iswitchb-mode), char-bytes (== 1),
-isearch-return-char (isearch-printing-char), make-local-hook (not needed)
+** The following obsolete functions and aliases have been removed
+(the appropriate new function is given in parentheses; "not needed"
+means you can just remove all calls to the function in question):
+
+*** `comint-kill-output' (`comint-delete-output')
+*** `decompose-composite-char' (`char-to-string')
+*** `outline-visible' (`outline-invisible-p')
+*** `internal-find-face' (`facep')
+*** `internal-get-face' (`facep and check-face')
+*** `frame-update-faces' (not needed)
+*** `frame-update-face-colors' (`frame-set-background-mode')
+*** `x-frob-font-weight' and `x-frob-font-slant' (`make-face-*' functions)
+*** `x-make-font-bold and x-make-font-demibold (`make-face-bold')
+*** `x-make-font-italic' and `x-make-font-oblique' (`make-face-italic')
+*** `x-make-font-bold-italic' (`make-face-bold-italic')
+*** `x-make-font-unbold' (`make-face-unbold')
+*** `x-make-font-unitalic' (`make-face-unitalic')
+*** `mldrag-drag-mode-line' (`mouse-drag-mode-line')
+*** `mldrag-drag-vertical-line' (`mouse-drag-vertical-line')
+*** `iswitchb-default-keybindings' (`iswitchb-mode')
+*** `char-bytes' (== 1)
+*** `isearch-return-char' (`isearch-printing-char')
+*** `make-local-hook' (not needed)
+*** `set-screen-height' (`set-frame-height')
+*** `set-screen-width' (`set-frame-width')
+
+** The following obsolete variables and varaliases have been removed
+(the appropriate new variable is given in parentheses):
+
+*** `checkdoc-minor-keymap' (`checkdoc-minor-mode-map')
+*** `vc-header-alist' (`vc-BACKEND-header')
+*** `directory-sep-char' (== ?/)
+*** `font-lock-defaults-alist' (`font-lock-defaults')
+*** `e' (`float-e').
 
-+++
-** The following obsolete (mostly since at least 21.1) variables and varaliases
-have been removed (the appropriate new variable is given in parentheses):
-checkdoc-minor-keymap (checkdoc-minor-mode-map),
-vc-header-alist (vc-BACKEND-header), directory-sep-char (== ?/)
-font-lock-defaults-alist (font-lock-defaults), and e (float-e).
-
----
 ** The following obsolete files were removed:
 sc.el, x-menu.el, rnews.el, rnewspost.el
 
----
-** The format of the finder-inf.el file has changed, since the finder
-mechanism is now based on the package concept.  The variable
-finder-package-info is replaced by package--builtins and finder-keywords-hash.
+** The format of the finder-inf.el file has changed, since the Finder
+mechanism is now based on the package system.  The variable
+`finder-package-info' is replaced by `package--builtins' and
+`finder-keywords-hash'.
 
----
 ** When generating autoloads, `update-directory-autoloads' no longer
 assumes every inspected file is in your `load-path'.  It instead
 generates relative names according to the current `load-path'.
@@ -1139,113 +1078,111 @@ generates relative names according to the current `load-path'.
 
 * Lisp changes in Emacs 24.1
 
-+++
 ** Code can now use lexical scoping by default instead of dynamic scoping.
-The `lexical-binding' variable lets code use lexical scoping for local
+The `lexical-binding' variable enables lexical scoping for local
 variables.  It is typically set via a file-local variable in the first
-line of the file, in which case it applies to all the code in that file.
-+++
+line of the file, in which case it applies to all the code in that
+file.
+
 *** `eval' takes a new optional argument `lexical' to choose the new lexical
 binding instead of the old dynamic binding mode.
-+++
+
 *** Lexically scoped interpreted functions are represented with a new form
 of function value which looks like (closure ENV ARGS &rest BODY).
 
 *** New macro `letrec' to define recursive local functions.
-+++
+
+*** `defvar' and `defconst' now mark the variable as special (dynamic).
+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.
 
-+++
 ** 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.
 
 ** Changes for bidirectional display and editing
 
-+++
 *** New function `current-bidi-paragraph-direction'.
-This returns the actual value of base direction of the paragraph at
-point.
+This returns the base direction of the paragraph at point.
 
-+++
 *** New function `bidi-string-mark-left-to-right'.
-Given a string containing characters from right-to-left (RTL) scripts,
-this function returns another string which can be safely inserted into
-a buffer, such that any following text will be always displayed to the
-right of that string.  (This works by appending the Unicode
-"LEFT-TO-RIGHT MARK" character when the argument string might need that.)
+Given a string containing characters from right-to-left scripts, this
+function returns another string which can be safely inserted into a
+buffer, such that any following text will be always displayed to the
+right of that string.  (This works by appending an invisible Unicode
+"LEFT-TO-RIGHT MARK" character if the argument string might need it.)
 
-This is useful when the buffer has overall left-to-right (LTR)
-paragraph direction and you need to insert a string whose contents and
-directionality are not known in advance, without disrupting the layout
-of the line.
+This is useful when the buffer has overall left-to-right paragraph
+direction and you need to insert a string whose contents are not known
+in advance, without disrupting the layout of the line.
 
 ** Window changes
-+++
+
 *** Window tree functions are accessible in Elisp.
 Functions are provided to return the parent, siblings or child windows
 of any window including internal windows (windows not associated with a
 buffer) in the window tree.
-+++
+
 **** New function `window-valid-p' gives non-nil for live and internal
 windows.
-+++
+
 **** Window manipulation can deal with internal windows.
 Many window handling functions like `split-window', `delete-window', or
 `delete-other-windows' as well as the window resizing functions can now
 act on any window including internal ones.
-+++
+
 *** window-total-height/-width vs window-body-height/-width.
 The function `window-height' has been renamed to `window-total-height'
 and `window-width' has been renamed to `window-body-width'.  The old
 names are provided as aliases.  Two new functions `window-total-width'
 and `window-body-height' are provided.
-+++
+
 *** Window parameters specific to window handling functions.
 For each window you can specify a parameter to override the default
 behavior of a number of functions like `split-window', `delete-window'
 and `delete-other-windows'.  The variable `ignore-window-parameters'
 allows to ignore processing such parameters.
-+++
+
 *** New semantics of third argument of `split-window'.
 The third argument of `split-window' has been renamed to SIDE and can be
 set to any of the values 'below, 'right, 'above, or 'left to make the
 new window appear on the corresponding side of the window that shall be
 split.  Any other value of SIDE will cause `split-window' to split the
 window into two side-by-side windows as before.
-+++
+
 *** Window resizing functions.
 A new standard function for resizing windows called `window-resize' has
 been introduced.  This and all other functions for resizing windows no
 longer delete any windows when they become too small.
-+++
+
 *** Deleting the selected window now selects the most recently selected
 live window on that frame instead.
-+++
+
 *** `adjust-window-trailing-edge' adjustments.
 `adjust-window-trailing-edge' can now deal with fixed-size windows and
 is able to resize other windows if a window adjacent to the trailing
 edge cannot be shrunk any more.  This makes its behavior more similar to
 that of Emacs 21 without compromising, however, its inability to delete
 windows which was introduced in Emacs 22.
-+++
+
 *** Window-local buffer lists.
 Windows now have local buffer lists.  This means that removing a buffer
 from display in a window will preferably show the buffer previously
 shown in that window with its previous window-start and window-point
 positions.  This also means that the same buffer may be automatically
 shown twice even if it already appears in another window.
-+++
+
 *** `switch-to-buffer' has a new optional argument FORCE-SAME-WINDOW,
 which if non-nil requires the buffer to be displayed in the currently
 selected window, signaling an error otherwise.  If nil, another window
 can be used, e.g. if the selected one is strongly dedicated.
-+++
+
 *** `split-window-vertically' and `split-window-horizontally' renamed
 to `split-window-below' and `split-window-right' respectively.
 The old names are kept as aliases.
-+++
+
 *** Display actions
 
 **** The second arg to `display-buffer' and `pop-to-buffer' is now
@@ -1263,32 +1200,21 @@ are user-customizable variables.
 
 See the docstring of `display-buffer' for details.
 
-+++
-*** New behavior of `quit-window'.
-The behavior of `quit-window' has been changed in order to restore the
-state before the last buffer display operation in that window.
-
-+++
-*** The new option `frame-auto-hide-function' lets you choose between
-iconifying or deleting a frame when burying a buffer shown in a dedicated
-frame or quitting a window showing a buffer in a frame of its own.
-
-+++
 *** New functions `window-state-get' and `window-state-put'.
 These functions allow to save and restore the state of an arbitrary
 frame or window as an Elisp object.
 
 ** Completion
 
-*** New variable completion-extra-properties used to specify extra properties
-of the current completion:
+*** New variable `completion-extra-properties' used to specify extra
+properties of the current completion:
 - :annotate-function, same as the old completion-annotate-function.
 - :exit-function, function to call after completion took place.
 
-*** Functions on completion-at-point-functions can return any of the properties
-valid for completion-extra-properties.
+*** Functions on `completion-at-point-functions' can return any of the
+properties valid for `completion-extra-properties'.
 
-*** completion-annotate-function is obsolete.
+*** `completion-annotate-function' is obsolete.
 
 *** New `metadata' method for completion tables.  The metadata thus returned
 can specify various details of the data returned by `all-completions':
@@ -1298,89 +1224,74 @@ can specify various details of the data returned by `all-completions':
 - `display-sort-function' to specify how to sort entries in *Completions*.
 - `cycle-sort-function' to specify how to sort entries when cycling.
 
-*** minibuffer-local-filename-must-match-map is not used any more.
-Instead, the bindings in minibuffer-local-filename-completion-map are
-combined with minibuffer-local-must-match-map.
+*** `minibuffer-local-filename-must-match-map' is not used any more.
+Instead, the bindings in `minibuffer-local-filename-completion-map'
+are combined with `minibuffer-local-must-match-map'.
 
 *** New variable `completing-read-function' allows overriding the
 behavior of `completing-read'.
 
-+++
 ** `glyphless-char-display' can now distinguish between graphical and
 text terminal display, via a char-table entry that is a cons cell.
 
-+++
-** `open-network-stream' can now be used to open an encrypted stream.
-It now accepts an optional `:type' parameter for initiating a TLS
-connection, directly or via STARTTLS.  To do STARTTLS, additional
-parameters (`:end-of-command', `:success', `:capabilities-command')
-must also be supplied.
-
-+++
-** pre/post-command-hook are not reset to nil upon error.
+** `pre-command-hook'/`post-command-hook' are not reset to nil on error.
 Instead, the offending function is removed.
 
 ** New hook types
 
-+++
 *** New function `run-hook-wrapped' for running an abnormal hook by
 passing the hook functions as arguments to a "wrapping" function.
 Like `run-hook-with-args-until-success', it stops at the first
 non-nil return value.
 
-+++
 *** New macro `with-wrapper-hook' for running an abnormal hook as a
 set of "wrapping" filters, similar to around advice.
 (A version of this macro was actually added in Emacs 23.2 but was not
 advertised at the time.)
 
 ** Debugger changes
-+++
+
 *** New macro `condition-case-unless-debug' (this was actually added in
 Emacs 23.1 as condition-case-no-debug, but not advertised)
-+++
+
 *** The macro `with-demoted-errors' was added in Emacs 23.1, but not advertised.
----
+
 *** Variable `stack-trace-on-error' removed.
-+++
+
 *** The debugger can now "continue" from an error, which means it will
 jump to the error handler as if the debugger had not been invoked
 instead of jumping all the way to the top-level.
-+++
+
 *** Set `debug-on-event' to enter the debugger on events like SIGUSR1.
 This can be useful when `inhibit-quit' is set.
 
-+++
 ** The new function `server-eval-at' allows evaluation of Lisp forms on
-named Emacs server instances, using TCP sockets.
+named Emacs server instances.
 
-+++
 ** `call-process' and `call-process-region' allow a `(:file "file")' spec
 to redirect STDOUT to a file.
 
-+++
-** The function format-time-string now supports the %N directive, for
-higher-resolution time stamps.
+** The function `format-time-string' now supports the %N directive,
+for higher-resolution time stamps.
 
 ** New input reading functions
-+++
+
 *** New function `read-char-choice' reads a restricted set of
 characters, discarding any inputs not inside the set.
-+++
+
 *** The command `read-color' now requires a match for a color name
 or RGB triplet, instead of signaling an error if the user provides
 invalid input.
----
+
 **** `facemenu-read-color' is now an alias for `read-color'.
 
-+++
 ** `image-library-alist' is renamed to `dynamic-library-alist'.
 The variable is now used to load all kind of supported dynamic libraries,
 not just image libraries.  The previous name is still available as an
 obsolete alias.
 
 ** Syntax parsing changes
-+++
+
 *** New variable `syntax-propertize-function'.
 This replaces `font-lock-syntactic-keywords' which is now obsolete.
 This allows syntax-table properties to be set independently from font-lock:
@@ -1390,110 +1301,116 @@ syntax-propertize-extend-region-functions, as well as two helper functions:
 syntax-propertize-via-font-lock to reuse old font-lock-syntactic-keywords
 as-is; and syntax-propertize-rules which provides a new way to specify
 syntactic rules.
-+++
+
 *** Syntax tables support a new "comment style c" additionally to style b.
 
-+++
-** New hook post-self-insert-hook run at the end of self-insert-command.
+** New hook `post-self-insert-hook', run after `self-insert-command'.
 
----
 ** frame-local variables cannot be let-bound any more.
 
 ** Major and minor mode changes
-+++
+
 *** `set-auto-mode' now respects mode: local variables at the end of files,
 as well as those in the -*- line.
-+++
+
 *** `prog-mode' is a new major mode from which programming modes
 should be derived.
-+++
+
 **** `prog-mode-hook' can be used to enable features for programming
 modes, e.g. (add-hook 'prog-mode-hook 'flyspell-prog-mode) to enable
 on-the-fly spell checking for comments and strings.
-+++
+
 *** New hook `change-major-mode-after-body-hook', run by
 `run-mode-hooks' just before any other mode hooks.
-+++
+
 *** Enabled globalized minor modes can be disabled in specific major modes.
 If the global mode is global-FOO-mode, then run (FOO-mode -1) in the
 major mode's hook, where FOO-mode toggles the mode on a per-buffer basis.
-+++
+
 *** `define-minor-mode' accepts new keywords :variable, :after-hook.
 
-+++
-** `delete-file' and `delete-directory' now accept optional arg TRASH.
+** File-handling changes
+
+*** `delete-file' and `delete-directory' now accept optional arg TRASH.
 Trashing is performed if TRASH and `delete-by-moving-to-trash' are
 both non-nil.  Interactively, TRASH defaults to t, unless a prefix
 argument is supplied (see Trash changes, above).
 
-+++
-** New file predicate functions: file-equal-p, file-subdir-of-p.
+*** New file predicates: `file-equal-p', `file-in-directory-p'.
 
-+++
 ** Tool-bars can display separators.
 Tool-bar separators are handled like menu separators in menu-bar maps,
 i.e. via menu entries of the form `(menu-item "--")'.
 
 ** Image API
 
-+++
 *** Animated images support (currently animated gifs only).
 
-+++
 **** `image-animated-p' returns non-nil if an image can be animated.
 
-+++
 **** `image-animate' animates a supplied image spec.
 
-+++
 **** `image-animate-timer' returns the timer object for an image that
 is being animated.
 
----
 *** `image-extension-data' has been renamed to `image-metadata'.
 The old name is an obsolete alias to the new one.
 
-+++
 *** Image mode can view any image type that ImageMagick supports.
 This requires Emacs to be built with ImageMagick support.
-If your Emacs has ImageMagick support, then the function
-`imagemagick-types' is defined, and returns a list of image file
-extensions that your installation of ImageMagick supports.  The
-function `imagemagick-register-types' enables ImageMagick support for
-these image types, minus those listed in `imagemagick-types-inhibit'.
-Visiting one of these file types will then use Image mode.
-
----
-*** New commands to resize and rotate images in Image mode.
-These require Emacs to be built with ImageMagick support.
-image-transform-fit-to-height, image-transform-fit-to-width,
-image-transform-set-rotation, image-transform-set-scale.
+
+**** New function `imagemagick-types', defined if ImageMagick support
+is enabled, returns a list of image file extensions that your
+ImageMagick installation supports.
+
+**** New function `imagemagick-register-types' enables ImageMagick
+image types in Image mode and in `create-image' and other helper
+functions.
+
+**** New option `imagemagick-types-inhibit' excludes certain
+ImageMagick image types from `imagemagick-register-types'.
+
+**** With ImageMagick support, there are extra Image mode commands to
+resize and rotate images: `image-transform-fit-to-height',
+`image-transform-fit-to-width', `image-transform-set-rotation', and
+`image-transform-set-scale'.
+
+** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and
+passes it to the mail user agent function.  This argument specifies an
+action for returning to the caller after finishing with the mail.  For
+example, this is used by Rmail to optionally delete a mail window.
 
 ** XML and HTML parsing
-If Emacs is compiled with libxml2 support, there are two new functions:
-`libxml-parse-html-region' (which parses "real world" HTML) and
-`libxml-parse-xml-region' (which parses XML).  Both return an Emacs
-Lisp parse tree.
+If Emacs is compiled with libxml2 support, there are two new
+functions: `libxml-parse-html-region' (which parses "real world" HTML)
+and `libxml-parse-xml-region' (which parses XML).  Both return an
+Emacs Lisp parse tree.
+
+** Networking and encryption changes
 
-FIXME: These should be front-ended by xml.el.
+*** `open-network-stream' can now be used to open an encrypted stream.
+It now accepts an optional `:type' parameter for initiating a TLS
+connection, directly or via STARTTLS.  To do STARTTLS, additional
+parameters (`:end-of-command', `:success', `:capabilities-command')
+must also be supplied.
 
-** GnuTLS
+*** New library gnutls.el.
+The new function `gnutls-available-p' returns non-nil if Emacs is
+built with GnuTLS support.  The main entry points are
+`open-gnutls-stream' and `gnutls-negotiate'.  It's easiest to use
+these functions through `open-network-stream', because that can
+upgrade connections through STARTTLS opportunistically or use plain
+SSL, depending on your needs.  For debugging, set `gnutls-log-level'
+greater than 0.
 
-*** New library `gnutls.el'.
-This requires Emacs to have been built with GnuTLS support.
-If your Emacs has GnuTLS support, the function gnutls-available-p is
-defined and returns non-nil.  The main functions are `open-gnutls-stream'
-and `gnutls-negotiate'.  It's easiest to use these functions through
-`open-network-stream' because it can upgrade connections through
-STARTTLS opportunistically or use plain SSL, depending on your needs.
-For debugging, set `gnutls-log-level' greater than 0.
+*** New primitive `secure-hash' that supports many secure hash algorithms:
+md5, sha1, sha2, sha224, sha256, sha384, and sha512.  The lisp library
+sha1.el has been removed.  The `sha1' feature is provided by default.
 
 ** Isearch
 
----
 *** New hook `isearch-update-post-hook' that runs in `isearch-update'.
 
-+++
 ** Progress reporters can now "spin".
 The MIN-VALUE and MAX-VALUE arguments of `make-progress-reporter' can
 now be nil, or omitted.  This makes a "non-numeric" reporter.  Each
@@ -1501,89 +1418,72 @@ time you call `progress-reporter-update' on that progress reporter,
 with a nil or omitted VALUE argument, the reporter message is
 displayed with a "spinning bar".
 
-+++
 ** New variable `revert-buffer-in-progress-p' is true while a buffer is
 being reverted, even if the buffer has a local `revert-buffer-function'.
 
----
 ** New variables `delayed-warnings-list' and `delayed-warnings-hook'.
 If delayed-warnings-list is non-nil, the command loop calls
-delayed-warnings-hook after post-command-hook.  At present, this is
-only used by Emacs on some platforms to display warnings during
-startup, which might otherwise not be noticed.  This uses the functions
-display-delayed-warnings and collapse-delayed-warnings.
+`delayed-warnings-hook' after `post-command-hook'.  At present, this
+is only used by Emacs on some platforms to display warnings during
+startup, which might otherwise not be noticed.  This uses the
+functions `display-delayed-warnings' and `collapse-delayed-warnings'.
 
----
 ** rx.el has a new `group-n' construct for explicitly numbered groups.
 
-+++
 ** New function `make-composed-keymap' that constructs a new keymap
 from multiple input maps.  You can use this to make a keymap that
 inherits from multiple maps, eg:
  (set-keymap-parent newmap (make-composed-keymap othermap parent))
 
-+++
+** New function `string-prefix-p'.
+(This was actually added in Emacs 23.2 but was not advertised at the time.)
+
 ** New reader macro ## that stands for the empty symbol.
 This means that the empty symbol can now be read back.  Also, #: by itself
 (when not immediately followed by a possible symbol character) stands for
 an empty uninterned symbol.
 
-+++
 ** New math functions `isnan', `copysign', `frexp', `ldexp'.
 
-** Obsolete functions and variables
+** The following functions and variables are obsolete:
 
----
 *** `tooltip-use-echo-area' is obsolete.
 Rather than setting this to t, disable Tooltip mode instead.
 
-+++
 *** buffer-substring-filters is obsolete.
 Use `filter-buffer-substring-functions' instead.
 
----
 *** `byte-compile-disable-print-circle' is obsolete.
 
----
 *** `deferred-action-list' and `deferred-action-function' are obsolete.
 Use `post-command-hook' instead.
 
-+++
 *** `font-lock-maximum-size' is obsolete.
 
 
 * Changes in Emacs 24.1 on non-free operating systems
 
----
 ** On MS Windows, Emacs warns when using the obsolete init file _emacs,
 and also when HOME is set to C:\ by default.
 
 ** New configure.bat options
 
-+++
 *** --enable-checking builds Emacs with extra runtime checks.
 
-+++
 *** --distfiles specifies files to be included in binary distribution.
 
-+++
 *** --without-gnutls disables automatic GnuTLS detection.
 
-+++
 *** --lib for general library linkage, works with the USER_LIBS build variable.
 
-+++
 ** New make target `dist' to create binary distribution for MS Windows.
 
----
 ** The Lisp function `w32-default-color-map' is now obsolete.
 (It is only used internally in the Emacs C code.)
 
-+++
 ** Customize ns-auto-hide-menu-bar to have the menu-bar hidden, but
 reappear on mouse-over.  (Requires OS X 10.6 or later.)
 
-+++
 ** On Mac OS X, dragging a file into Emacs visits the file, like on
 other platforms, rather than inserting its contents into the buffer.
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 75627f084cd..cc591d6e1fe 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -302,6 +302,12 @@ Help mode due to setting `temp-buffer-show-hook' rather than using
 
 ** Keyboard problems
 
+*** Unable to enter the M-| key on some German keyboards.
+Some users have reported that M-| suffers from "keyboard ghosting".
+This can't be fixed by Emacs, as the keypress never gets passed to it
+at all (as can be verified using "xev").  You can work around this by
+typing `ESC |' instead.
+
 *** "Compose Character" key does strange things when used as a Meta key.
 
 If you define one key to serve as both Meta and Compose Character, you
@@ -1673,6 +1679,23 @@ recommended way of turning on Font-lock is by typing "M-x
 global-font-lock-mode RET" or by customizing the variable
 `global-font-lock-mode'.
 
+** Unexpected characters inserted into the buffer when you start Emacs.
+See eg http://debbugs.gnu.org/11129
+
+This can happen when you start Emacs in -nw mode in an Xterm.
+For example, in the *scratch* buffer, you might see something like:
+
+  0;276;0c
+
+This is more likely to happen if you are using Emacs over a slow
+connection, and begin typing before Emacs is ready to respond.
+
+This occurs when Emacs tries to query the terminal to see what
+capabilities it supports, and gets confused by the answer.
+To avoid it, set xterm-extra-capabilities to a value other than
+`check' (the default).  See that variable's documentation (in
+term/xterm.el) for more details.
+
 * Runtime problems specific to individual Unix variants
 
 ** GNU/Linux
@@ -2235,10 +2258,10 @@ printer drivers. A workaround on MS-Windows is to use Windows' basic
 built in editor to print (this is possibly the only useful purpose it
 has):
 
-(setq printer-name "")         ;; notepad takes the default
-(setq lpr-command "notepad")   ;; notepad
-(setq lpr-switches nil)        ;; not needed
-(setq lpr-printer-switch "/P") ;; run notepad as batch printer
+(setq printer-name "")         ; notepad takes the default
+(setq lpr-command "notepad")   ; notepad
+(setq lpr-switches nil)        ; not needed
+(setq lpr-printer-switch "/P") ; run notepad as batch printer
 
 ** Antivirus software interacts badly with the MS-Windows version of Emacs.
 
diff --git a/etc/org/OrgOdtContentTemplate.xml b/etc/org/OrgOdtContentTemplate.xml
index f50588b2adb..cd7ff0e1564 100644
--- a/etc/org/OrgOdtContentTemplate.xml
+++ b/etc/org/OrgOdtContentTemplate.xml
@@ -46,8 +46,61 @@
 
   <!-- automatic styles -->
   <office:automatic-styles>
+    <!-- Section styles -->
+    <style:style style:name="OrgIndentedSection-Level-1" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="1.281cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-2" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="1.905cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-3" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="2.54cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-4" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="3.175cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-5" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="3.81cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-6" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="4.445cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-7" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="5.08cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-8" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="5.715cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-9" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="6.35cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+    <style:style style:name="OrgIndentedSection-Level-10" style:family="section">
+      <style:section-properties text:dont-balance-text-columns="false" fo:margin-left="6.985cm" fo:margin-right="0cm" style:editable="false">
+        <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+      </style:section-properties>
+    </style:style>
+
+    <!-- Table styles -->
     <style:style style:name="OrgTable" style:family="table">
-      <style:table-properties style:rel-width="90%" fo:margin-top="0cm" fo:margin-bottom="0.20cm" table:align="center"/>
+      <style:table-properties style:rel-width="96%" fo:margin-top="0cm" fo:margin-bottom="0.20cm" table:align="center"/>
     </style:style>
 
     <style:style style:name="OrgTableColumn" style:family="table-column">
diff --git a/etc/org/OrgOdtStyles.xml b/etc/org/OrgOdtStyles.xml
index 4fb282064b0..470b7b134a7 100644
--- a/etc/org/OrgOdtStyles.xml
+++ b/etc/org/OrgOdtStyles.xml
@@ -718,15 +718,75 @@
   <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
  </office:styles>
  <office:automatic-styles>
-  <style:page-layout style:name="Mpm1">
+  <style:style style:name="MP1" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+  </style:style>
+  <style:page-layout style:name="Mpm1" style:page-usage="mirrored">
    <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
-    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="none" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+   </style:page-layout-properties>
+   <style:header-style/>
+   <style:footer-style>
+    <style:header-footer-properties fo:min-height="0.6cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm" style:dynamic-spacing="false"/>
+   </style:footer-style>
+  </style:page-layout>
+  <style:page-layout style:name="Mpm2">
+   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
+    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
    </style:page-layout-properties>
    <style:header-style/>
    <style:footer-style/>
   </style:page-layout>
+  <style:page-layout style:name="Mpm3" style:page-usage="mirrored">
+   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="i" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
+    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+   </style:page-layout-properties>
+   <style:header-style/>
+   <style:footer-style>
+    <style:header-footer-properties fo:min-height="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm"/>
+   </style:footer-style>
+  </style:page-layout>
+  <style:page-layout style:name="Mpm4" style:page-usage="right">
+   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" fo:background-color="transparent" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
+    <style:background-image/>
+    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+   </style:page-layout-properties>
+   <style:header-style/>
+   <style:footer-style>
+    <style:header-footer-properties fo:min-height="0.6cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm" style:dynamic-spacing="false"/>
+   </style:footer-style>
+  </style:page-layout>
+  <style:page-layout style:name="Mpm5" style:page-usage="mirrored">
+   <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
+    <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+   </style:page-layout-properties>
+   <style:header-style/>
+   <style:footer-style>
+    <style:header-footer-properties fo:min-height="0.6cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm" style:dynamic-spacing="false"/>
+   </style:footer-style>
+  </style:page-layout>
  </office:automatic-styles>
  <office:master-styles>
-  <style:master-page style:name="Standard" style:page-layout-name="Mpm1"/>
+  <style:master-page style:name="Standard" style:page-layout-name="Mpm1">
+   <style:footer>
+    <text:p text:style-name="MP1"><text:page-number text:select-page="current"></text:page-number></text:p>
+   </style:footer>
+  </style:master-page>
+  <style:master-page style:name="OrgTitlePage" style:page-layout-name="Mpm2" style:next-style-name="OrgFrontMatterPage"/>
+  <style:master-page style:name="OrgFrontMatterPage" style:page-layout-name="Mpm3">
+   <style:footer>
+    <text:p text:style-name="MP1"><text:page-number text:select-page="current"/></text:p>
+   </style:footer>
+  </style:master-page>
+  <style:master-page style:name="OrgFirstPage" style:page-layout-name="Mpm4" style:next-style-name="OrgPage">
+   <style:footer>
+    <text:p text:style-name="MP1"><text:page-number text:select-page="current"/></text:p>
+   </style:footer>
+  </style:master-page>
+  <style:master-page style:name="OrgPage" style:page-layout-name="Mpm5">
+   <style:footer>
+    <text:p text:style-name="MP1"><text:page-number text:select-page="current"/></text:p>
+   </style:footer>
+  </style:master-page>
  </office:master-styles>
 </office:document-styles>
diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf
index 92df030d4d2..201bb892dc0 100644
--- a/etc/refcards/orgcard.pdf
+++ b/etc/refcards/orgcard.pdf
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 64200742ae9..d78f2a38021 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,6 +1,6 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{7.8.02}
-\def\versionyear{2011}          % latest update
+\def\orgversionnumber{7.8.07}
+\def\versionyear{2012}          % latest update
 \def\year{2012}                 % latest copyright year
 
 %**start of header