75 files changed, 2397 insertions, 135 deletions

diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index df5dd7daefc..990335a3f77 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -73,9 +73,12 @@ Every patch must have several pieces of information before we
 can properly evaluate it.
 
 When you have all these pieces, bundle them up in a mail message and
-send it to bug-gnu-emacs@gnu.org or emacs-devel@gnu.org.
-
-All subsequent discussion should be sent to the same mailing list.
+send it to the developers.  Sending it to bug-gnu-emacs@gnu.org
+(which is the bug/feature list) is recommended, because that list
+is coupled to a tracking system that makes it easier to locate patches.
+If your patch is not complete and you think it needs more discussion,
+you might want to send it to emacs-devel@gnu.org instead.  If you
+revise your patch, send it as a followup to the initial topic.
 
 ** Description
 
@@ -155,12 +158,12 @@ giving you write access to the Bazaar repository.
 
 Discussion about Emacs development takes place on emacs-devel@gnu.org.
 
-Bug reports and feature requests are sent to bug-gnu-emacs@gnu.org.
-
-You can subscribe to the mailing lists at savannah.gnu.org/projects/emacs.
-
-You can find the mailing lists archives at lists.gnu.org or gmane.org.
+Bug reports and fixes, feature requests and implementations should be
+sent to bug-gnu-emacs@gnu.org, the bug/feature list.  This is coupled
+to the tracker at http://debbugs.gnu.org .
 
+You can subscribe to the mailing lists, or see the list archives,
+by following links from http://savannah.gnu.org/mail/?group=emacs .
 
 ** Document your changes.
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 45dfb211bb0..109124af4ee 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,141 @@
+2011-06-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * themes/dichromacy-theme.el: New theme.
+
+2011-06-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * NEWS: Mention new configure option --with-wide-int.
+
+2011-05-24  Leo Liu  <sdl.web@gmail.com>
+
+        * NEWS: Mention the new primitive sha1 and the removal of sha1.el.
+
+2011-05-14  Ulf Jasper  <ulf.jasper@web.de>
+
+        * images/newsticker/README: Added.
+
+2011-05-13  Ulf Jasper  <ulf.jasper@web.de>
+
+        * images/newsticker: Added.
+        * images/newsticker/browse-url.xpm: Added.
+        * images/newsticker/get-all.xpm: Added.
+        * images/newsticker/mark-immortal.xpm: Added.
+        * images/newsticker/mark-read.xpm: Added.
+        * images/newsticker/narrow.xpm: Added.
+        * images/newsticker/next-feed.xpm: Added.
+        * images/newsticker/next-item.xpm: Added.
+        * images/newsticker/prev-feed.xpm: Added.
+        * images/newsticker/prev-item.xpm: Added.
+        * images/newsticker/update.xpm: Added.
+
+2011-05-10  Jim Meyering  <meyering@redhat.com>
+
+        * MH-E-NEWS, PROBLEMS: Fix typo "the the -> the".
+
+2011-05-03  Leo Liu  <sdl.web@gmail.com>
+
+        * NEWS: Mention the new command isearch-yank-pop.
+
+2011-05-03  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * NEWS: Mention new library gnutls.el and explain GnuTLS
+        functionality.  Mention new configure.bat options --without-gnutls
+        and --lib for W32.
+
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * NEWS: Mention `url-retrieve-queue', (:file "file") and
+        `server-eval-at'.
+
+2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document `delayed-warnings-list' and `delayed-warnings-hook'.
+        Document new "default HOME" warning.
+
+2011-04-26  Daniel Colascione  <dan.colascione@gmail.com>
+
+        * DEBUG: Document debug-on-event default behavior and utility for
+        debugging.
+
+2011-04-22  Noah Friedman  <friedman@splode.com>
+
+        * emacs-buffer.gdb: Add trailing underscores to appropriate member
+        names, per change tromey@redhat.com-20110214153919-bxkckrdmmg4qhyyj
+        of src/lisp.h.
+
+2011-04-08  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * NEWS: Document new function `vc-ediff'.
+
+2011-04-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: New variable `revert-buffer-in-progress-p'.
+
+2011-03-22  Sebastian Hermida  <sebas00@gmail.com>
+
+        * themes/misterioso-theme.el: New file.
+
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document warning about _emacs.
+
+2011-03-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: `shell' prompts for the shell path name, when the default
+        directory is a remote file name and neither environment variable
+        $ESHELL nor variable `explicit-shell-file-name' is set.
+
+2011-03-08  Kristoffer Grönlund  <krig@koru.se>
+
+        * themes/wombat-theme.el: New file.
+
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Version 23.3 released.
+
+2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * srecode/el.srt: Fix typo.
+
+2011-02-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * themes/tango-dark-theme.el: Tweak background on low-color
+        terminals.
+
+2011-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * images/icons/allout-widgets/dark-bg/encrypted-locked.png:
+        * images/icons/allout-widgets/dark-bg/encrypted-locked.xpm:
+        * images/icons/allout-widgets/dark-bg/unlocked-encrypted.png:
+        * images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm:
+        * images/icons/allout-widgets/light-bg/encrypted-locked.png:
+        * images/icons/allout-widgets/light-bg/encrypted-locked.xpm:
+        * images/icons/allout-widgets/light-bg/unlocked-encrypted.png:
+        * images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm:
+        Reorganize icon directories and files to reconcile against windows
+        short-filename clashes.
+
+2011-02-16  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * images/icons/allout-widgets-dark-bg,
+        * images/icons/allout-widgets-light-bg: Icons for new
+        allout-widgets.el.
+
+        * images/icons/README: Include coypright and GPL 3 license for
+        new icons.
+
+2011-02-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Add soap-client.el and soap-inspect.el.
+
+2011-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Tramp methods "imap" and "imaps" are discontinued.
+
+2011-02-12  Drew Adams  <drew.adams@oracle.com>
+
+        * themes/light-blue-theme.el: New file.
+
 2011-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         format-time-string now supports subsecond time stamp resolution
@@ -83,7 +221,7 @@
 
         * NEWS: Mention new Tramp method "ksu".
 
-2010-12-13  W. Martin Borgert <debacle@debian.org>  (tiny change)
+2010-12-13  W. Martin Borgert  <debacle@debian.org>  (tiny change)
 
         * schema/schemas.xml: Add DocBook (Bug#7491).
 
@@ -382,7 +520,7 @@
         * srecode/doc-default.srt (section-comment, function-comment)
         (variable-same-line-comment, group-comment-start, group-comment-end):
         * srecode/doc-java.srt (function-comment, variable-same-line-comment)
-        (group-comment-start, gropu-comment-end):
+        (group-comment-start, group-comment-end):
         Fix typos in template docstrings.
 
 2010-01-14  Kenichi Handa  <handa@m17n.org>
diff --git a/etc/DEBUG b/etc/DEBUG
index c8fd48c6bfa..625a76ac952 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -405,6 +405,11 @@ stepping, you will see where the loop starts and ends.  Also, examine
 the data being used in the loop and try to determine why the loop does
 not exit when it should.
 
+You can also trying sending Emacs SIGUSR2, which, if `debug-on-event'
+has its default value, will cause Emacs to attempt to break it out of
+its current loop and into the Lisp debugger.  This feature is useful
+when a C-level debugger is not conveniently available.
+
 ** If certain operations in Emacs are slower than they used to be, here
 is some advice for how to find out why.
 
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 27b6d40bd89..aaafe76990b 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -320,7 +320,7 @@ changes for MH-E functions are listed here.
 
 Most of the changes have to do with the renaming of the functions with
 "mhn" in them to "mh" because nmh doesn't use `mhn'. The names were
-also made consistent with the the family of "mml" functions.
+also made consistent with the family of "mml" functions.
 
 The type of signing or encryption has been generalized so the method
 is now an option rather than a part of the function's name. The option
diff --git a/etc/NEWS b/etc/NEWS
index 020aa2f26a0..dad42e14f02 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -47,8 +47,11 @@ also depend on Gtk+.  You can disable them with --without-rsvg and
 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.
 
+** There is a new configure option --with-wide-int.
+With it, Emacs integers typically have 62 bits, even on 32-bit machines.
+
 ---
-** New translation of the Emacs Tutorial in Hebrew is available
+** New translation of the Emacs Tutorial in Hebrew is available.
 Type `C-u C-h t' to choose it in case your language setup doesn't
 automatically select it.
 
@@ -62,24 +65,54 @@ 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.
 
+** On Windows, Emacs now warns when the obsolete _emacs init file is used,
+and also when HOME is set to C:\ by default.
+
 
 * Changes in Emacs 24.1
 
+** The inactive minibuffer has its own major mode `minibuffer-inactive-mode'.
+This is handy for minibuffer-only frames, and is also used for the "mouse-1
+pops up *Messages*" feature, which can now easily be changed.
+
 ** emacsclient changes
 
 *** New emacsclient argument --parent-id ID can be used to open a
 client frame in parent X window ID, via XEmbed.  This works like the
 --parent-id argument to Emacs.
 
++++
+*** New emacsclient argument -q/--quiet suppresses some status messages.
+
 *** If emacsclient shuts down as a result of Emacs signalling an
 error, its exit status is 1.
 
-** Completion can cycle, depending on completion-cycle-threshold.
+** 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.
+
+*** 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.
+
+*** `completing-read' can be customized using the new variable
+`completing-read-function'.
 
 ** auto-mode-case-fold is now enabled by default.
 
+** Internationalization changes
+
 +++
-** Emacs now supports display and editing of bidirectional text.
+*** Emacs now supports display and editing of bidirectional text.
 
 See the node "Bidirectional Editing" in the Emacs Manual for some
 initial documentation.
@@ -105,6 +138,20 @@ Note that some advanced display features, such as overlay strings and
 `display' text properties, do not yet work correctly when
 bidirectional text is reordered for display.
 
++++
+*** Enhanced support for characters that have no glyphs in available fonts.
+If a character has no glyphs in any of the available fonts, Emacs by
+default will display 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'.
+
+On character terminals these methods are used for characters that
+cannot be encoded by the `terminal-coding-system'.
+
+*** There are two new input methods for Persian/Farsi: farsi and farsi-translit.
+
 ** GTK scroll-bars are now placed on the right by default.
 Use `set-scroll-bar-mode' to change this.
 
@@ -120,8 +167,10 @@ for this.
 ** ImageMagick support.
 It is now possible to use the ImageMagick library to load many new
 image formats in Emacs.  By default, Emacs links with the ImageMagick
-libraries if they are present at build time.  To disable this, use
-the configure option `--without-imagemagick'.
+libraries if they are present at build time.  This needs ImageMagick
+6.2.8 or newer (versions newer than 6.0.7 _may_ work but have not been
+tested).  To disable ImageMagick support, use the configure option
+`--without-imagemagick'.
 
 The new function `imagemagick-types' returns a list of image file
 extensions that your installation of ImageMagick supports.  The
@@ -137,23 +186,15 @@ theme when Emacs is built with GTK.
 off by customizing x-gtk-use-system-tooltips.
 
 ** Lucid menus and dialogs can display antialiased fonts if Emacs is built
-with Xft.  To change font, use X resource faceName, for example:
-Emacs.pane.menubar.faceName:  Courier-12
-Set faceName to none and use font to use the old X fonts.
-
-+++
-** Enhanced support for characters that have no glyphs in available fonts
-If a character has no glyphs in any of the available fonts, Emacs by
-default will display 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'.
-
-On character terminals these methods are used for characters that
-cannot be encoded by the `terminal-coding-system'.
+with Xft.  To change font, use the X resource font, for example:
+Emacs.pane.menubar.font:  Courier-12
 
 ** 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.
+
+** On Nextstep/OSX, the menu bar can be hidden by customizing
+ns-auto-hide-menu-bar.
 
 ** Basic SELinux support has been added.
 This requires Emacs to be linked with libselinux at build time.
@@ -177,10 +218,12 @@ higher-resolution time stamps.
 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.
 
 ** New scrolling commands `scroll-up-command' and `scroll-down-command'
-(bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom
-of buffer at first key-press (instead moves to top/bottom of buffer)
+(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)
 when a new variable `scroll-error-top-bottom' is non-nil.
 
 ** New scrolling commands `scroll-up-line' and `scroll-down-line'
@@ -189,6 +232,20 @@ 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.
+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.
+
 ** Trash changes
 
 *** `delete-by-moving-to-trash' now only affects commands that specify
@@ -235,14 +292,39 @@ default, all themes included in Emacs are treated as safe.
 ** The user option `remote-file-name-inhibit-cache' controls whether
 the remote file-name cache is used for read access.
 
++++
+** The use of a "mode: minor" specification in a file local variables section
+to enable a minor-mode is deprecated.  Instead, use "eval: (minor-mode 1)".
+
 ** The standalone programs lib-src/digest-doc and sorted-doc have been
 replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 
+---
+** The standalone program `fakemail' has been removed.
+If you need it, feedmail.el ought to provide a superset of the functionality.
+
 ** The variable `focus-follows-mouse' now always defaults to nil.
 
+** Function `sha1' is now implemented in C for speed.
+The elisp implementation sha1.el is removed. Feature sha1 is provided
+by default.
+
 
 * 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.
+
 +++
 ** There is a new command `count-words-region', which does what you expect.
 
@@ -311,6 +393,7 @@ 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.
@@ -318,20 +401,37 @@ between applications.
 
 *** Support for X cut buffers has been removed.
 
+*** Support for X clipboard managers has been added.
+
+**** To inhibit use of the clipboard manager, set
+`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 an prefix argument, this
 prompts for a number to count from and for a format string.
 
+** The command shell prompts for the shell path name, when the default
+directory is a remote file name and neither environment variable
+$ESHELL nor variable `explicit-shell-file-name' is set.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
-** The compile.el mode can be used without font-lock-mode.
+** comint and modes derived from it use the generic completion code.
+
+** Compilation mode
+
+*** Compilation mode can be used without font-lock-mode.
 `compilation-parse-errors-function' is now obsolete.
 
+*** `compilation-filter-start' is let-bound to the start of the text
+inserted by the compilation filter function, when calling
+compilation-filter-hook.
+
 ** The Landmark game is now invoked with `landmark', not `lm'.
 
 ** Prolog mode has been completely revamped, with lots of additional
-functionality such as more intelligent indentation, electricty, support for
+functionality such as more intelligent indentation, electricity, support for
 more variants, including Mercury, and a lot more.
 
 ** shell-mode can track your cwd by reading it from your prompt.
@@ -339,6 +439,14 @@ Just set shell-dir-cookie-re to an appropriate regexp.
 
 ** Modula-2 mode provides auto-indentation.
 
+** BibTeX mode
+
+*** 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'.
+
 ** latex-electric-env-pair-mode keeps \begin..\end matched on the fly.
 
 ** FIXME: xdg-open for browse-url and reportbug, 2010/08.
@@ -346,7 +454,21 @@ Just set shell-dir-cookie-re to an appropriate regexp.
 ** Archive Mode has basic support to browse 7z archives.
 
 ** browse-url has gotten a new variable that is used for mailto: URLs,
-   `browse-url-mailto-function', which defaults to `browse-url-mail'.
+`browse-url-mailto-function', which defaults to `browse-url-mail'.
+
+** `url-queue-retrieve' downloads web pages asynchronously, but allow
+controlling the degree of parallelism.
+
+** Directory local variables can apply to file-less buffers, in certain modes
+(eg dired, vc-dir, log-edit).  For example, adding
+"(diff-mode . ((mode . whitespace)))" to your .dir-locals.el file,
+will turn on `whitespace-mode' for *vc-diff* buffers.  Modes should
+call `hack-dir-local-variables-non-file-buffer' to support this.
+
++++
+** You can prevent directory local variables from applying to subdirectories.
+Add an element (subdirs . nil) to the alist portion of any variables
+settings to indicate said section should not be applied to subdirectories.
 
 ** ERC changes
 
@@ -381,6 +503,26 @@ You can get a comparable behavior with:
 
 ** Calendar, Diary, and Appt
 
++++
+*** 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.
@@ -413,16 +555,12 @@ choose a color via list-colors-display.
 *** 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.
 
-** Directory local variables can apply to file-less buffers.
-For example, adding "(diff-mode . ((mode . whitespace)))" to your
-.dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers.
++++
+*** The `dired local variables' feature provided by Dired-x is obsolete.
+The standard directory local variables feature replaces it.
 
 ** SQL Mode enhancements.
 
-*** Several variables have been marked as safe local variables.  The
-variables `sql-product', `sql-user', `sql-server', `sql-database' and
-`sql-port' can now be safely used as local variables.
-
 *** `sql-dialect' is a synonym for `sql-product'.
 
 *** Added ability to login with a port on MySQL and Postgres.
@@ -531,7 +669,7 @@ objects shown and the details available are product specific.
 **** List all objects.
 Using `M-x sql-list-all', `C-c C-l a' or selecting "SQL->List all
 objects" will list all the objects in the database.  At a minimum it
-lists the tables and views in the database.  Preceeding the command by
+lists the tables and views in the database.  Preceding the command by
 universal argument may provide additional details or extend the
 listing to include other schemas objects.  The list will appear in a
 separate window in view-mode.
@@ -539,7 +677,7 @@ separate window in view-mode.
 **** List Table details.
 Using `M-x sql-list-table', `C-c C-l t' or selecting "SQL->List Table
 details" will ask for the name of a database table or view and display
-the list of columns in the relation.  Preceeding the comand with the
+the list of columns in the relation.  Preceding the command with the
 universal argument may provide additional details about each column.
 The list will appear in a separate window in view-mode.
 
@@ -554,17 +692,25 @@ In general, the SQL*Plus option SCAN should always be set OFF under
 SQL interactive mode and this option used in its place.
 
 *** SQL interactive mode will replace tabs with spaces.
-This prevents the comand interpretter for MySQL and Postgres from
+This prevents the command interpreter for MySQL and Postgres from
 listing object name completions when being sent text via
 `sql-send-*' functions.
 
 *** An API for manipulating SQL product definitions has been added.
 
-** sregex.el is now obsolete, since rx.el is a strict superset.
+** Image mode
+
+*** RET (`image-toggle-animation') toggles animation, if the displayed
+image can be animated.
 
-** s-region.el is now declared obsolete, superceded by shift-select-mode
-enabled by default in 23.1.
+*** Option `image-animate-loop', if non-nil, loops the animation.
+If nil, `image-toggle-animation' plays the animation once.
+
+** sregex.el is now obsolete, since rx.el is a strict superset.
 
+** s-region.el and pc-select are now declared obsolete,
+superseded by shift-select-mode enabled by default in 23.1.
+** pc-mode.el is also declared obsolete.
 ** gdb-mi
 
 *** GDB User Interface migrated to GDB Machine Interface and now
@@ -588,7 +734,10 @@ on a D-Bus without simultaneously registering a property or a method.
 *** There exists a new inline access method "ksu" (kerberized su).
 
 *** The following access methods are discontinued: "ssh1_old",
-"ssh2_old", "scp1_old", "scp2_old" and "fish".
+"ssh2_old", "scp1_old", "scp2_old", "imap", "imaps" and "fish".
+
+*** The option `ange-ftp-binary-file-name-regexp' has changed its
+default value to "".
 
 ** VC and related modes
 
@@ -606,19 +755,48 @@ The vc-merge command now runs a "merge" operation, if it is supported.
 This merges another branch into the current one.  This command prompts
 the user for specifics, e.g. a merge source.
 
-**** Currently supported by Bzr, Git, and Mercurial.
+**** Currently supported for Bzr, Git, and Mercurial.
+
+*** Log entries in some Log View buffers can be toggled to display a
+longer description by typing RET (log-view-toggle-entry-display).
+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.
+
+**** Currently supported for Bzr, Git, and Mercurial.
+
+**** Packages using Log View mode can enable this functionality by
+binding `log-view-expanded-log-entry-function' to a suitable function.
+
+*** New command `vc-ediff' allows visual comparison of two revisions
+of a file similar to `vc-diff', but using ediff backend.
 
 ** Miscellaneous
 
 ---
 *** `copyright-fix-years' can optionally convert consecutive years to ranges.
 
+*** New command `nato-region' converts text to NATO phonetic alphabet.
+
+*** The new command `info-display-manual' will display an Info manual
+specified by its name.  If that manual is already visited in some Info
+buffer within the current session, the command will display that
+buffer.  Otherwise, it will load the manual and display it.  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.
+
 
 * 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 C-x C-q in Occur mode.
+
 ** New global minor modes electric-pair-mode, electric-indent-mode,
 and electric-layout-mode.
 
+** tabulated-list.el provides a generic major mode for tabulated data,
+from which other modes can be derived.
+
 ** pcase.el provides the ML-style pattern matching macro `pcase'.
 
 ** secrets.el is an implementation of the Secret Service API, an
@@ -630,9 +808,26 @@ secrets.
 ** notifications.el provides an implementation of the Desktop
 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.
+
+** xmodmap-generic-mode for xmodmap files.
+
 
 * Incompatible Lisp 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'.
+
+** `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.
+
 ** `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.
@@ -652,15 +847,14 @@ FIXME: This only says what was changed, but not what are the
 programmer-visible consequences.
 
 ** Passing a nil argument to a minor mode function now turns the mode
-   ON unconditionally.
+ON unconditionally.
 
 ** 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'.
+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'.
 
 ** Regions created by mouse dragging are now normal active regions,
 similar to the ones created by shift-selection.  In previous Emacs
@@ -693,6 +887,63 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 
 * Lisp changes in Emacs 24.1
 
+** 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.
+
+*** 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':
+- `category' is the kind of objects returned (e.g., `buffer', `file', ...),
+  used to select a style in completion-category-overrides.
+- `annotation-function' to add annotations in *Completions*.
+- `display-sort-function' to specify how to sort entries in *Completions*.
+- `cycle-sort-function' to specify how to sort entries when cycling.
+
+** `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.
+
+** Code can now use lexical scoping by default instead of dynamic scoping.
+The `lexical-binding' variable lets code use lexical scoping for local
+variables.  It is typically set via file-local variables, 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.
+
+*** New function `special-variable-p' to check whether a variable is
+declared as dynamically bound.
+
+** pre/post-command-hook are not reset to nil upon error.
+Instead, the offending function is removed.
+
+** New low-level function run-hook-wrapped.
+
+** `server-eval-at' is provided to allow evaluating forms on different
+Emacs server instances.
+
+** `call-process' allows a `(:file "file")' spec to redirect STDOUT to
+a file.
+
+** byte-compile-disable-print-circle is obsolete.
+** deferred-action-list and deferred-action-function are obsolete.
 ** Removed the stack-trace-on-error variable.
 Also 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
@@ -731,8 +982,6 @@ argument is supplied (see Trash changes, above).
 
 ** buffer-substring-filters is obsoleted by filter-buffer-substring-functions.
 
-** New completion style `substring'.
-
 ** `facemenu-read-color' is now an alias for `read-color'.
 The command `read-color' now requires a match for a color name or RGB
 triplet, instead of signalling an error if the user provides a invalid
@@ -744,12 +993,14 @@ i.e. via menu entries of the form `(menu-item "--")'.
 
 ** Image API
 
-*** When the image type is one of listed in `image-animated-types'
-and the number of sub-images in the image is more than one, then the
-new function `create-animated-image' creates an animated image where
-sub-images are displayed successively with the duration defined by
-`image-animate-max-time' and the delay between sub-images defined
-by the Graphic Control Extension of the image.
+*** 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' is renamed to `image-metadata'.
 
@@ -763,7 +1014,21 @@ Emacs Lisp parse tree.
 
 FIXME: These should be front-ended by xml.el.
 
-** FIXME GnuTLS
+** GnuTLS
+
+*** Emacs can be compiled with libgnutls support
+This is the default.  You will then be able to use the functionality
+in gnutls.el, namely the `open-gnutls-stream' and `gnutls-negotiate'
+functions.  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.
+
+Only versions 2.8.x and higher or GnuTLS have been tested.
+
+*** gnutls-log-level
+Set `gnutls-log-level' higher than 0 to get debug output.  1 is for
+important messages, 2 is for debug data, and higher numbers are as per
+the GnuTLS logging conventions.  The output is in *Messages*.
 
 ** Isearch
 
@@ -776,17 +1041,32 @@ 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' allow
+deferring warnings until the main command loop is executed.
+
++++
+** `set-auto-mode' now respects mode: local variables at the end of files,
+as well as those in the -*- line.
+
 
 * Changes in Emacs 24.1 on non-free operating systems
 
-** New configure.bat option --enable-checking builds emacs with extra
+** New configure.bat option --enable-checking builds Emacs with extra
 runtime checks.
 
 ** New configure.bat option --distfiles to specify files to be
-   included in binary distribution
+included in binary distribution.
+
+** New configure.bat option --without-gnutls to disable automatic
+GnuTLS detection.
+
+** New configure.bat option --lib for general library linkage, works
+with the USER_LIBS build variable.
 
-** New make target `dist' to create binary disttribution for Windows
-   platform
+** New make target `dist' to create binary distribution for MS Windows.
 
 
 ----------------------------------------------------------------------
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 22c0b1de19c..5b170231bbd 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -15,30 +15,72 @@ 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.
 
 
+* Installation Changes in Emacs 23.4
+
+** The MS-Windows build prefers libpng version 1.14 or later.
+Versions of libpng before 1.14 had security issues, so we now
+recommend to use version 1.14 or later.  Precompiled Windows binaries
+require version 1.14 or later.  See README.W32 and nt/INSTALL for
+details and pointers to URLs where the latest libpng can be
+downloaded.
+
+
+* Changes in Emacs 23.4 on non-free operating systems
+
+** The MS-Windows port can now use more than 500MB of heap.
+Depending on the available virtual memory, Emacs on Windows can now
+have up to 2GB of heap space.  This allows, e.g., to visit several
+large (> 256MB) files in the same session.
+
+
 * Installation Changes in Emacs 23.3
 
-* Startup Changes in Emacs 23.3
+** New configure option --with-crt-dir specifies the location of your
+crt*.o files, if they are in a non-standard location.  This is only
+used on x86-64 and s390x GNU/Linux architectures.
 
 * Changes in Emacs 23.3
 
-+++
 ** The last-resort backup file `%backup%~' is now written to
 `user-emacs-directory', instead of the user's home directory.
 
-
-* Editing Changes in Emacs 23.3
+** If Emacs creates `user-emacs-directory', that directory's
+permissions are now set to rwx------, ignoring the umask.
 
 
 * Changes in Specialized Modes and Packages in Emacs 23.3
 
----
-** The appt-add command takes an optional argument for the warning time.
+** Calendar and diary
+
+*** The appt-add command takes an optional argument, the warning time.
 This can be used in place of the default appt-message-warning-time.
 
----
-** You can allow inferior Python processes to load modules from the
+** Python mode
+
+*** You can allow inferior Python processes to load modules from the
 current directory by setting `python-remove-cwd-from-path' to nil.
 
+** Rmail
+
+*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
+MIME contents automatically.  You can customize the variable
+`rmail-enable-mime' back to `nil' to disable this automatic MIME
+decoding.
+
+*** The command `rmail-mime' change the displaying of a MIME message
+between decoded presentation form and raw data if `rmail-enable-mime'
+is non-nil.  And, with prefix argument, it change only the displaying
+of the MIME entity at point.
+
+*** The new command `rmail-mime-next-item' (bound to TAB) moves point
+to the next item of MIME message.
+
+*** The new command `rmail-mime-previous-item' (bound to backtab) moves
+point to the previous item of MIME message.
+
+*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
+body of the MIME entity at point.
+
 ** VC and related modes
 
 *** New VC command `vc-log-incoming', bound to `C-x v I'.
@@ -51,14 +93,12 @@ This shows a log of changes to be sent in the next commit.
 
 *** New VC command vc-find-conflicted-file.
 
-+++
 *** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
 reruns the corresponding VC command to compute an up to date version
 of the buffer.
 
 *** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
 
-+++
 *** Special markup can be added to log-edit buffers.
 You can add headers specifying additional information to be supplied
 to the version control system.  For example:
@@ -71,30 +111,8 @@ Bazaar recognizes the headers "Author", "Date" and "Fixes".
 Git, Mercurial, and Monotone recognize "Author" and "Date".
 Any unknown header is left as is in the message, so it is not lost.
 
-** Rmail
-
-*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
-MIME contents automatically.  You can customize the variable
-`rmail-enable-mime' back to `nil' to disable this automatic MIME
-decoding.
-
-*** The command `rmail-mime' change the displaying of a MIME message
-between decoded presentation form and raw data if `rmail-enable-mime'
-is non-nil.  And, with prefix argument, it change only the displaying
-of the MIME entity at point.
-
-*** The new command `rmail-mime-next-item' (bound to TAB) moves point
-to the next item of MIME message.
-
-*** The new command `rmail-mime-previous-item' (bound to backtab) moves
-point to the previous item of MIME message.
-
-*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
-body of the MIME entity at point.
-
 ** Obsolete packages
 
-+++
 *** lmenu.el and cl-compat.el are now obsolete.
 
 
@@ -115,27 +133,21 @@ starting from the first line of text below the header line.
 
 * Lisp changes in Emacs 23.3
 
-+++
 ** `e' and `pi' are now called `float-e' and `float-pi'.
   The old names are obsolete.
 
-+++
 ** The use of unintern without an obarray arg is now obsolete.
 
----
 ** The function `princ-list' is now obsolete.
 
-+++
 ** The yank-handler argument to kill-region and friends is now obsolete.
 
-+++
 ** New function byte-to-string, like char-to-string but for bytes.
 
 
 * Changes in Emacs 23.3 on non-free operating systems
 
-+++
-** The nextstep port can have different modifiers for the left and right
+** The NeXTstep port can have different modifiers for the left and right
 alt/option key by customizing the value for ns-right-alternate-modifier.
 
 
@@ -703,7 +715,7 @@ a GIF library.
 
 *** Emacs now supports multi-page TIFF images.
 
-** New NeXTSTEP-based port.
+** New NeXTstep-based port.
 This provides support for GNUstep (via the GNUstep libraries) and Mac
 OS X (via the Cocoa libraries).
 
@@ -713,7 +725,7 @@ other emacsen (e.g. X11 build) use --disable-ns-self-contained.  See
 nextstep/README and nextstep/INSTALL in the Emacs source directory.
 
 ** Mac OS X is no longer supported via Carbon.
-Use the NeXTSTEP port, described above.
+Use the NeXTstep port, described above.
 
 ** The new configuration option "--with-dbus" enables D-Bus language
 bindings for Emacs.
@@ -1752,7 +1764,7 @@ directories in which `ffap-rfc' will first search for RFCs.
 *** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them.
 See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'.
 
-*** `icomplete-prospects-height' now supercedes `icomplete-prospects-length'.
+*** `icomplete-prospects-height' now supersedes `icomplete-prospects-length'.
 
 *** Info displays breadcrumbs in the header of the page.
 See Info-breadcrumbs-depth to control it.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 15d4ea227d0..2f344955cb2 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1217,7 +1217,7 @@ be carried out at the same time:
 2) If the connection is very slow, you might also want to consider
    switching off scroll bars, menu bar, and tool bar.  Adding the
    following forms to your .emacs file will accomplish that, but only
-   after the the initial frame is displayed:
+   after the initial frame is displayed:
 
     (scroll-bar-mode -1)
     (menu-bar-mode -1)
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 85971cc26dd..8e19222143a 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -45,9 +45,9 @@ symbol: aix
 
 symbol: ant
 
-The regexps found on http://ant.apache.org/faq.html, and since integrated in
-both Emacsen, were hairy.  Why so many numbers for jikes -- is one a column
-number?
+The regexps found on http://ant.apache.org/faq.html, and since
+integrated in both Emacsen, were hairy.  The extra two numbers for
+jikes are the ending line and ending column.
 
     [javac] /src/DataBaseTestCase.java:27: unreported exception ...
     [javac] /src/DataBaseTestCase.java:49: warning: finally clause cannot complete normally
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 14a7615801c..d4eecc9f8ef 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -3,10 +3,6 @@
 # Copyright (C) 2005-2011 Free Software Foundation, Inc.
 
 # Maintainer: Noah Friedman <friedman@splode.com>
-# Status: Works with Emacs 22.0.51.1 (prerelease) as of 2006-01-12.
-#         Older cvs snapshots, and released versions, will not work due to
-#         changes in lisp data structures.  But there are older versions of
-#         this gdb script which work with those versions.
 # Created: 2005-04-28
 
 # This file is part of GNU Emacs.
@@ -37,6 +33,10 @@
 # `ysave-buffer', and `ybuffer-contents'.  The `y' prefix avoids any
 # namespace collisions with emacs/src/.gdbinit.
 
+# Since the internal data structures in Emacs occasionally from time to
+# time, you should use the version of this file that came with your
+# particular Emacs version; older versions might not work anymore.
+
 # Example usage:
 #
 #     $ gdb /export/src/emacs/2005-05-02--03-17/src/emacs core.emacs.6.9845
@@ -107,16 +107,16 @@ define ybuffer-list
     ygetptr $buf
     set $buf = (struct buffer *) $ptr
 
-    if ! ($files_only && $buf->filename == Qnil)
-      ygetptr $buf->name
+    if ! ($files_only && $buf->filename_ == Qnil)
+      ygetptr $buf->name_
       set $name = ((struct Lisp_String *) $ptr)->data
       set $modp = ($buf->text->modiff > $buf->text->save_modiff) ? '*' : ' '
 
-      ygetptr $buf->mode_name
+      ygetptr $buf->mode_name_
       set $mode = ((struct Lisp_String *) $ptr)->data
 
-      if $buf->filename != Qnil
-        ygetptr $buf->filename
+      if $buf->filename_ != Qnil
+        ygetptr $buf->filename_
         printf "%2d %c  %9d %-20s %-10s %s\n", \
                $i, $modp, ($buf->text->z_byte - 1), $name, $mode, \
                ((struct Lisp_String *) $ptr)->data
@@ -193,7 +193,7 @@ document yget-buffer-pointers
 end
 
 define yget-current-buffer-name
-  set $this = $ycurrent_buffer->name
+  set $this = $ycurrent_buffer->name_
   ygetptr $this
   set $ycurrent_buffer_name = ((struct Lisp_String *) $ptr)->data
 end
@@ -267,4 +267,3 @@ end
 # local variables:
 # mode: gdb-script
 # end:
-
diff --git a/etc/images/icons/README b/etc/images/icons/README
index 7855f401bb1..b11b88781e8 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -15,3 +15,52 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
 Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
 Copyright (C) 2005-2011  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
+
+Files: allout-widgets-dark-bg/closed.png
+       allout-widgets-dark-bg/closed.xpm
+       allout-widgets-dark-bg/empty.png
+       allout-widgets-dark-bg/empty.xpm
+       allout-widgets-dark-bg/encrypted-locked.png
+       allout-widgets-dark-bg/encrypted-locked.xpm
+       allout-widgets-dark-bg/encrypted-unlocked.png
+       allout-widgets-dark-bg/encrypted-unlocked.xpm
+       allout-widgets-dark-bg/end-connector.png
+       allout-widgets-dark-bg/end-connector.xpm
+       allout-widgets-dark-bg/extender-connector.png
+       allout-widgets-dark-bg/extender-connector.xpm
+       allout-widgets-dark-bg/leaf.png
+       allout-widgets-dark-bg/leaf.xpm
+       allout-widgets-dark-bg/mid-connector.png
+       allout-widgets-dark-bg/mid-connector.xpm
+       allout-widgets-dark-bg/opened.png
+       allout-widgets-dark-bg/opened.xpm
+       allout-widgets-dark-bg/skip-descender.png
+       allout-widgets-dark-bg/skip-descender.xpm
+       allout-widgets-dark-bg/through-descender.png
+       allout-widgets-dark-bg/through-descender.xpm
+       allout-widgets-light-bg/closed.png
+       allout-widgets-light-bg/closed.xpm
+       allout-widgets-light-bg/empty.png
+       allout-widgets-light-bg/empty.xpm
+       allout-widgets-light-bg/encrypted-locked.png
+       allout-widgets-light-bg/encrypted-locked.xpm
+       allout-widgets-light-bg/encrypted-unlocked.png
+       allout-widgets-light-bg/encrypted-unlocked.xpm
+       allout-widgets-light-bg/end-connector.png
+       allout-widgets-light-bg/end-connector.xpm
+       allout-widgets-light-bg/extender-connector.png
+       allout-widgets-light-bg/extender-connector.xpm
+       allout-widgets-light-bg/leaf.png
+       allout-widgets-light-bg/leaf.xpm
+       allout-widgets-light-bg/mid-connector.png
+       allout-widgets-light-bg/mid-connector.xpm
+       allout-widgets-light-bg/opened.png
+       allout-widgets-light-bg/opened.xpm
+       allout-widgets-light-bg/skip-descender.png
+       allout-widgets-light-bg/skip-descender.xpm
+       allout-widgets-light-bg/through-descender.png
+       allout-widgets-light-bg/through-descender.xpm
+
+Author: Ken Manheimer <ken.manheimer@gmail.com>
+Copyright (C) 2011  Free Software Foundation, Inc.
+License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/icons/allout-widgets/dark-bg/closed.png b/etc/images/icons/allout-widgets/dark-bg/closed.png
new file mode 100644
index 00000000000..b49fd4ad6c9
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/closed.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/closed.xpm b/etc/images/icons/allout-widgets/dark-bg/closed.xpm
new file mode 100644
index 00000000000..4d7bbebe21c
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/closed.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char *dummy[]={
+"9 17 10 1",
+". c None",
+"# c #000080",
+"h c #52a55a",
+"g c #52ad52",
+"e c #5ab54a",
+"d c #5abd42",
+"c c #63c639",
+"b c #63ce31",
+"f c #ada5c6",
+"a c #ffff00",
+".........",
+".........",
+".........",
+"######...",
+"aaaaaa#..",
+".bbcdaa#.",
+".###deaa#",
+"..ff##gaa",
+"fffff##ha",
+"..ff##haa",
+".###ghaa#",
+".eeggaa#.",
+"aaaaaa#..",
+"######...",
+".........",
+".........",
+"........."};
diff --git a/etc/images/icons/allout-widgets/dark-bg/empty.png b/etc/images/icons/allout-widgets/dark-bg/empty.png
new file mode 100644
index 00000000000..b9675fdb9ba
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/empty.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/empty.xpm b/etc/images/icons/allout-widgets/dark-bg/empty.xpm
new file mode 100644
index 00000000000..e0fc8e5701f
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/empty.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char *dummy[]={
+"10 17 9 1",
+". c None",
+"# c #000080",
+"f c #52a55a",
+"g c #52ad52",
+"d c #5abd42",
+"b c #63c639",
+"c c #6bd629",
+"e c #ada5c6",
+"a c #ffff00",
+"..........",
+"..........",
+"..........",
+"...######.",
+"..#aaaaaa.",
+".#aabbbb..",
+"#aabc###..",
+"aad##ee...",
+"adeeeee...",
+"aad##ee...",
+"#aafg###..",
+".#aabbbb..",
+"..#aaaaaa.",
+"...######.",
+"..........",
+"..........",
+".........."};
diff --git a/etc/images/icons/allout-widgets/dark-bg/end-connector.png b/etc/images/icons/allout-widgets/dark-bg/end-connector.png
new file mode 100644
index 00000000000..696c17ea9a9
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/end-connector.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm b/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm
new file mode 100644
index 00000000000..511d3a4015c
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #ada5c6",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....##.....",
+".....######",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"..........."};
diff --git a/etc/images/icons/allout-widgets/dark-bg/extender-connector.png b/etc/images/icons/allout-widgets/dark-bg/extender-connector.png
new file mode 100644
index 00000000000..8559f4884d0
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/extender-connector.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm b/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm
new file mode 100644
index 00000000000..cd9ecc4c5f2
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #ada5c6",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"###########",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"..........."};
diff --git a/etc/images/icons/allout-widgets/dark-bg/leaf.png b/etc/images/icons/allout-widgets/dark-bg/leaf.png
new file mode 100644
index 00000000000..e2d7b189e84
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/leaf.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/leaf.xpm b/etc/images/icons/allout-widgets/dark-bg/leaf.xpm
new file mode 100644
index 00000000000..f25bf40a258
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/leaf.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char *dummy[]={
+"16 21 9 1",
+". c None",
+"a c #737373",
+"b c #7b7b7b",
+"# c #808080",
+"c c #848484",
+"d c #8c8c8c",
+"e c #949494",
+"f c #9c9c9c",
+"g c #a5a5a5",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"...#####........",
+"..#abbcc#.......",
+".#abbccdd#......",
+"#abbccddee#.....",
+"#bbccddeef#.....",
+"#bccddeefg#.....",
+".#cddeefg#......",
+"..#deefg#.......",
+"...#####........",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"};
diff --git a/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
new file mode 100644
index 00000000000..a6bc3e99a7a
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
new file mode 100644
index 00000000000..bf7556f2ed9
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char *dummy[]={
+"10 17 6 1",
+". c None",
+"b c #333300",
+"# c #666600",
+"d c #808080",
+"c c #999933",
+"a c #999966",
+"..........",
+"..........",
+"..........",
+"..........",
+"...##a#...",
+"..aaaaaa..",
+".aa....##.",
+".ab....a#.",
+".cb....#b.",
+"caaaaaaacb",
+"cddddddddb",
+"adaddddddb",
+"adaddddddb",
+"caadddddab",
+"addddddddb",
+"bbbbbbbbbb",
+".........."};
diff --git a/etc/images/icons/allout-widgets/dark-bg/mid-connector.png b/etc/images/icons/allout-widgets/dark-bg/mid-connector.png
new file mode 100644
index 00000000000..5ad503ed54d
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/mid-connector.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm b/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm
new file mode 100644
index 00000000000..b583988a220
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #ada5c6",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....##.....",
+"....#.#####",
+"....##.....",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......"};
diff --git a/etc/images/icons/allout-widgets/dark-bg/opened.png b/etc/images/icons/allout-widgets/dark-bg/opened.png
new file mode 100644
index 00000000000..5d91d6e8d6d
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/opened.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/opened.xpm b/etc/images/icons/allout-widgets/dark-bg/opened.xpm
new file mode 100644
index 00000000000..e86fd9ecf7e
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/opened.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char *dummy[]={
+"10 17 5 1",
+". c None",
+"a c #000080",
+"b c #63c639",
+"c c #ada5c6",
+"# c #ffff00",
+"..........",
+"..........",
+"..........",
+"..........",
+"#.......#a",
+"#ba...ab#a",
+"#ba...ab#a",
+"#bccccab#a",
+"#bacccab#a",
+"#bbacabb#a",
+"##bacab##a",
+"a##bbb##a.",
+".a#####a..",
+"..a###a...",
+"...a#a....",
+"....c.....",
+"....c....."};
diff --git a/etc/images/icons/allout-widgets/dark-bg/skip-descender.png b/etc/images/icons/allout-widgets/dark-bg/skip-descender.png
new file mode 100644
index 00000000000..6e3cb00160f
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/skip-descender.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm b/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm
new file mode 100644
index 00000000000..26ae40d57d5
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char *dummy[]={
+"11 17 1 1",
+". c None",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"..........."};
diff --git a/etc/images/icons/allout-widgets/dark-bg/through-descender.png b/etc/images/icons/allout-widgets/dark-bg/through-descender.png
new file mode 100644
index 00000000000..93410e03340
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/through-descender.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm b/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm
new file mode 100644
index 00000000000..7f375b4fd6c
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #ada5c6",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......"};
diff --git a/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
new file mode 100644
index 00000000000..e70d075690a
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
diff --git a/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
new file mode 100644
index 00000000000..2baa1e81211
--- /dev/null
+++ b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char *dummy[]={
+"10 17 6 1",
+". c None",
+"c c #333300",
+"a c #666600",
+"b c #999933",
+"# c #999966",
+"d c #ffff00",
+"..........",
+"..........",
+"..........",
+"...####...",
+"..#a#a###.",
+"..a#...##.",
+".a#.....#.",
+".##.......",
+"..##......",
+"b###c###bc",
+"bddddddddc",
+"#d#ddddddc",
+"#d#ddddddc",
+"b##ddddd#c",
+"#ddddddddc",
+"cccccccccc",
+".........."};
diff --git a/etc/images/icons/allout-widgets/light-bg/closed.png b/etc/images/icons/allout-widgets/light-bg/closed.png
new file mode 100644
index 00000000000..591a11adbb0
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/closed.png
diff --git a/etc/images/icons/allout-widgets/light-bg/closed.xpm b/etc/images/icons/allout-widgets/light-bg/closed.xpm
new file mode 100644
index 00000000000..20710b42822
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/closed.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *dummy[]={
+"9 17 4 1",
+". c None",
+"# c #00ff00",
+"b c #00ffff",
+"a c #606060",
+".........",
+".........",
+".........",
+"######...",
+"aaaaaa#..",
+".bbbbaa#.",
+"....bbaa#",
+"..aa..baa",
+"aaaaa..ba",
+"..aa..baa",
+"....bbaa#",
+".bbbbaa#.",
+"aaaaaa#..",
+"######...",
+".........",
+".........",
+"........."};
diff --git a/etc/images/icons/allout-widgets/light-bg/empty.png b/etc/images/icons/allout-widgets/light-bg/empty.png
new file mode 100644
index 00000000000..1c02d26ea41
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/empty.png
diff --git a/etc/images/icons/allout-widgets/light-bg/empty.xpm b/etc/images/icons/allout-widgets/light-bg/empty.xpm
new file mode 100644
index 00000000000..0ed70256f3e
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/empty.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *dummy[]={
+"10 17 4 1",
+". c None",
+"# c #00ff00",
+"b c #00ffff",
+"a c #606060",
+"..........",
+"..........",
+"..........",
+"...######.",
+"..#aaaaaa.",
+".#aabbbb..",
+"#aabb.....",
+"aab..aa...",
+"abaaaaa...",
+"aab..aa...",
+"#aabb.....",
+".#aabbbb..",
+"..#aaaaaa.",
+"...######.",
+"..........",
+"..........",
+".........."};
diff --git a/etc/images/icons/allout-widgets/light-bg/end-connector.png b/etc/images/icons/allout-widgets/light-bg/end-connector.png
new file mode 100644
index 00000000000..b865b40bfeb
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/end-connector.png
diff --git a/etc/images/icons/allout-widgets/light-bg/end-connector.xpm b/etc/images/icons/allout-widgets/light-bg/end-connector.xpm
new file mode 100644
index 00000000000..0c9c1c7820d
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/end-connector.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #606060",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....##.....",
+".....######",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"..........."};
diff --git a/etc/images/icons/allout-widgets/light-bg/extender-connector.png b/etc/images/icons/allout-widgets/light-bg/extender-connector.png
new file mode 100644
index 00000000000..4023a456776
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/extender-connector.png
diff --git a/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm b/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm
new file mode 100644
index 00000000000..36ea8f93093
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #606060",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"###########",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"..........."};
diff --git a/etc/images/icons/allout-widgets/light-bg/leaf.png b/etc/images/icons/allout-widgets/light-bg/leaf.png
new file mode 100755
index 00000000000..e2d7b189e84
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/leaf.png
diff --git a/etc/images/icons/allout-widgets/light-bg/leaf.xpm b/etc/images/icons/allout-widgets/light-bg/leaf.xpm
new file mode 100755
index 00000000000..f25bf40a258
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/leaf.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char *dummy[]={
+"16 21 9 1",
+". c None",
+"a c #737373",
+"b c #7b7b7b",
+"# c #808080",
+"c c #848484",
+"d c #8c8c8c",
+"e c #949494",
+"f c #9c9c9c",
+"g c #a5a5a5",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"...#####........",
+"..#abbcc#.......",
+".#abbccdd#......",
+"#abbccddee#.....",
+"#bbccddeef#.....",
+"#bccddeefg#.....",
+".#cddeefg#......",
+"..#deefg#.......",
+"...#####........",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"};
diff --git a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
new file mode 100755
index 00000000000..a6bc3e99a7a
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
diff --git a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
new file mode 100644
index 00000000000..bf7556f2ed9
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char *dummy[]={
+"10 17 6 1",
+". c None",
+"b c #333300",
+"# c #666600",
+"d c #808080",
+"c c #999933",
+"a c #999966",
+"..........",
+"..........",
+"..........",
+"..........",
+"...##a#...",
+"..aaaaaa..",
+".aa....##.",
+".ab....a#.",
+".cb....#b.",
+"caaaaaaacb",
+"cddddddddb",
+"adaddddddb",
+"adaddddddb",
+"caadddddab",
+"addddddddb",
+"bbbbbbbbbb",
+".........."};
diff --git a/etc/images/icons/allout-widgets/light-bg/mid-connector.png b/etc/images/icons/allout-widgets/light-bg/mid-connector.png
new file mode 100644
index 00000000000..658f340ca80
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/mid-connector.png
diff --git a/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm b/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm
new file mode 100644
index 00000000000..d86f1645c03
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #606060",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....##.....",
+"....#.#####",
+"....##.....",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......"};
diff --git a/etc/images/icons/allout-widgets/light-bg/opened.png b/etc/images/icons/allout-widgets/light-bg/opened.png
new file mode 100644
index 00000000000..2a77830c175
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/opened.png
diff --git a/etc/images/icons/allout-widgets/light-bg/opened.xpm b/etc/images/icons/allout-widgets/light-bg/opened.xpm
new file mode 100644
index 00000000000..ce3e98fea4b
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/opened.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *dummy[]={
+"10 17 4 1",
+". c None",
+"a c #00ff00",
+"b c #00ffff",
+"# c #606060",
+"..........",
+"..........",
+"..........",
+"..........",
+"#.......#a",
+"#b.....b#a",
+"#b.....b#a",
+"#b####.b#a",
+"#b.###.b#a",
+"#bb.#.bb#a",
+"##b.#.b##a",
+"a##b#b##a.",
+".a##b##a..",
+"..a###a...",
+"...a#a....",
+"....#.....",
+"....#....."};
diff --git a/etc/images/icons/allout-widgets/light-bg/skip-descender.png b/etc/images/icons/allout-widgets/light-bg/skip-descender.png
new file mode 100644
index 00000000000..6e3cb00160f
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/skip-descender.png
diff --git a/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm b/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm
new file mode 100644
index 00000000000..26ae40d57d5
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char *dummy[]={
+"11 17 1 1",
+". c None",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"...........",
+"..........."};
diff --git a/etc/images/icons/allout-widgets/light-bg/through-descender.png b/etc/images/icons/allout-widgets/light-bg/through-descender.png
new file mode 100644
index 00000000000..bdf08b80193
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/through-descender.png
diff --git a/etc/images/icons/allout-widgets/light-bg/through-descender.xpm b/etc/images/icons/allout-widgets/light-bg/through-descender.xpm
new file mode 100644
index 00000000000..d94c6f675c4
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/through-descender.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char *dummy[]={
+"11 17 2 1",
+". c None",
+"# c #606060",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......",
+"....#......"};
diff --git a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
new file mode 100755
index 00000000000..e70d075690a
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
diff --git a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
new file mode 100644
index 00000000000..2baa1e81211
--- /dev/null
+++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char *dummy[]={
+"10 17 6 1",
+". c None",
+"c c #333300",
+"a c #666600",
+"b c #999933",
+"# c #999966",
+"d c #ffff00",
+"..........",
+"..........",
+"..........",
+"...####...",
+"..#a#a###.",
+"..a#...##.",
+".a#.....#.",
+".##.......",
+"..##......",
+"b###c###bc",
+"bddddddddc",
+"#d#ddddddc",
+"#d#ddddddc",
+"b##ddddd#c",
+"#ddddddddc",
+"cccccccccc",
+".........."};
diff --git a/etc/images/newsticker/README b/etc/images/newsticker/README
new file mode 100644
index 00000000000..dc91d9eafd4
--- /dev/null
+++ b/etc/images/newsticker/README
@@ -0,0 +1,8 @@
+COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
+
+Files: browse-url.xpm get-all.xpm mark-immortal.xpm mark-read.xpm
+       narrow.xpm next-feed.xpm next-item.xpm prev-feed.xpm
+       prev-item.xpm update.xpm
+Author: Ulf Jasper
+Copyright (C) 2011  Free Software Foundation, Inc.
+License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/newsticker/browse-url.xpm b/etc/images/newsticker/browse-url.xpm
new file mode 100644
index 00000000000..e9f7900b893
--- /dev/null
+++ b/etc/images/newsticker/browse-url.xpm
@@ -0,0 +1,66 @@
+/* XPM */
+static char * visit_xpm[] = {
+"24 24 39 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF",
+"@      c #00E63D",
+"#      c #00E83E",
+"$      c #00E73D",
+"%      c #00E93E",
+"&      c #00E63C",
+"*      c #00E53C",
+"=      c #00E23B",
+"-      c #00E33B",
+";      c #00E83D",
+">      c #00E13A",
+",      c #00DD38",
+"'      c #00DE38",
+")      c #00E23A",
+"!      c #00E43C",
+"~      c #00DF39",
+"{      c #00DB37",
+"]      c #00D634",
+"^      c #00D734",
+"/      c #00E039",
+"(      c #00DC37",
+"_      c #00D835",
+":      c #00D332",
+"<      c #00CD2F",
+"[      c #00DB36",
+"}      c #00D433",
+"|      c #00CF30",
+"1      c #00DA36",
+"2      c #00D936",
+"3      c #00D533",
+"4      c #00D131",
+"5      c #00CE2F",
+"6      c #00CC2F",
+"7      c #00CA2D",
+"8      c #00C62B",
+"9      c #00C52A",
+"0      c #00BE27",
+"                        ",
+"                        ",
+"            .           ",
+"           .+.          ",
+"          .+++.         ",
+"         .++.++.        ",
+"        .++.@.++.       ",
+"       .++.##$.++.      ",
+"      .++.%%%#&.++.     ",
+"     .++.$%%%#*=.++.    ",
+"    .++.-@;##$*>,.++.   ",
+"   .++.')!&@@*=~{].++.  ",
+"  .++.^{~>---)/(_:<.++. ",
+"   .++.^[,~/~'(_}|.++.  ",
+"    .++.]_1[12^:|.++.   ",
+"     .++.:}33:45.++.    ",
+"      .++.<5567.++.     ",
+"       .++.889.++.      ",
+"        .++.0.++.       ",
+"         .++.++.        ",
+"          .+++.         ",
+"           .+.          ",
+"            .           ",
+"                        "};
diff --git a/etc/images/newsticker/get-all.xpm b/etc/images/newsticker/get-all.xpm
new file mode 100644
index 00000000000..2df66d7fe23
--- /dev/null
+++ b/etc/images/newsticker/get-all.xpm
@@ -0,0 +1,97 @@
+/* XPM */
+static char * get_all_xpm[] = {
+"24 24 70 1",
+"       c None",
+".      c #000000",
+"+      c #F3DA00",
+"@      c #F5DF00",
+"#      c #F7E300",
+"$      c #F9E700",
+"%      c #FAEA00",
+"&      c #FBEC00",
+"*      c #FBED00",
+"=      c #FCEE00",
+"-      c #FAEB00",
+";      c #F9E800",
+">      c #F8E500",
+",      c #F6E000",
+"'      c #F4DB00",
+")      c #F1D500",
+"!      c #EFD000",
+"~      c #B7CA00",
+"{      c #BFD100",
+"]      c #C5D700",
+"^      c #CBDB00",
+"/      c #CFDF00",
+"(      c #D2E200",
+"_      c #D4E400",
+":      c #D3E300",
+"<      c #D0E000",
+"[      c #CCDD00",
+"}      c #C7D800",
+"|      c #C1D300",
+"1      c #BACC00",
+"2      c #B1C500",
+"3      c #A8BC00",
+"4      c #20A900",
+"5      c #22AF00",
+"6      c #24B500",
+"7      c #26B900",
+"8      c #27BC00",
+"9      c #27BE00",
+"0      c #28BF00",
+"a      c #27BD00",
+"b      c #26BA00",
+"c      c #25B600",
+"d      c #23B100",
+"e      c #21AB00",
+"f      c #1FA400",
+"g      c #1C9B00",
+"h      c #21AA00",
+"i      c #24B300",
+"j      c #25B800",
+"k      c #25B700",
+"l      c #24B400",
+"m      c #23B000",
+"n      c #1FA500",
+"o      c #1D9E00",
+"p      c #20A800",
+"q      c #21AC00",
+"r      c #23B200",
+"s      c #22AD00",
+"t      c #1D9F00",
+"u      c #20A700",
+"v      c #1EA100",
+"w      c #1C9C00",
+"x      c #1DA000",
+"y      c #1B9800",
+"z      c #1A9600",
+"A      c #1A9700",
+"B      c #1A9500",
+"C      c #199200",
+"D      c #189100",
+"E      c #178C00",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"   ...................  ",
+"   .+@#$%&*=*&-;>,')!.  ",
+"   ...................  ",
+"                        ",
+"   ...................  ",
+"   .~{]^/(___:<[}|123.  ",
+"   ...................  ",
+"                        ",
+"   ...................  ",
+"    .45678909abcdefg.   ",
+"     .h5icj7jklmeno.    ",
+"      .pq5drrmshft.     ",
+"       .fu4h4pnvw.      ",
+"        .oxvxtwy.       ",
+"         .zAAzB.        ",
+"          .CCD.         ",
+"           .E.          ",
+"            .           ",
+"                        ",
+"                        "};
diff --git a/etc/images/newsticker/mark-immortal.xpm b/etc/images/newsticker/mark-immortal.xpm
new file mode 100644
index 00000000000..4e5a3649eb7
--- /dev/null
+++ b/etc/images/newsticker/mark-immortal.xpm
@@ -0,0 +1,120 @@
+/* XPM */
+static char * mark_immortal_xpm[] = {
+"24 24 93 2",
+"       c None",
+".      c #171717",
+"+      c #030303",
+"@      c #000000",
+"#      c #181818",
+"$      c #090909",
+"%      c #FFC960",
+"&      c #FFCB61",
+"*      c #FFCB62",
+"=      c #FFC961",
+"-      c #FFC75F",
+";      c #FFC65E",
+">      c #FFCA61",
+",      c #FFCD63",
+"'      c #FFCF65",
+")      c #FFD065",
+"!      c #FFCE64",
+"~      c #FFC35C",
+"{      c #FFC45D",
+"]      c #FFD166",
+"^      c #FFD267",
+"/      c #FFD368",
+"(      c #FFD167",
+"_      c #FFC05A",
+":      c #010101",
+"<      c #040404",
+"[      c #FFCC62",
+"}      c #FFD569",
+"|      c #FFD56A",
+"1      c #FFC860",
+"2      c #FFC25B",
+"3      c #FFBB56",
+"4      c #020202",
+"5      c #060606",
+"6      c #FFC15B",
+"7      c #FFC85F",
+"8      c #FFD469",
+"9      c #FFD66A",
+"0      c #FFBC57",
+"a      c #1B1B1B",
+"b      c #070707",
+"c      c #FFBA55",
+"d      c #FFB451",
+"e      c #FFB954",
+"f      c #FFB350",
+"g      c #FFB652",
+"h      c #FFBE58",
+"i      c #FFCD64",
+"j      c #FFD066",
+"k      c #FFC059",
+"l      c #FFB14E",
+"m      c #0B0B0B",
+"n      c #FFBB55",
+"o      c #FFC15A",
+"p      c #FFB552",
+"q      c #FFAD4B",
+"r      c #080808",
+"s      c #FFAF4C",
+"t      c #FFB853",
+"u      c #FFA948",
+"v      c #050505",
+"w      c #FFB04E",
+"x      c #FFB753",
+"y      c #FFBC56",
+"z      c #FFC55D",
+"A      c #FFC55E",
+"B      c #FFC45C",
+"C      c #FFBD57",
+"D      c #FFB854",
+"E      c #FFB34F",
+"F      c #FFAB4A",
+"G      c #FFA545",
+"H      c #FFAA49",
+"I      c #FFB04D",
+"J      c #FFB551",
+"K      c #FFBF58",
+"L      c #FFB24F",
+"M      c #FFAC4A",
+"N      c #FFA646",
+"O      c #FFA344",
+"P      c #FFA848",
+"Q      c #FFB14F",
+"R      c #FFAF4D",
+"S      c #FFA546",
+"T      c #FFA243",
+"U      c #FFA445",
+"V      c #FFAE4C",
+"W      c #FFA444",
+"X      c #FFA142",
+"Y      c #FF9F41",
+"Z      c #0A0A0A",
+"`      c #FF9E40",
+" .     c #FF9F40",
+"                                                ",
+"                                                ",
+"                                                ",
+"                  . + @ @ + #                   ",
+"              $ @ % & * * = - + +               ",
+"            @ ; > , ' ) ' ! * - ~ @             ",
+"          @ { > ! ] ^ / / ( ' * ; _ :           ",
+"        < _ ; [ ) / } | } / ] , 1 2 3 4         ",
+"        5 6 7 , ] 8 9 9 9 } ^ ! = ~ 0 a         ",
+"      b c 6 - , ] 8 9 9 9 } ^ ! % ~ 0 d 5       ",
+"      : e _ ; * ) / 8 } } / ] , 1 2 3 f 5       ",
+"      : g h { = i j ^ / ^ ] ! * ; k e l m       ",
+"      : f n o ; > , ' ) ' ! * - 2 0 p q r       ",
+"      : s g 0 6 ; % > * * = - ~ h t l u r       ",
+"      v u w x y k ~ z A z B o C D E F G b       ",
+"        5 H I J e 0 h K h C c x L M N .         ",
+"        4 O P q Q d g x g J L R H S T <         ",
+"          @ T U P F q V q M H N W X +           ",
+"            @ Y T O W G G W O X Y @             ",
+"              4 Z ` Y Y Y  .` 4 4               ",
+"                  5 : : @ @ Z                   ",
+"                                                ",
+"                                                ",
+"                                                "};
diff --git a/etc/images/newsticker/mark-read.xpm b/etc/images/newsticker/mark-read.xpm
new file mode 100644
index 00000000000..3a643bb786a
--- /dev/null
+++ b/etc/images/newsticker/mark-read.xpm
@@ -0,0 +1,71 @@
+/* XPM */
+static char * mark_read_xpm[] = {
+"24 24 44 1",
+"       c None",
+".      c #C20000",
+"+      c #BE0000",
+"@      c #C70000",
+"#      c #CE0000",
+"$      c #C90000",
+"%      c #BD0000",
+"&      c #CB0000",
+"*      c #D10000",
+"=      c #D70000",
+"-      c #D30000",
+";      c #CD0000",
+">      c #C60000",
+",      c #D40000",
+"'      c #DA0000",
+")      c #DE0000",
+"!      c #DB0000",
+"~      c #D60000",
+"{      c #D00000",
+"]      c #DC0000",
+"^      c #E00000",
+"/      c #E40000",
+"(      c #E10000",
+"_      c #DD0000",
+":      c #D80000",
+"<      c #E50000",
+"[      c #E70000",
+"}      c #E60000",
+"|      c #E20000",
+"1      c #E90000",
+"2      c #E80000",
+"3      c #E30000",
+"4      c #DF0000",
+"5      c #D90000",
+"6      c #CC0000",
+"7      c #C10000",
+"8      c #C30000",
+"9      c #BF0000",
+"0      c #B90000",
+"a      c #BC0000",
+"b      c #BB0000",
+"c      c #B80000",
+"d      c #B50000",
+"e      c #B70000",
+"                        ",
+"                        ",
+"                        ",
+"    .              +    ",
+"   +@#            $.%   ",
+"    &*=          -;>    ",
+"     ,')        !~{     ",
+"      ]^/      (_:      ",
+"       (<[    }|)       ",
+"        <[1  2<|        ",
+"         }222[<         ",
+"          }}}<          ",
+"          333|          ",
+"         _4^4)]         ",
+"        ~:'  5=-        ",
+"       6{-    *#$       ",
+"      7>$      @89      ",
+"     0a+        %bc     ",
+"    ddc          edd    ",
+"   ddd            ddd   ",
+"    d              d    ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/newsticker/narrow.xpm b/etc/images/newsticker/narrow.xpm
new file mode 100644
index 00000000000..d802764aa22
--- /dev/null
+++ b/etc/images/newsticker/narrow.xpm
@@ -0,0 +1,75 @@
+/* XPM */
+static char * narrow_xpm[] = {
+"24 24 48 1",
+"       c None",
+".      c #000000",
+"+      c #969696",
+"@      c #9E9E9E",
+"#      c #A4A4A4",
+"$      c #AAAAAA",
+"%      c #AEAEAE",
+"&      c #B1B1B1",
+"*      c #B3B3B3",
+"=      c #B4B4B4",
+"-      c #B2B2B2",
+";      c #AFAFAF",
+">      c #ABABAB",
+",      c #A6A6A6",
+"'      c #A0A0A0",
+")      c #989898",
+"!      c #909090",
+"~      c #73AAD4",
+"{      c #7AB2DA",
+"]      c #7FB8DF",
+"^      c #84BDE3",
+"/      c #88C2E7",
+"(      c #8BC5E9",
+"_      c #8DC7EB",
+":      c #8CC6EA",
+"<      c #89C3E8",
+"[      c #86BFE5",
+"}      c #81BAE1",
+"|      c #7BB3DC",
+"1      c #75ACD6",
+"2      c #6DA4CF",
+"3      c #979797",
+"4      c #A3A3A3",
+"5      c #A8A8A8",
+"6      c #ADADAD",
+"7      c #ACACAC",
+"8      c #A9A9A9",
+"9      c #A5A5A5",
+"0      c #9A9A9A",
+"a      c #929292",
+"b      c #8C8C8C",
+"c      c #808080",
+"d      c #818181",
+"e      c #838383",
+"f      c #848484",
+"g      c #858585",
+"h      c #868686",
+"i      c #828282",
+"                        ",
+"                        ",
+"                        ",
+"   ..................   ",
+"   .+@#$%&*=*-;>,')!.   ",
+"   ..................   ",
+"                        ",
+"                        ",
+"   ..................   ",
+"   .~{]^/(___:<[}|12.   ",
+"   ..................   ",
+"                        ",
+"                        ",
+"   ..................   ",
+"   .!3@45>666789'0ab.   ",
+"   ..................   ",
+"                        ",
+"                        ",
+"   ..................   ",
+"   .cccdefghhgficccc.   ",
+"   ..................   ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/newsticker/next-feed.xpm b/etc/images/newsticker/next-feed.xpm
new file mode 100644
index 00000000000..9424e16d289
--- /dev/null
+++ b/etc/images/newsticker/next-feed.xpm
@@ -0,0 +1,84 @@
+/* XPM */
+static char * next_feed_xpm[] = {
+"24 24 57 1",
+"       c None",
+".      c #000000",
+"+      c #6CA2CE",
+"@      c #75ADD6",
+"#      c #71A8D3",
+"$      c #79B1DA",
+"%      c #7EB7DE",
+"&      c #7DB5DD",
+"*      c #81BAE1",
+"=      c #85BEE4",
+"-      c #78B0D9",
+";      c #7FB7DE",
+">      c #83BCE3",
+",      c #87C1E6",
+"'      c #8AC4E9",
+")      c #7BB3DB",
+"!      c #80B8DF",
+"~      c #88C2E7",
+"{      c #8BC5E9",
+"]      c #8DC7EB",
+"^      c #7CB4DC",
+"/      c #7FB8DF",
+"(      c #84BDE3",
+"_      c #7BB3DC",
+":      c #83BCE2",
+"<      c #87C0E6",
+"[      c #8AC4E8",
+"}      c #8BC5EA",
+"|      c #8CC6EA",
+"1      c #88C1E6",
+"2      c #89C3E8",
+"3      c #8AC3E8",
+"4      c #7EB6DE",
+"5      c #82BBE1",
+"6      c #86C0E5",
+"7      c #87C0E5",
+"8      c #75ACD6",
+"9      c #7AB2DA",
+"0      c #81B9E0",
+"a      c #82BBE2",
+"b      c #71A8D2",
+"c      c #70A7D1",
+"d      c #74ACD6",
+"e      c #699FCC",
+"f      c #6EA5D0",
+"g      c #72A9D4",
+"h      c #669CC9",
+"i      c #6298C5",
+"j      c #679DCA",
+"k      c #6BA1CD",
+"l      c #6095C3",
+"m      c #5C91C0",
+"n      c #5F94C2",
+"o      c #5B90C0",
+"p      c #588CBC",
+"q      c #578CBC",
+"r      c #5589BA",
+"                        ",
+"                        ",
+"     .          ...     ",
+"     ..         .+.     ",
+"     .@.        .#.     ",
+"     .$%.       .@.     ",
+"     .&*=.      .-.     ",
+"     .;>,'.     .).     ",
+"     .!=~{].    .^.     ",
+"     ./(~{]].   ._.     ",
+"     .%:<[}||.  .).     ",
+"     .&*=12'3~. .-.     ",
+"     .$45=6<7.  .@.     ",
+"     .8940a:.   .b.     ",
+"     .cd-)&.    .+.     ",
+"     .efg8.     .h.     ",
+"     .ijk.      .l.     ",
+"     .mn.       .o.     ",
+"     .p.        .q.     ",
+"     ..         .r.     ",
+"     .          ...     ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/newsticker/next-item.xpm b/etc/images/newsticker/next-item.xpm
new file mode 100644
index 00000000000..b3759cc1b61
--- /dev/null
+++ b/etc/images/newsticker/next-item.xpm
@@ -0,0 +1,69 @@
+/* XPM */
+static char * next_xpm[] = {
+"24 24 42 1",
+"       c None",
+".      c #000000",
+"+      c #7EB6DE",
+"@      c #82BBE2",
+"#      c #85BEE4",
+"$      c #88C1E7",
+"%      c #8AC3E8",
+"&      c #87C1E6",
+"*      c #8AC4E9",
+"=      c #8CC6EA",
+"-      c #8CC6EB",
+";      c #88C2E7",
+">      c #8BC5E9",
+",      c #8DC7EB",
+"'      c #87C0E6",
+")      c #8AC4E8",
+"!      c #8BC5EA",
+"~      c #8BC4E9",
+"{      c #88C1E6",
+"]      c #89C3E8",
+"^      c #86BFE5",
+"/      c #83BBE2",
+"(      c #82BBE1",
+"_      c #86C0E5",
+":      c #87C0E5",
+"<      c #83BCE2",
+"[      c #81B9E0",
+"}      c #81BAE1",
+"|      c #78B0D9",
+"1      c #7BB3DB",
+"2      c #7DB5DD",
+"3      c #7DB6DD",
+"4      c #72A9D4",
+"5      c #75ACD6",
+"6      c #76AED7",
+"7      c #77AFD8",
+"8      c #6BA1CD",
+"9      c #6EA4CF",
+"0      c #6FA6D1",
+"a      c #6298C6",
+"b      c #659BC8",
+"c      c #5C91C0",
+"                        ",
+"                        ",
+"       .                ",
+"       ..               ",
+"       .+.              ",
+"       .@#.             ",
+"       .#$%.            ",
+"       .&*=-.           ",
+"       .;>,,,.          ",
+"       .;>,,,=.         ",
+"       .')!==~;.        ",
+"       .#{]*%;^/.       ",
+"       .(#_':#<.        ",
+"       .+[@</}.         ",
+"       .|1232.          ",
+"       .4567.           ",
+"       .890.            ",
+"       .ab.             ",
+"       .c.              ",
+"       ..               ",
+"       .                ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/newsticker/prev-feed.xpm b/etc/images/newsticker/prev-feed.xpm
new file mode 100644
index 00000000000..9871eaa637e
--- /dev/null
+++ b/etc/images/newsticker/prev-feed.xpm
@@ -0,0 +1,79 @@
+/* XPM */
+static char * prev_feed_xpm[] = {
+"24 24 52 1",
+"       c None",
+".      c #000000",
+"+      c #70A7D2",
+"@      c #75ADD6",
+"#      c #71A8D3",
+"$      c #79B1DA",
+"%      c #7BB3DB",
+"&      c #7DB5DD",
+"*      c #83BBE2",
+"=      c #7EB6DE",
+"-      c #78B0D9",
+";      c #7FB7DE",
+">      c #88C2E7",
+",      c #85BEE4",
+"'      c #80B9E0",
+")      c #80B8DF",
+"!      c #8CC6EA",
+"~      c #89C3E8",
+"{      c #86BFE5",
+"]      c #81BAE1",
+"^      c #7CB4DC",
+"/      c #7FB8DF",
+"(      c #8DC7EB",
+"_      c #7BB3DC",
+":      c #7EB7DE",
+"<      c #8BC4E9",
+"[      c #8AC4E9",
+"}      c #8AC3E8",
+"|      c #87C0E6",
+"1      c #87C0E5",
+"2      c #83BCE2",
+"3      c #75ACD6",
+"4      c #7FB7DF",
+"5      c #77AED8",
+"6      c #71A8D2",
+"7      c #70A7D1",
+"8      c #76ADD7",
+"9      c #6CA2CE",
+"0      c #699FCC",
+"a      c #73AAD4",
+"b      c #6BA1CD",
+"c      c #669CC9",
+"d      c #6298C5",
+"e      c #689ECB",
+"f      c #6499C7",
+"g      c #6095C3",
+"h      c #5C91C0",
+"i      c #5E93C2",
+"j      c #5B90C0",
+"k      c #588CBC",
+"l      c #578CBC",
+"m      c #5589BA",
+"                        ",
+"                        ",
+"     ...          .     ",
+"     .+.         ..     ",
+"     .@.        .#.     ",
+"     .$.       .%@.     ",
+"     .&.      .*=-.     ",
+"     .;.     .>,'%.     ",
+"     .).    .!~{]^.     ",
+"     ./.   .(!~{]_.     ",
+"     .:.  .!!<>,'%.     ",
+"     .&. .~[}>{*=-.     ",
+"     .$.  .|1,2/%@.     ",
+"     .3.   .*]4%56.     ",
+"     .7.    .^$8#9.     ",
+"     .0.     .a7bc.     ",
+"     .d.      .efg.     ",
+"     .h.       .ij.     ",
+"     .k.        .l.     ",
+"     .m.         ..     ",
+"     ...          .     ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/newsticker/prev-item.xpm b/etc/images/newsticker/prev-item.xpm
new file mode 100644
index 00000000000..f9d71f912f6
--- /dev/null
+++ b/etc/images/newsticker/prev-item.xpm
@@ -0,0 +1,66 @@
+/* XPM */
+static char * previous_xpm[] = {
+"24 24 39 1",
+"       c None",
+".      c #000000",
+"+      c #7BB3DB",
+"@      c #83BCE2",
+"#      c #7FB8DF",
+"$      c #89C2E7",
+"%      c #86BFE5",
+"&      c #83BBE2",
+"*      c #8CC6EA",
+"=      c #8BC4E9",
+"-      c #88C2E7",
+";      c #85BEE4",
+">      c #8DC7EB",
+",      c #89C3E8",
+"'      c #8AC4E8",
+")      c #8BC5EA",
+"!      c #88C1E6",
+"~      c #8AC4E9",
+"{      c #8AC3E8",
+"]      c #86C0E5",
+"^      c #87C0E6",
+"/      c #87C0E5",
+"(      c #82BBE2",
+"_      c #81BAE1",
+":      c #7FB7DF",
+"<      c #7DB6DD",
+"[      c #7DB5DD",
+"}      c #7CB4DC",
+"|      c #79B1DA",
+"1      c #76ADD7",
+"2      c #77AFD8",
+"3      c #73AAD4",
+"4      c #70A7D1",
+"5      c #6EA5D0",
+"6      c #6CA2CE",
+"7      c #689ECB",
+"8      c #6399C7",
+"9      c #6095C4",
+"0      c #5C90C0",
+"                        ",
+"                        ",
+"                .       ",
+"               ..       ",
+"              .+.       ",
+"             .@#.       ",
+"            .$%&.       ",
+"           .*=-;.       ",
+"          .>>*,%.       ",
+"         .>>>*,%.       ",
+"        .')**=-;.       ",
+"       .;!,~{-%&.       ",
+"        .;]^/;@#.       ",
+"         .(@&_:+.       ",
+"          .<[}|1.       ",
+"           .2134.       ",
+"            .567.       ",
+"             .89.       ",
+"              .0.       ",
+"               ..       ",
+"                .       ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/images/newsticker/update.xpm b/etc/images/newsticker/update.xpm
new file mode 100644
index 00000000000..35d6c18ba11
--- /dev/null
+++ b/etc/images/newsticker/update.xpm
@@ -0,0 +1,64 @@
+/* XPM */
+static char * update_xpm[] = {
+"24 24 37 1",
+"       c None",
+".      c #076D00",
+"+      c #0A8600",
+"@      c #0A8800",
+"#      c #098400",
+"$      c #087200",
+"%      c #087900",
+"&      c #098500",
+"*      c #098100",
+"=      c #087600",
+"-      c #097E00",
+";      c #097F00",
+">      c #0A8700",
+",      c #0A8C00",
+"'      c #097C00",
+")      c #098300",
+"!      c #0A8900",
+"~      c #0A8E00",
+"{      c #0B9200",
+"]      c #087700",
+"^      c #076E00",
+"/      c #076C00",
+"(      c #076B00",
+"_      c #076A00",
+":      c #076900",
+"<      c #076800",
+"[      c #066700",
+"}      c #066500",
+"|      c #066400",
+"1      c #066300",
+"2      c #066600",
+"3      c #066200",
+"4      c #076700",
+"5      c #065E00",
+"6      c #066100",
+"7      c #065F00",
+"8      c #066000",
+"                        ",
+"                        ",
+"                        ",
+"    .    +@@@+#         ",
+"    $% &@      +*       ",
+"    =-#          ;      ",
+"    %*>,          '     ",
+"    ')!~{          =    ",
+"                   ]$   ",
+"   ^                ^   ",
+"   .                .   ",
+"   /                (   ",
+"   _                :   ",
+"   <                [   ",
+"   }                |   ",
+"   [[                   ",
+"    1          $.:23    ",
+"     3          4}35    ",
+"      6          655    ",
+"       76      85 55    ",
+"        5555555    5    ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index b63d560582c..6117e72be2a 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -261,7 +261,7 @@ template defgroup :indent :blank
 ----
 (defgroup $?MODESYM$-mode nil
   "$MODESYM$ group."
-  :group 'langauges)
+  :group 'languages)
 ----
 bind "g"
 
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
new file mode 100644
index 00000000000..0105080ab08
--- /dev/null
+++ b/etc/themes/dichromacy-theme.el
@@ -0,0 +1,127 @@
+;;; dichromacy-theme.el --- color theme suitable for color-blind users
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Chong Yidong <cyd@stupidchicken>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme dichromacy
+  "Face colors suitable for red/green color-blind users.
+The color palette is from B. Wong, Nature Methods 8, 441 (2011).
+It is intended to provide good variability while being easily
+differentiated by individuals with protanopia or deuteranopia.
+
+Basic, Font Lock, Isearch, Gnus, Message, Flyspell, and
+Ansi-Color faces are included.")
+
+(let ((class '((class color) (min-colors 89)))
+      (orange "#e69f00")
+      (skyblue "#56b4e9")
+      (bluegreen "#009e73")
+      (yellow "#f8ec59")
+      (blue "#0072b2")
+      (vermillion "#d55e00")
+      (redpurple "#cc79a7")
+      (bluegray "#848ea9"))
+  (custom-theme-set-faces
+   'dichromacy
+   `(default ((,class (:foreground "black" :background "white"))))
+   `(cursor ((,class (:foreground "white" :background "black"))))
+   ;; Highlighting faces
+   `(fringe ((,class (:background "#f7f7f7"))))
+   `(highlight ((,class (:foreground ,blue :background "#e5e5e5"))))
+   `(region ((,class (:foreground unspecified :background ,yellow))))
+   `(secondary-selection ((,class (:background "#e5e5e5"))))
+   `(isearch ((,class (:foreground "white" :background ,vermillion))))
+   `(lazy-highlight ((,class (:foreground "white" :background ,redpurple))))
+   `(trailing-whitespace ((,class (:background ,vermillion))))
+   ;; Mode line faces
+   `(mode-line ((,class (:box (:line-width -1 :style released-button)
+                              :background "#e5e5e5" :foreground "black"))))
+   `(mode-line-inactive ((,class (:box (:line-width -1 :style released-button)
+                                       :background "#b0b0b0"
+                                       :foreground "black"))))
+   ;; Escape and prompt faces
+   `(minibuffer-prompt ((,class (:weight bold :foreground ,blue))))
+   `(escape-glyph ((,class (:foreground ,vermillion))))
+   ;; Font lock faces
+   `(font-lock-builtin-face ((,class (:foreground ,blue))))
+   `(font-lock-comment-face ((,class (:slant italic :foreground ,bluegreen))))
+   `(font-lock-constant-face ((,class (:weight bold :foreground ,vermillion))))
+   `(font-lock-function-name-face ((,class (:foreground ,vermillion))))
+   `(font-lock-keyword-face ((,class (:weight bold :foreground ,skyblue))))
+   `(font-lock-string-face ((,class (:foreground ,bluegray))))
+   `(font-lock-type-face ((,class (:weight bold :foreground ,blue))))
+   `(font-lock-variable-name-face ((,class (:weight bold :foreground ,orange))))
+   `(font-lock-warning-face ((,class (:weight bold :slant italic
+                                      :foreground ,vermillion))))
+   ;; Button and link faces
+   `(button ((,class (:underline t :foreground ,blue))))
+   `(link ((,class (:underline t :foreground ,blue))))
+   `(link-visited ((,class (:underline t :foreground ,redpurple))))
+   ;; Gnus faces
+   `(gnus-group-news-1 ((,class (:weight bold :foreground ,vermillion))))
+   `(gnus-group-news-1-low ((,class (:foreground ,vermillion))))
+   `(gnus-group-news-2 ((,class (:weight bold :foreground ,orange))))
+   `(gnus-group-news-2-low ((,class (:foreground ,orange))))
+   `(gnus-group-news-3 ((,class (:weight bold :foreground ,skyblue))))
+   `(gnus-group-news-3-low ((,class (:foreground ,skyblue))))
+   `(gnus-group-news-4 ((,class (:weight bold :foreground ,redpurple))))
+   `(gnus-group-news-4-low ((,class (:foreground ,redpurple))))
+   `(gnus-group-news-5 ((,class (:weight bold :foreground ,blue))))
+   `(gnus-group-news-5-low ((,class (:foreground ,blue))))
+   `(gnus-group-news-low ((,class (:foreground ,bluegreen))))
+   `(gnus-group-mail-1 ((,class (:weight bold :foreground ,vermillion))))
+   `(gnus-group-mail-1-low ((,class (:foreground ,vermillion))))
+   `(gnus-group-mail-2 ((,class (:weight bold :foreground ,orange))))
+   `(gnus-group-mail-2-low ((,class (:foreground ,orange))))
+   `(gnus-group-mail-3 ((,class (:weight bold :foreground ,skyblue))))
+   `(gnus-group-mail-3-low ((,class (:foreground ,skyblue))))
+   `(gnus-group-mail-low ((,class (:foreground ,bluegreen))))
+   `(gnus-header-content ((,class (:foreground ,redpurple))))
+   `(gnus-header-from ((,class (:weight bold :foreground ,blue))))
+   `(gnus-header-subject ((,class (:foreground ,orange))))
+   `(gnus-header-name ((,class (:foreground ,skyblue))))
+   `(gnus-header-newsgroups ((,class (:foreground ,vermillion))))
+   ;; Message faces
+   `(message-header-name ((,class (:foreground ,skyblue))))
+   `(message-header-cc ((,class (:foreground ,vermillion))))
+   `(message-header-other ((,class (:foreground ,bluegreen))))
+   `(message-header-subject ((,class (:foreground ,orange))))
+   `(message-header-to ((,class (:weight bold :foreground ,blue))))
+   `(message-cited-text ((,class (:slant italic :foreground ,bluegreen))))
+   `(message-separator ((,class (:weight bold :foreground ,redpurple))))
+   ;; Flyspell
+   `(flyspell-duplicate ((,class (:weight unspecified :foreground unspecified
+                                  :slant unspecified :underline ,orange))))
+   `(flyspell-incorrect ((,class (:weight unspecified :foreground unspecified
+                                  :slant unspecified :underline ,redpurple)))))
+
+  (custom-theme-set-variables
+   'dichromacy
+   `(ansi-color-names-vector ["black" ,vermillion ,bluegreen ,yellow
+                              ,blue ,redpurple ,skyblue "white"])))
+
+(provide-theme 'dichromacy)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; dichromacy-theme.el ends here
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el
new file mode 100644
index 00000000000..98c74b268af
--- /dev/null
+++ b/etc/themes/light-blue-theme.el
@@ -0,0 +1,67 @@
+;;; light-blue-theme.el --- Custom theme for faces
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Drew Adams <drew.adams@oracle.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Extracted from the settings in oneonone.el by Drew Adams.
+
+;;; Code:
+
+(deftheme light-blue
+  "Face colors utilizing a light blue backgound.")
+
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'light-blue
+   `(default ((,class (:background "LightBlue" :foreground "black"))))
+   `(cursor ((,class (:background "red"))))
+   `(fringe ((,class (:background "gray85"))))
+   ;; Highlighting faces
+   `(highlight ((,class (:background "cyan"))))
+   `(region ((,class (:background "MediumAquamarine"))))
+   `(secondary-selection ((,class (:background "white" :foreground "black"))))
+   `(isearch ((,class (:background "green" :foreground "Black"))))
+   `(lazy-highlight ((,class (:background "dark turquoise"))))
+   `(query-replace ((,class (:inherit isearch :background "white" :foreground "black"))))
+   `(match ((,class (:background "SkyBlue"))))
+   ;; Mode line faces
+   `(mode-line ((,class (:background "PaleGoldenrod" :foreground "black" :box (:line-width -1 :style released-button)))))
+   `(mode-line-buffer-id ((,class (:overline "red" :underline "red"))))
+   `(mode-line-inactive ((,class (:inherit mode-line :background "LightGray" :foreground "grey20" :box (:line-width -1 :color "grey75") :weight light))))
+   ;; Escape and prompt faces
+   `(escape-glyph ((,class (:background "gold" :foreground "blue" :box (:line-width 1 :color "blue" :style released-button)))))
+   ;; Font lock faces
+   `(font-lock-builtin-face ((,class (:foreground "#b35caf"))))
+   `(font-lock-constant-face ((,class (:foreground "#00006DE06DE0"))))
+   `(font-lock-function-name-face ((,class (:foreground "red"))))
+   `(font-lock-keyword-face ((,class (:foreground "Blue3"))))
+   `(font-lock-string-face ((,class (:foreground "Magenta4"))))
+   `(font-lock-warning-face ((,class (:foreground "orange red" :weight bold))))
+   ;; Compilation faces
+   `(next-error ((,class (:inherit region :background "SkyBlue"))))))
+
+(provide-theme 'light-blue)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; light-blue-theme.el ends here
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
new file mode 100644
index 00000000000..ab4b2bc6191
--- /dev/null
+++ b/etc/themes/misterioso-theme.el
@@ -0,0 +1,110 @@
+;;; misterioso-theme.el --- Custom face theme for Emacs
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Sebastian Hermida
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme misterioso
+  "Predominantly blue/cyan faces on a dark cyan background.")
+
+(let ((class '((class color) (min-colors 89))))
+
+  (custom-theme-set-faces
+   'misterioso
+   ;; Ensure sufficient contrast on 256-color xterms.
+   `(default ((((class color) (min-colors 4096))
+               (:background "#2d3743" :foreground "#e1e1e0"))
+              (,class
+               (:background "#3a3a3a" :foreground "#e1e1e0"))))
+   `(cursor ((,class (:background "#415160" :foreground "#415160"))))
+   ;; Highlighting faces
+   `(fringe ((,class (:background "#2e3748"))))
+   `(highlight ((,class (:background "#338f86" :foreground "#e1e1e0"))))
+   `(region ((,class (:background "#2d4948" :foreground "#e1e1e0"))))
+   `(isearch ((,class (:background "#fcffad" :foreground "#000000"))))
+   `(lazy-highlight ((,class (:background "#338f86"))))
+   `(trailing-whitespace ((,class (:background "#ff4242"))))
+   ;; Mode line faces
+   `(mode-line ((,class (:background "#212931" :foreground "#eeeeec"))))
+   `(mode-line-inactive
+     ((,class (:background "#878787" :foreground "#eeeeec"))))
+   `(header-line ((,class (:background "#e5e5e5" :foreground "#333333"))))
+   ;; Escape and prompt faces
+   `(minibuffer-prompt ((,class (:foreground "#729fcf" :weight bold))))
+   ;; Font lock faces
+   `(font-lock-builtin-face ((,class (:foreground "#23d7d7"))))
+   `(font-lock-comment-face ((,class (:foreground "#74af68"))))
+   `(font-lock-constant-face ((,class (:foreground "#008b8b"))))
+   `(font-lock-function-name-face
+     ((,class (:foreground "#00ede1" :weight bold))))
+   `(font-lock-keyword-face ((,class (:foreground "#ffad29" :weight bold))))
+   `(font-lock-string-face ((,class (:foreground "#e67128"))))
+   `(font-lock-type-face ((,class (:foreground "#34cae2"))))
+   `(font-lock-variable-name-face ((,class (:foreground "#dbdb95"))))
+   `(font-lock-warning-face ((,class (:foreground "#ff4242" :weight bold))))
+   ;; Buttons and links
+   `(button ((,class (:underline t))))
+   `(link ((,class (:foreground "#59e9ff" :underline t))))
+   `(link-visited ((,class (:foreground "#ed74cd" :underline t))))
+   ;; Gnus faces
+   `(gnus-group-news-1 ((,class (:foreground "#ff4242" :weight bold))))
+   `(gnus-group-news-1-low ((,class (:foreground "#ff4242"))))
+   `(gnus-group-news-2 ((,class (:foreground "#00ede1" :weight bold))))
+   `(gnus-group-news-2-low ((,class (:foreground "#00ede1"))))
+   `(gnus-group-news-3 ((,class (:foreground "#23d7d7" :weight bold))))
+   `(gnus-group-news-3-low ((,class (:foreground "#23d7d7"))))
+   `(gnus-group-news-4 ((,class (:foreground "#74af68" :weight bold))))
+   `(gnus-group-news-4-low ((,class (:foreground "#74af68"))))
+   `(gnus-group-news-5 ((,class (:foreground "#dbdb95" :weight bold))))
+   `(gnus-group-news-5-low ((,class (:foreground "#dbdb95"))))
+   `(gnus-group-news-low ((,class (:foreground "#008b8b"))))
+   `(gnus-group-mail-1 ((,class (:foreground "#ff4242" :weight bold))))
+   `(gnus-group-mail-1-low ((,class (:foreground "#ff4242"))))
+   `(gnus-group-mail-2 ((,class (:foreground "#00ede1" :weight bold))))
+   `(gnus-group-mail-2-low ((,class (:foreground "#00ede1"))))
+   `(gnus-group-mail-3 ((,class (:foreground "#23d7d7"  :weight bold))))
+   `(gnus-group-mail-3-low ((,class (:foreground "#23d7d7"))))
+   `(gnus-group-mail-low ((,class (:foreground "#008b8b"))))
+   `(gnus-header-content ((,class (:weight normal :foreground "#ffad29"))))
+   `(gnus-header-from ((,class (:foreground "#e67128" :weight bold))))
+   `(gnus-header-subject ((,class (:foreground "#dbdb95"))))
+   `(gnus-header-name ((,class (:foreground "#00ede1"))))
+   `(gnus-header-newsgroups ((,class (:foreground "#e67128"))))
+   ;; Message faces
+   `(message-header-name ((,class (:foreground "#ffad29" :weight bold))))
+   `(message-header-cc ((,class (:foreground "#e67128"))))
+   `(message-header-other ((,class (:foreground "#e67128"))))
+   `(message-header-subject ((,class (:foreground "#dbdb95"))))
+   `(message-header-to ((,class (:foreground "#00ede1"))))
+   `(message-cited-text ((,class (:foreground "#74af68"))))
+   `(message-separator ((,class (:foreground "#23d7d7"))))))
+
+(custom-theme-set-variables
+ 'misterioso
+ '(ansi-color-names-vector ["#2d3743" "#ff4242" "#74af68" "#dbdb95"
+                            "#34cae2" "#008b8b" "#00ede1" "#e1e1e0"]))
+
+(provide-theme 'misterioso)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; misterioso-theme.el  ends here
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index 613c98f505a..b5621d10320 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -28,7 +28,7 @@
 ;;; Code:
 
 (deftheme tango-dark
-  "Theme for faces, based on the Tango palette with a dark background.
+  "Face colors using the Tango palette (dark background).
 Basic, Font Lock, Isearch, Gnus, Message, Ediff, Flyspell,
 Semantic, and Ansi-Color faces are included.")
 
@@ -49,7 +49,13 @@ Semantic, and Ansi-Color faces are included.")
 
   (custom-theme-set-faces
    'tango-dark
-   `(default ((,class (:foreground ,alum-1 :background ,alum-6))))
+   ;; Ensure sufficient contrast on low-color terminals.
+   `(default ((((class color) (min-colors 4096))
+               (:foreground ,alum-1 :background ,alum-6))
+              (((class color) (min-colors 256))
+               (:foreground ,alum-1 :background "#222"))
+              (,class
+               (:foreground ,alum-1 :background "black"))))
    `(cursor ((,class (:foreground ,alum-6 :background ,butter-1))))
    ;; Highlighting faces
    `(fringe ((,class (:background ,alum-7))))
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index 7be50a17f5f..c58e0036353 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -28,7 +28,7 @@
 ;;; Code:
 
 (deftheme tango
-  "Theme for faces, based on the Tango palette with a light background.
+  "Face colors using the Tango palette (light background).
 Basic, Font Lock, Isearch, Gnus, Message, Ediff, Flyspell,
 Semantic, and Ansi-Color faces are included.")
 
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index d15677114aa..aaa43435ddf 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -20,7 +20,8 @@
 ;;; Code:
 
 (deftheme tsdh-dark
-  "Theme with dark background used and created by Tassilo Horn.")
+  "Minor tweaks to the Emacs dark-background defaults.
+Used and created by Tassilo Horn.")
 
 (custom-theme-set-faces
  'tsdh-dark
@@ -58,3 +59,9 @@
  '(window-number-face ((t (:foreground "red" :weight bold)))))
 
 (provide-theme 'tsdh-dark)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; tsdh-dark-theme.el ends here
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el
index 9fac27fda1e..e7a2bafb03e 100644
--- a/etc/themes/tsdh-light-theme.el
+++ b/etc/themes/tsdh-light-theme.el
@@ -20,7 +20,8 @@
 ;;; Code:
 
 (deftheme tsdh-light
-  "Black on white theme used and created by Tassilo Horn.")
+  "Minor tweaks to the Emacs white-background defaults.
+Used and created by Tassilo Horn.")
 
 (custom-theme-set-faces
  'tsdh-light
@@ -57,3 +58,10 @@
  '(window-number-face ((t (:foreground "red" :weight bold)))))
 
 (provide-theme 'tsdh-light)
+
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; tsdh-light-theme.el ends here
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 7fd241c5057..3a08bb63d96 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -20,7 +20,7 @@
 ;;; Code:
 
 (deftheme wheatgrass
-  "A high-contrast theme with a black background.
+  "High-contrast green/blue/brown faces on a black background.
 Basic, Font Lock, Isearch, Gnus, and Message faces are included.
 The default face foreground is wheat, with other faces in shades
 of green, brown, and blue.")
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
new file mode 100644
index 00000000000..2aa64f894bf
--- /dev/null
+++ b/etc/themes/wombat-theme.el
@@ -0,0 +1,108 @@
+;;; wombat-theme.el --- Custom face theme for Emacs
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Kristoffer Grönlund <krig@koru.se>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme wombat
+  "Medium-contrast faces with a dark gray background.
+Adapted, with permission, from a Vim color scheme by Lars H. Nielsen.
+Basic, Font Lock, Isearch, Gnus, Message, and Ansi-Color faces
+are included.")
+
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'wombat
+   `(default ((,class (:background "#242424" :foreground "#f6f3e8"))))
+   `(cursor ((,class (:background "#656565" :foreground "#f6f3e8"))))
+   ;; Highlighting faces
+   `(fringe ((,class (:background "#303030"))))
+   `(highlight ((,class (:background "#454545" :foreground "#ffffff"
+                         :underline t))))
+   `(region ((,class (:background "#444444" :foreground "#f6f3e8"))))
+   `(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8"))))
+   `(isearch ((,class (:background "#343434" :foreground "#857b6f"))))
+   `(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0"))))
+   ;; Mode line faces
+   `(mode-line ((,class (:background "#444444" :foreground "#f6f3e8"))))
+   `(mode-line-inactive ((,class (:background "#444444" :foreground "#857b6f"))))
+   ;; Escape and prompt faces
+   `(minibuffer-prompt ((,class (:foreground "#e5786d"))))
+   `(escape-glyph ((,class (:foreground "#ddaa6f" :weight bold))))
+   ;; Font lock faces
+   `(font-lock-builtin-face ((,class (:foreground "#e5786d"))))
+   `(font-lock-comment-face ((,class (:foreground "#99968b"))))
+   `(font-lock-constant-face ((,class (:foreground "#e5786d"))))
+   `(font-lock-function-name-face ((,class (:foreground "#cae682"))))
+   `(font-lock-keyword-face ((,class (:foreground "#8ac6f2" :weight bold))))
+   `(font-lock-string-face ((,class (:foreground "#95e454"))))
+   `(font-lock-type-face ((,class (:foreground "#92a65e" :weight bold))))
+   `(font-lock-variable-name-face ((,class (:foreground "#cae682"))))
+   `(font-lock-warning-face ((,class (:foreground "#ccaa8f"))))
+   ;; Button and link faces
+   `(link ((,class (:foreground "#8ac6f2" :underline t))))
+   `(link-visited ((,class (:foreground "#e5786d" :underline t))))
+   `(button ((,class (:background "#333333" :foreground "#f6f3e8"))))
+   `(header-line ((,class (:background "#303030" :foreground "#e7f6da"))))
+   ;; Gnus faces
+   `(gnus-group-news-1 ((,class (:weight bold :foreground "#95e454"))))
+   `(gnus-group-news-1-low ((,class (:foreground "#95e454"))))
+   `(gnus-group-news-2 ((,class (:weight bold :foreground "#cae682"))))
+   `(gnus-group-news-2-low ((,class (:foreground "#cae682"))))
+   `(gnus-group-news-3 ((,class (:weight bold :foreground "#ccaa8f"))))
+   `(gnus-group-news-3-low ((,class (:foreground "#ccaa8f"))))
+   `(gnus-group-news-4 ((,class (:weight bold :foreground "#99968b"))))
+   `(gnus-group-news-4-low ((,class (:foreground "#99968b"))))
+   `(gnus-group-news-5 ((,class (:weight bold :foreground "#cae682"))))
+   `(gnus-group-news-5-low ((,class (:foreground "#cae682"))))
+   `(gnus-group-news-low ((,class (:foreground "#99968b"))))
+   `(gnus-group-mail-1 ((,class (:weight bold :foreground "#95e454"))))
+   `(gnus-group-mail-1-low ((,class (:foreground "#95e454"))))
+   `(gnus-group-mail-2 ((,class (:weight bold :foreground "#cae682"))))
+   `(gnus-group-mail-2-low ((,class (:foreground "#cae682"))))
+   `(gnus-group-mail-3 ((,class (:weight bold :foreground "#ccaa8f"))))
+   `(gnus-group-mail-3-low ((,class (:foreground "#ccaa8f"))))
+   `(gnus-group-mail-low ((,class (:foreground "#99968b"))))
+   `(gnus-header-content ((,class (:foreground "#8ac6f2"))))
+   `(gnus-header-from ((,class (:weight bold :foreground "#95e454"))))
+   `(gnus-header-subject ((,class (:foreground "#cae682"))))
+   `(gnus-header-name ((,class (:foreground "#8ac6f2"))))
+   `(gnus-header-newsgroups ((,class (:foreground "#cae682"))))
+   ;; Message faces
+   `(message-header-name ((,class (:foreground "#8ac6f2" :weight bold))))
+   `(message-header-cc ((,class (:foreground "#95e454"))))
+   `(message-header-other ((,class (:foreground "#95e454"))))
+   `(message-header-subject ((,class (:foreground "#cae682"))))
+   `(message-header-to ((,class (:foreground "#cae682"))))
+   `(message-cited-text ((,class (:foreground "#99968b"))))
+   `(message-separator ((,class (:foreground "#e5786d" :weight bold))))))
+
+(custom-theme-set-variables
+ 'wombat
+ '(ansi-color-names-vector ["#242424" "#e5786d" "#95e454" "#cae682"
+                            "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"]))
+
+(provide-theme 'wombat)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; wombat-theme.el ends here