Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324

18 files changed, 478 insertions, 123 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index ef3b8ccd927..655ce0c74fd 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,21 @@
+2008-01-25  Michael Olson  <mwolson@gnu.org>
+
+        * ERC-NEWS: Update for ERC 5.3 release candidate.
+
+2008-01-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * DEVEL.HUMOR: New entry.
+
+2008-01-18  Carsten Dominik  <dominik@science.uva.nl>
+
+        * refcards/orgcard.tex: Update to Org-mode version 5.19.
+
+2008-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * MACHINES: Add an explicit list of platforms that are no longer
+        supported.
+        * NEWS: Refer to this list.
+
 2008-01-08  Glenn Morris  <rgm@gnu.org>
 
         * calccard.tex, cs-dired-ref.tex, cs-refcard.tex, cs-survival.tex:
@@ -24,7 +42,7 @@
 
         * images/icons/emacs_16.png, images/icons/emacs_24.png
         * images/icons/emacs_32.png, images/icons/emacs_48.png: Rename to
-        hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png
+        hicolor/16x16/apps/emacs.png, hicolor/24x24/apps/emacs.png,
         hicolor/32x32/apps/emacs.png and hicolor/48x48/apps/emacs.png.
 
         * images/icons/README (Author): Update for renaming.
diff --git a/etc/DEVEL.HUMOR b/etc/DEVEL.HUMOR
index 10353c6517a..091c267579b 100644
--- a/etc/DEVEL.HUMOR
+++ b/etc/DEVEL.HUMOR
@@ -184,3 +184,13 @@ constants with anything like the universality of e and pi."
   "[...] So please do not delete anything."
   "Done."
                                               -- RMS and David Kastrup
+
+----------------------------------------------------------------------
+
+  "I guess that can work in some circumstances, but it bypasses the
+printer drivers.  Couldn't that lead to problems for the printer
+drivers?"
+  "Current research is that software does not suffer feelings of
+depression or loneliness when it is left out of the picture, so I
+wouldn't worry about it too much."
+                                -- Lennart Borgman and Jason Rumney
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 450b1cdcf83..ec348a450f6 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -15,14 +15,237 @@ of ERC that comes with Emacs.
 `erc-join-channel' now accepts a prefix-argument to prompt for the key
 when channels are protected by keywords.
 
+** ERC will now automatically determine which nick prefixes are valid
+when joining a server.
+
+** Figure out which directory contains startup files when looking for
+.erc.el.  For Emacs this is usually ~/.emacs.d, and for XEmacs this is
+usually ~/.xemacs.
+
+** Fix bug with view-mode when running erc-toggle-debug-irc-protocol.
+
+** Permit several commands to be run even when the server connection is dead.
+This includes /CLEAR, /COUNTRY, /HELP, /LASTLOG, /QUIT, /GQUIT,
+/RECONNECT, /SERVER, and /SET.
+
+** Make /RECONNECT work better when the server connection is dead.
+Also, handle case where the server buffer has been killed.
+
+** Better handle interaction with /RECONNECT and indefinite reconnect
+attempts.  Display message which tells the user that they can stop the
+reconnect attempts by killing the server buffer.
+
+** New option `erc-reuse-frames' determines whether new frames are always
+created.  It defaults to not creating a new frame for an ERC buffer if
+there is already a window displaying it.  This only has an effect when
+the `erc-join-buffer' option is set to 'frame.
+
+** New command /ME'S handles the case where someone types "/me's" in an
+ERC buffer.  It concatenates the text " 's" to the beginning of the
+input and then sends the result like a normal /ME command.
+
+** Fix bug where some messages were being sent to the server too soon.
+In the past, this may have resulted in strange problems like seeing
+the connection attempt stall, which may have especially affected
+spotty or traffic-shaped connections.
+
+** Handle 307 (nick has identified) responses from the server.
+
+** Display a less-confusing message if the connection attempt fails.
+
+** On a tty, make sure that notices are displayed in blue rather than pink.
+
+** By default, open query buffers that are initiated by others in a new
+unselected window.  This may be changed by customizing the
+`erc-auto-query' option.  This should make ERC more friendly to new
+users.
+
+** New option `erc-query-display' indicates how to display a query buffer
+that is made using the /QUERY command.  The default is to display the
+query in a new selected window.
+
+** By default, display network name rather than server name in the modeline.
+This should ERC use less space in the modeline.  To get the old
+behavior back, set `erc-mode-line-format' to "%s %a".
+
+** New option `erc-remove-parsed-property' determines whether to remove
+the 'erc-parsed property.  This should save some memory in channels
+with large amounts of text on screen.  It is enabled by default.
+
+** Modules newly enabled by default
+
+*** move-to-prompt: Move to the prompt when typing text.
+*** networks: Provide data about IRC networks.
+
+** New formatting variables allowed in `erc-format-network':
+
+*** `%N': the name of the network.
+*** `%S': much like %s, but let the network name trump the server name.
+
+** Compatibility with old releases
+
+*** In `erc-server-coding-system' and `erc-coding-system-for-target', pass
+the `target' argument as the first and only argument to the function
+named by these options.
+
+*** In `erc-track-faces-priority-list', permit list entries to be lists of
+faces.  This can be used to differentiate between, for example,
+buttons in default text and buttons in notices.
+
+*** The `erc-assert' function has been removed in favor of using `assert'
+from cl-macs.el.
+
+*** If your application uses the 'erc-parsed text property outside of
+the insert hooks, you will need to set `erc-remove-parsed-property'
+to nil.
+
 ** Changes and additions to modules
 
+*** BBDB (erc-bbdb.el)
+
+**** Work around bug in XEmacs 21.4 that causes an error to be thrown when
+the first argument to `run-at-time' is nil.
+
+*** Button (erc-button.el)
+
+**** Recognize parentheses that are part of URLs.
+
+**** When in a channel, only buttonize nicks from that channel.
+
+*** DCC support (erc-dcc.el)
+
+**** Turn this into the "dcc" module for ERC, so that it can be more
+easily enabled.
+
+**** New option `erc-dcc-listen-host' determines which IP address to listen
+on for outside connection attempts.
+
+**** New option `erc-dcc-public-host' determines which IP address to advertise
+when sending a file.  This is useful for people who are on a local
+subnet.  Together, these two options replace the `erc-dcc-host'
+option.
+
+**** New option `erc-dcc-receive-cache' indicates how much of a received
+file to store in an Emacs buffer before flushing it to disk.  The
+default is 0.5 MB.
+
+**** Save only parts of received files in buffers, writing repeatedly to
+disk after we get at least `erc-dcc-receive-cache' bytes.  This allows
+users to receive very large files without running out of memory.
+
+**** Rename `erc-verbose-dcc' option to `erc-dcc-verbose' and also
+default it to nil.
+
+**** Fix edge case in erc-dcc-send-sentinel.
+
+**** If client confirms too much, then display byte count and kill the
+file buffer.
+
+*** Goodies (erc-goodies.el)
+
+**** New module move-to-prompt causes the point to be moved to the prompt
+if a user tries to type elsewhere in the buffer, and then inserts
+their keystrokes after the prompt.  It is enabled by default.
+
+**** New module keep-place keeps your place in unvisited ERC buffers
+when new messages arrive.
+
+**** Enable scroll-to-bottom in all ERC buffers when the module is enabled,
+rather than having the user do it manually.
+
+**** Fix bug with buffer ordering and scroll-to-bottom module.
+
+**** In the unmorse module, handle the morse code style that has "/ " at
+the end of every letter.
+
+*** Identd (erc-identd.el)
+
+**** Fix bad behavior when closing the identd process.
+
+*** Channel lists (erc-list.el)
+
+**** Replace the old module with a rewritten one, so that we can include
+it with Emacs.  The old version of erc-list.el has been renamed to
+erc-list-old.el, and is available as the list-old module.
+
+The new version does not yet have support for XEmacs.
+
+**** Don't display lots of output in the server buffer when running /LIST.
+
+*** Logging (erc-log.el)
+
+**** Permit the `erc-log-channels-directory' option to be set to a function
+name.  This makes it easier to write custom functions that determine
+where log files should be placed.
+
+**** New option `erc-log-filter-function' specifies the function to call
+for filtering text before writing it to a log file.  By default, no
+filtering is performed.
+
+*** Networks (erc-networks.el)
+
+**** Turn this into the "networks" module for ERC, so that it can be more
+easily enabled.  Enable it by default.
+
+**** Add support for Rizon.
+
+*** Internet services / Nickserv (erc-services.el)
+
+**** New hook option `erc-nickserv-identified-hook' is run after NickServ
+acknowledges a successful identification.
+
+**** Add support for the GRnet and Rizon networks.
+
+*** Timestamps (erc-stamp.el)
+
+**** By default, place timestamps on both the left and the right.
+The left timestamps appear once a day, and the right timestamps appear
+once a minute when new messages arrive.  To change this, customize the
+`erc-insert-timestamp-function' and
+`erc-insert-away-timestamp-function' options.
+
 *** Channel tracking (erc-track.el)
 
-If erc-track-position-in-mode-line is set to nil, the tracking
-information won't be shown in the mode line, which is a change
-from the previous behavior of showing it "After all other
-information".
+**** If `erc-track-position-in-mode-line' is set to nil, the tracking
+information won't be shown in the mode line, which is a change from
+the previous behavior of showing it "After all other information".
+
+If this variable is set to t, then the information will be added to
+the very end of the mode line.
+
+**** New option `erc-track-remove-disconnected-buffers' controls whether
+buffers associated with a server that is disconnected should be
+removed from the modified buffers list.  The default is to keep them
+in the list.
+
+**** New hook option `erc-track-list-changed-hook' is run whenever the
+contents of the modified channels list changes.  It is useful for
+people who use a separate mechanism to provide notification of channel
+activity.
+
+**** The `erc-track-switch-direction' option now can be set to the value
+'importance.  If set to this value, ERC will switch to channels in
+order of importance, which is determined by the position of the
+channel's face in `erc-track-faces-priority-list'.
+
+**** Activate erc-track-minor-mode earlier in the connection process.
+
+**** Don't track buttons in notices.
+
+**** Get a rough idea for which channels are currently active by
+switching between several normal conversation faces in the modeline.
+This behavior can be modified by changing the new
+`erc-track-faces-normal-list' option.
+
+**** Ignore display of who set the default channel topic and listing of
+users on the current channel.  Customize the `erc-track-exclude-types'
+option to indicate the types of messages to exclude.  These two
+message types are "333" and "353", respectively.
+
+*** Support for acting as an XDCC file-server (erc-xdcc.el)
+
+**** Turn this into the "xdcc" module for ERC, so that it can be more
+easily enabled.
 
 * Changes in ERC 5.2
 
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index ee36984393d..5e41dd0bc4f 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -58,7 +58,7 @@ Articles::.
 
 ** International host names (IDNA) can now be decoded inside article bodies
 using `W i' (`gnus-summary-idna-message').  This requires that GNU Libidn
-(<http://www.gnu.org/software/libidn/>) has been installed.
+(`http://www.gnu.org/software/libidn/') has been installed.
 
 ** The non-ASCII group names handling has been much improved.  The back
 ends that fully support non-ASCII group names are now `nntp', `nnml',
@@ -106,13 +106,24 @@ From Newsgroups::.
 
 ** You can replace MIME parts with external bodies.  See
 `gnus-mime-replace-part' and `gnus-article-replace-part'.  *Note MIME
-Commands::, *Note Using MIME::.
+Commands::, *note Using MIME::.
 
 ** The option `mm-fill-flowed' can be used to disable treatment of
 format=flowed messages.  Also, flowed text is disabled when sending
 inline PGP signed messages.  *Note Flowed text: (emacs-mime)Flowed text.
 (New in Gnus 5.10.7)
 
+** Now the new command `S W' (`gnus-article-wide-reply-with-original') for
+a wide reply in the article buffer yanks a text that is in the active
+region, if it is set, as well as the `R'
+(`gnus-article-reply-with-original') command.  Note that the `R' command
+in the article buffer no longer accepts a prefix argument, which was
+used to make it do a wide reply.  *Note Article Keymap::.
+
+** The new command `C-h b' (`gnus-article-describe-bindings') used in the
+article buffer now shows not only the article commands but also the real
+summary commands that are accessible from the article buffer.
+
 
 
 * Changes in Message mode
diff --git a/etc/MACHINES b/etc/MACHINES
index 66a55ff6363..0e55fa76ead 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -24,6 +24,9 @@ file, and then edit the `configure' script to tell it which
 configuration name(s) should select your new machine description and
 system description files.
 
+Some obsolete platforms are unsupported beginning with Emacs 23.1, see
+the full list at the end of this file.
+
 
 Here are the configurations Emacs is intended to work with, with the
 corresponding configuration names.  You can postpend version numbers
@@ -937,6 +940,81 @@ X86_64 GNU/Linux
 
   (using the location of the 32-bit X libraries on your system).
 
+Support for the following obsolete platforms was removed in Emacs 23.1
+(the names in parentheses state the files in src/ that were removed):
+
+  Apollo SR10.x (unexapollo.c)
+  Convex (unexconvex.c and m/convex.c)
+  Xenix (unexenix.c and s/xenix.h)
+  Iris  (unexmips.c m/iris4d.h m/irist.h s/iris3-5.h s/iris3-6.h)
+  Gould (m/gould*)
+  Siemens machines running Sinix (unexsni.c)
+  Harris CXUX (s/cxux*)
+  ESIX, a variant of v.5.3 for the 386 (s/esix*)
+  Interactive (ISC) Unix (s/isc*)
+  Sony News (s/newsos*)
+  RTU 3.0, ucb universe (s/rtu.h)
+  UniSoft's UniPlus 5.2 (s/uniplus.h)
+  UMAX (s/umax.h)
+  AT&T UNIX PC model 7300 (m/7300.h)
+  Acorn
+  Alliant (m/alliant*)
+  Amdahl (m/amdahl*)
+  Altos 3068 Unix System V Release 2 (m/altos.h)
+  Apollo (m/apollo.h)
+  AT&T 3b (m/att3b.h)
+  Aviion (m/aviion*)
+  Celerity (m/celerity.h)
+  clipper (m/clipper.h)
+  convergent S series (m/cnvrgnt.h)
+  cydra (m/cydra5.h)
+  Motorola System V/88 machines (m/delta88k.h)
+  Bull DPX/2 range (m/dpx2.h)
+  Dual machines using unisoft port (m/dual.h)
+  Elxsi machine (running enix) (m/elxsi.h)
+  Fujitsu F301 machine (m/f301.h)
+  i860 (m/i860.h)
+  ibm ps/2 aix386 (m/ibmps2-aix.h)
+  ISI 68000's (m/is*)
+  Masscomp 5000 series running RTU, ucb universe (m/masscomp.h)
+  Megatest 68000's (m/mega68.h)
+  Whitechapel Computer Works MG1 (ns16000 based) (m/mg1.h)
+  Harris Night Hawk Series 1200 and Series 3000 (m/nh3000.h m/nh4000.h)
+  ns16000 (m/ns16000.h)
+  National Semiconductor 32000, running Genix (m/ns32000.h)
+  TI Nu machines using system V (m/nu.h)
+  HLH Orion (m/orion.h m/orion105.h)
+  Paragon i860 (m/paragon.h)
+  PFU A-series (m/pfa50.h)
+  Plexus running System V.2 (m/plexus.h)
+  pyramid. (m/pyramid.h)
+  sh3el (m/sh3el.h)
+  Bull SPS-7 (m/sps7.h)
+  Hitachi SR2001/SR2201 (m/sr2k.h)
+  Stride (m/stride.h)
+  Sun 1 (m/sun1.h)
+  Sun 2 (m/sun2.h)
+  SEQUENT SYMMETRY  (m/symmetry.h)
+  Tadpole 68k machines (m/tad68k.h)
+  tahoe (m/tahoe.h)
+  targon31 (m/targon31.h)
+  Tektronix* (m/tek4300.h m/tekxd88.h)
+  NCR Tower 32 running System V.2 (m/tower32.h)
+  NCR Tower 32 running System V.3 (m/tower32v3.h)
+  U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30) (m/ustation.h)
+  Wicat (m/wicat.h)
+  Honeywell XPS100 running UNIX System V.2 (m/xps100.h)
+  Data General's DG/UX  (s/dgux*)
+  Irix before version 6
+  osf1 (s/osf*)
+  SunOS4 (s/sunos*)
+  RISCiX (s/riscix*)
+  SCO 3.2v4 (s/sco4.h)
+  SCO 3.2v5 (s/sco5.h)
+  Sun's 386-based RoadRunner (m/sun386.h)
+  Sun3 machines (m/sun3*)
+  Integrated Solutions 386 machine (m/is386.h)
+
 
 Local variables:
 mode: text
diff --git a/etc/NEWS b/etc/NEWS
index 90cc3efaf8d..e9e281e9bca 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to emacs-pretest-bug@gnu.org.
@@ -38,6 +38,9 @@ a GIF library.
 
 ** Support for Sun windows has been removed.
 
+** Support for many obsolete platforms has been removed.
+See the list at the end of etc/MACHINES for details.
+
 ** The `emacstool' utility has been removed.
 
 ** The new configuration option "--with-dbus" enables D-Bus language
@@ -220,6 +223,9 @@ same host, based on messages.  See the manual for further details.
 
 * Changes in Specialized Modes and Packages in Emacs 23.1
 
+** ChangeLog now has function bound to C-c C-f that finds the file in
+the current log entry.
+
 ** abbrev was rewritten in Elisp and extended with more flexibility.
 *** New functions: abbrev-get, abbrev-put, abbrev-table-get, abbrev-table-put,
     abbrev-table-p.
@@ -277,6 +283,9 @@ considered for update.
 ** eldoc highlights the function argument under point
 with the face `eldoc-highlight-function-argument'.
 
+** hide-ifdef-mode permits to shadow ifdef-blocks instead of hiding them.
+See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'.
+
 +++
 ** defcustom accepts new keyword arguments, `:safe' and `:risky', which
 set a variable's `safe-local-variable' and `risky-local-variable' property.
@@ -313,13 +322,15 @@ tex-suscript-height-minimum.
 
 ** BibTeX mode:
 
+*** New command `bibtex-initialize' (re)initializes BibTeX buffers. 
+
 *** New `bibtex-entry-format' options `whitespace', `braces', and
 `string', disabled by default.
 
 *** New variable `bibtex-cite-matcher-alist' contains rules to
 identify cited keys in BibTeX entries, used by `bibtex-find-crossref'.
 
-*** Command `bibtex-url' now allows multiple URLs per entry.
+*** Command `bibtex-url' allows multiple URLs per entry.
 
 +++
 ** Tramp
@@ -419,11 +430,6 @@ checking/manipulating elements directly, use the new functions
 `byte-compile-warning-enabled-p', `byte-compile-disable-warning', and
 `byte-compile-enable-warning.'
 
-** shell.el no longer defines the aliases `dirtrack-toggle' and
-`dirtrack-mode' for `shell-dirtrack-mode'.  These names were removed
-because they clash with commands provided by dirtrack.el.  Use
-`shell-dirtrack-mode' instead.
-
 
 * Lisp Changes in Emacs 23.1
 
@@ -437,6 +443,11 @@ search and match primitives from changing the match data.
 ** New function `match-substitute-replacement' returns the result of
 `replace-match' without actually using it in the buffer.
 
+** If a local hook function has a non-nil `permanent-local-hook'
+property, then `kill-all-local-variables' does not remove it from
+the local value of the hook variable.  This means it remains
+even if you change major modes.
+
 +++
 ** A list of default values can be specified for the DEFAULT argument of
 functions `read-from-minibuffer', `read-string', `read-command',
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 049c565ff6f..3bf60b4359d 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -112,6 +112,13 @@ This can be used to add menu entries for backend specific functions.
 
 *** VC has some support for Git.
 
+* Incompatible Lisp Changes in Emacs 22.2
+
+** shell.el no longer defines the aliases `dirtrack-toggle' and
+`dirtrack-mode' for `shell-dirtrack-mode'.  These names were removed
+because they clash with commands provided by dirtrack.el.  Use
+`shell-dirtrack-mode' instead.
+
 * Lisp Changes in Emacs 22.2.
 
 ** Frame-local variables are deprecated and are slated for removal.
diff --git a/etc/TODO b/etc/TODO
index 9dcfb54d295..b25e2c0099c 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -12,6 +12,20 @@ it best.  Since Emacs is an FSF-copyrighted package, please be
 prepared to sign legal papers to transfer the copyright on your work
 to the FSF.
 
+* Simple tasks. These don't require much emacs knowledge, they are
+suitable for anyone from beginners to experts.
+
+** Major modes should have a menu entry.  Examples of modes that do
+not have one at the moment and probably should: text-mode,
+change-log-mode, conf-*-mode.
+
+** Change the text for the mode-line tooltips to not use things like C-x 0.
+In general make sure that tooltips have obvious meanings.  Check if
+all items on the mode-line have a suitable tooltip.
+
+** Check what minor modes don't use define-minor-mode and convert them
+to use it.
+
 * Small but important fixes needed in existing features:
 
 ** Make "emacs --daemon" start emacs without showing any frame. 
@@ -180,6 +194,10 @@ specified filters, specified timers, and specified hooks.
 
 * Other features we would like:
 
+** Make longlines-mode wrap lines based on screen position instead
+   of character position, so that variable-width fonts can be handled
+   properly.
+
 ** Allow frames(terminals) created by emacsclient to inherit their environment
 from the emacsclient process.
 ** Remove the default toggling behavior of minor modes when called from elisp
diff --git a/etc/emacs3.py b/etc/emacs3.py
index 96e8ebbfb8b..7160eb27a8c 100644
--- a/etc/emacs3.py
+++ b/etc/emacs3.py
@@ -5,7 +5,7 @@ Warning: This file is automatically generated from emacs2.py with the
 
 """Definitions used by commands sent to inferior Python in python.el."""
 
-# Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # Author: Dave Love <fx@gnu.org>
 
 # This file is part of GNU Emacs.
diff --git a/etc/images/README b/etc/images/README
index 34b882bcd07..b3271ae2ef5 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -34,63 +34,60 @@ Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm
   License: GNU General Public License version 3 or later (see COPYING)
 
 
-* The following icons are from GTK+ 2.x and GNOME 2.x.  They are not
-part of Emacs, but distributed and used by Emacs.
-
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-  Tuomas Kuosmanen, Rodney Dawes, Jakub Steiner, Alexander Larsson,
-  Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
-  Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
-  Pesenti Gritti
-  License: GNU General Public License version 2
-
-* From GTK+ 2.x:
-
-    close.xpm copy.xpm cut.xpm help.xpm home.xpm index.xpm info.pbm
-    info.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm paste.xpm
-    preferences.xpm print.xpm refresh.xpm right-arrow.xpm save.xpm
-    saveas.xpm search.xpm sort-ascending.xpm sort-descending.xpm
-    spell.xpm undo.xpm up-arrow.xpm
-
-    back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo.
-    diropen.xpm is file-manager.png from Gnome hicolor theme.
-
-* From GNOME 2.x:
-
-  Emacs images and their source in the GNOME icons stock/ directory:
-
-    attach.xpm                document/stock_attach
-    cancel.xpm                slightly modified generic/stock_stop
-    connect.xpm               net/stock_connect
-    contact.xpm               net/stock_contact
-    data-save.xpm             data/stock_data-save
-    delete.xpm                generic/stock_delete
-    describe.xpm              generic/stock_properties
-    disconnect.xpm            net/stock_disconnect
-    exit.xpm                  generic/stock_exit
-    lock-broken.xpm           data/stock_lock-broken
-    lock-ok.xpm               data/stock_lock-ok
-    lock.xpm                  data/stock_lock
-    redo.xpm                  generic/stock_redo
-    search-replace.xpm        slightly modified generic/stock_search-and-replace
-    next-page.xpm             navigation/stock_next-page
-    refresh.xpm               generic/stock_refresh
-    separator.xpm             ?
-    show.xpm                  slightly modified document/stock_new
-    sort-ascending.xpm        slightly modified data/stock_sort-ascending
-    sort-column-ascending.xpm data/stock_sort-column-ascending
-    sort-criteria.xpm         data/stock_sort-criteria
-    sort-descending.xpm       slightly modified data/stock_sort-descending
-    sort-row-ascending.xpm    data/stock_sort-row-ascending
-    zoom-in.xpm               navigation/stock_zoom-in
-    zoom-out.xpm              navigation/stock_zoom-out
-
-    next-node.xpm and prev-node.xpm are from gthumb version 2.0 (part of
-    GNOME 2.x) where they are called next-image-24.png and prev-image-24.png.
-    up-node.xpm is just next-node.xpm rotated 90 degrees.
-
-    Some icons in the mail/ and gnus/ subdirectories are also taken
-    from this source (see their separate README files).
+* The following icons are from GTK+ 2.x. They are not part of Emacs, but
+are distributed and used by Emacs.  They are licensed under the
+GNU Library General Public License version 2 or later.  See the source
+of the gtk+ package for more information.
+
+  close.xpm copy.xpm cut.xpm help.xpm home.xpm index.xpm info.pbm
+  info.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm paste.xpm
+  preferences.xpm print.xpm refresh.xpm right-arrow.xpm save.xpm
+  saveas.xpm search.xpm sort-ascending.xpm sort-descending.xpm
+  spell.xpm undo.xpm up-arrow.xpm
+
+  back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo.
+  diropen.xpm is file-manager.png from Gnome hicolor theme.
+
+
+* The following icons are from GNOME 2.x. They are not part of Emacs,
+but are distributed and used by Emacs.  They are licensed under the
+GNU General Public License version 2 or later.  See the source of
+the gnome-icons-theme package for more information.
+
+Emacs images and their source in the GNOME icons stock/ directory:
+
+  attach.xpm                document/stock_attach
+  cancel.xpm                slightly modified generic/stock_stop
+  connect.xpm               net/stock_connect
+  contact.xpm               net/stock_contact
+  data-save.xpm             data/stock_data-save
+  delete.xpm                generic/stock_delete
+  describe.xpm              generic/stock_properties
+  disconnect.xpm            net/stock_disconnect
+  exit.xpm                  generic/stock_exit
+  lock-broken.xpm           data/stock_lock-broken
+  lock-ok.xpm               data/stock_lock-ok
+  lock.xpm                  data/stock_lock
+  redo.xpm                  generic/stock_redo
+  search-replace.xpm        slightly modified generic/stock_search-and-replace
+  next-page.xpm             navigation/stock_next-page
+  refresh.xpm               generic/stock_refresh
+  separator.xpm             ?
+  show.xpm                  slightly modified document/stock_new
+  sort-ascending.xpm        slightly modified data/stock_sort-ascending
+  sort-column-ascending.xpm data/stock_sort-column-ascending
+  sort-criteria.xpm         data/stock_sort-criteria
+  sort-descending.xpm       slightly modified data/stock_sort-descending
+  sort-row-ascending.xpm    data/stock_sort-row-ascending
+  zoom-in.xpm               navigation/stock_zoom-in
+  zoom-out.xpm              navigation/stock_zoom-out
+
+  next-node.xpm and prev-node.xpm are from gthumb version 2.0 (part of
+  GNOME 2.x) where they are called next-image-24.png and prev-image-24.png.
+  up-node.xpm is just next-node.xpm rotated 90 degrees.
+
+  Some icons in the mail/ and gnus/ subdirectories are also taken
+  from this source (see their separate README files).
 
 The images in the low-color/ subdirectory are low-color versions of
 the files of the same name in this directory, and are subject to the
diff --git a/etc/images/gnus/README b/etc/images/gnus/README
index c0ed4f72552..16a52f135a7 100644
--- a/etc/images/gnus/README
+++ b/etc/images/gnus/README
@@ -23,16 +23,11 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 License: GNU General Public License version 3 or later (see COPYING)
 
 The following icons are from GNOME 2.x. They are not part of Emacs,
-but distributed and used by Emacs.
+but are distributed and used by Emacs.  They are licensed under the
+GNU General Public License version 2 or later.  See the source of the
+gnome-icons-theme package for more information.
 
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-  Tuomas Kuosmanen, Rodney Dawes, Jakub Steiner, Alexander Larsson,
-  Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
-  Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
-  Pesenti Gritti
-  License: GNU General Public License version 2
-
-toggle-subscription.xpm       (GNOME stock/document/stock_task-recurring)
-kill-group.pbm and kill-group.xpm are converted from close.xpm
-rot13.pbm and rot13.xpm are converted from lock.xpm
-mail-send.xpm  ?
+  toggle-subscription.xpm       (GNOME stock/document/stock_task-recurring)
+  kill-group.pbm and kill-group.xpm are converted from close.xpm
+  rot13.pbm and rot13.xpm are converted from lock.xpm
+  mail-send.xpm  ?
diff --git a/etc/images/icons/README b/etc/images/icons/README
index 1fcf871a5b2..78b0b86097b 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -1,6 +1,7 @@
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
-Files: hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png hicolor/32x32/apps/emacs.png hicolor/48x48/apps/emacs.png
+Files: hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png
+       hicolor/32x32/apps/emacs.png hicolor/48x48/apps/emacs.png
 Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
 Copyright (C) 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
@@ -8,5 +9,5 @@ License: GNU General Public License version 3 or later (see COPYING)
 Files: emacs16_mac.png emacs24_mac.png emacs32_mac.png emacs48_mac.png
        emacs256_mac.png emacs512_mac.png
 Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2007, 2008  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/mail/README b/etc/images/mail/README
index c7fcecc6885..962206e6ae8 100644
--- a/etc/images/mail/README
+++ b/etc/images/mail/README
@@ -1,14 +1,9 @@
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 The following icons are from GNOME 2.x. They are not part of Emacs,
-but distributed and used by Emacs.
-
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-  Tuomas Kuosmanen, Rodney Dawes, Jakub Steiner, Alexander Larsson,
-  Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
-  Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
-  Pesenti Gritti
-  License: GNU General Public License version 2
+but are distributed and used by Emacs.  They are licensed under the
+GNU General Public License version 2 or later.  See the source of the
+gnome-icons-theme package for more information.
 
 Emacs images and their GNOME source (GNOME icons are from stock/net/
 directory unless otherwise stated):
diff --git a/etc/images/smilies/grayscale/README b/etc/images/smilies/grayscale/README
index 10c3e3cc272..d2e635a2277 100644
--- a/etc/images/smilies/grayscale/README
+++ b/etc/images/smilies/grayscale/README
@@ -2,5 +2,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
        smile.xpm wry.xpm 
 Author: Adam Sjøgren
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/smilies/medium/README b/etc/images/smilies/medium/README
index 10c3e3cc272..d2e635a2277 100644
--- a/etc/images/smilies/medium/README
+++ b/etc/images/smilies/medium/README
@@ -2,5 +2,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
        smile.xpm wry.xpm 
 Author: Adam Sjøgren
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/refcards/README b/etc/refcards/README
index c9ae93a276a..278d02db1dc 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -12,6 +12,6 @@ it is reproduced here for convenience.
 
 File: gnus-logo.eps, gnus-logo.pdf
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 014f4655289..0a231547d03 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,8 +1,8 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{5.03}
-\def\versionyear{2007}          % latest update
+\def\orgversionnumber{5.19}
+\def\versionyear{2008}          % latest update
 \def\year{2008}                 % latest copyright year
-%
+
 %**start of header
 \newcount\columnsperpage
 \newcount\letterpaper
@@ -12,17 +12,11 @@
 
 \columnsperpage=3
 
-% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
+% Set letterpapaer to 0 for A4 paper, 1 for letter (US) paper.  Useful
 % only when columnsperpage is 2 or 3.
 
 \letterpaper=0
 
-% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
-% a landscape layout.
-
-\input pdflayout.sty
-\pdflayout=(0l)
-
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
 %   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
@@ -31,7 +25,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 3, or (at your option)
+% the Free Software Foundation; either version 2, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
@@ -314,6 +308,7 @@ are preserved on all copies.
 \section{Structure Editing}
 
 \key{insert new heading/item at current level}{M-RET}
+\key{insert new heading after subtree}{C-RET}
 \key{insert new TODO entry/checkbox item}{M-S-RET}
 
 \key{promote current heading up one level}{M-LEFT}
@@ -322,6 +317,7 @@ are preserved on all copies.
 \key{demote current subtree down one level}{M-S-RIGHT}
 
 \key{move subtree/list item up/down}{M-S-UP/DOWN}
+\key{refile subtree}{C-c C-w}
 \key{kill subtree}{C-c C-x C-w}
 \key{copy subtree}{C-c C-x M-w}
 \key{yank subtree}{C-c C-x C-y}
@@ -342,10 +338,10 @@ are preserved on all copies.
 
 \section{Filtering and Sparse Trees}
 
-\key{show sparse tree for all matches of a regexp}{C-c /}
+% FIXME: this is garbage
+\key{construct a sparse tree by various criteria}{C-c /}
 \key{view TODO's in sparse tree}{C-c C-v}
 \key{global TODO list in agenda mode}{C-c t$^1$}
-\key{create sparse tree with all deadlines due}{C-c C-w}
 \key{time sorted view of current org file}{C-c a L}
 %\key{agenda for the week}{C-c a$^1$}
 %\key{agenda for date at cursor}{C-c C-o}
@@ -552,9 +548,11 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 
 \section{Properties and Column View}
 
+\key{set property}{C-c C-x p}
 \key{special commands in property lines}{C-c C-c}
 \key{next/previous allowed value}{S-left/right}
 \key{turn on column view}{C-c C-x C-c}
+\key{capture columns view in dynamic block}{C-c C-x r}
 
 \key{quit column view}{q}
 \key{next/previous allowed value}{S-left/right}
@@ -575,7 +573,7 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{Like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME
 \key{insert DEADLINE timestamp}{C-c C-d}
 \key{insert SCHEDULED timestamp}{C-c C-s}
-\key{create sparse tree with all deadlines due}{C-c C-w}
+\key{create sparse tree with all deadlines due}{C-c / d}
 \key{the time between 2 dates in a time range}{C-c C-y}
 \key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^3$}
 \key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^3$}
@@ -606,6 +604,7 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{add/move current file to front of agenda}{C-c [}
 \key{remove current file from your agenda}{C-c ]}
 \key{cycle through agenda file list}{C-'}
+\key{set/remove restriction lock}{C-c C-x </>}
 
 \key{compile agenda for the current week}{C-c a a$^1$}
 \key{compile global TODO list}{C-c a t$^1$}
@@ -618,13 +617,6 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{configure stuck projects}{C-c a !$^1$}
 \key{agenda for date at cursor}{C-c C-o}
 
-\vskip 1mm
-To set categories, add lines like$^2$:
-\vskip -1mm
-\beginexample%
-\#+CATEGORY: MyCateg
-\endexample
-
 {\bf Commands available in an agenda buffer}
 
 {\bf View Org file}
@@ -658,7 +650,7 @@ To set categories, add lines like$^2$:
 \key{kill item and source}{C-k}
 \key{archive the subtree}{\$}
 \key{show tags of current headline}{T}
-\key{set tags for current headline}{:}
+\key{set tags for current headline/region}{:}
 \key{toggle ARCHIVE tag}{a}
 \key{set priority of current item}{p}
 \key{raise/lower priority of current item}{S-UP/DOWN$^3$}
@@ -669,9 +661,8 @@ To set categories, add lines like$^2$:
 \key{insert new entry into diary}{i}
 
 \newcolumn
-\key{start the clock on current item (clock-in)}{I}
-\key{stop the clock (clock-out)}{O}
-\key{cancel current clock}{X}
+\key{start/stop/cancel the clock on current item}{I / O / X}
+\key{jump to running clock entry}{J}
 
 {\bf Misc}
 
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty
index 187ffee867b..9ee83cd187b 100644
--- a/etc/refcards/pdflayout.sty
+++ b/etc/refcards/pdflayout.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2007  Free Software Foundation, Inc.
+% Copyright (C) 2007, 2008  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.