merge from upstream

13 files changed, 927 insertions, 30 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 062edbe42a4..bfe584c69a1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,63 @@
+2011-07-12  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.91.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.2.91.
+
+        * MH-E-NEWS: Mention that SourceForge MH-E users will have to
+        update their load-paths.
+
+2011-07-10  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.90.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.2.90.
+
+2011-07-07  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * themes/tsdh-light-theme.el:
+        * themes/tsdh-dark-theme.el: Make `gnus-button' face inherit from
+        `button', `gnus-header-name' boxed, and define `rcirc-my-nick'
+        face.
+
+2011-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * NEWS: Clarify `smtpmail-auth-credentials' non-existence.
+        Mention the `send-mail-function' default change.
+
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * themes/dichromacy-theme.el:
+        * themes/tango-theme.el:
+        * themes/tango-dark-theme.el:
+        * themes/wheatgrass-theme.el: Don't define button face separately;
+        it inherits from link now.
+
+2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * NEWS: Clarify that `smtpmail-starttls-credentials' doesn't exist.
+
+2011-07-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document new emacs-lock.el and renaming of old one.
+
+2011-07-05  Manoj Srivastava  <srivasta@ieee.org>
+
+        * themes/manoj-dark-theme.el (manoj-dark): New file.
+
+2011-03-29  Kevin Ryde  <user42@zip.com.au>
+
+        * compilation.txt (perl-Test2): New samples.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * tutorials/TUTORIAL.zh: Remove spurious ")" character on the
+        first line.
+
+2011-07-01  Alan Mackenzie  <acm@muc.de>
+
+        * NEWS: CC Mode: New "guessing" of style.
+
 2011-06-21  Leo Liu  <sdl.web@gmail.com>
 
         * NEWS: Mention the new primtive secure-hash.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index aaafe76990b..a46354d7b7b 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,36 @@
 Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.2.91
+
+Version 8.2.91 fixes the folder window problem that was introduced
+in 8.2.90. It also fixes compilation warnings in XEmacs 21.5.31, as
+well as an error when running XEmacs 21.5.31 in a terminal.
+
+Another implication of the VCS change is that users who download MH-E
+from SourceForge and explicitly load MH-E will have to be change their
+`load-path' to "/path/to/mh-e/emacs/trunk/lisp/mh-e" instead. Note the
+addition of "trunk."
+
+This version of MH-E is packaged with GNU Emacs 24.1
+
+* Changes in MH-E 8.2.90
+
+In 2010, the version control system (VCS) of Emacs was upgraded from
+CVS to Bazaar. In 2011, the MH-E team followed suit and upgraded the
+MH-E repository at SourceForge from CVS to Bazaar as well. The result
+is version 8.2.90 of MH-E, which includes needed changes to the build
+scripts.
+
+Otherwise, this is a small release that includes mostly internal
+changes from the Emacs team. One of these changes manifests itself in
+the user interface--you can now complete folders with abbreviations,
+meaning that `+f/b/b TAB' can complete to `+foo/bar/baz'.
+
+Also, RFC 2047-encoded Subject header fields in replies are now
+decoded.
+
+
 
 * Changes in MH-E 8.2
 
diff --git a/etc/NEWS b/etc/NEWS
index f655c9da572..11acbd8c42d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -58,13 +58,16 @@ automatically select it.
 
 * Startup Changes in Emacs 24.1
 
+---
 ** The --unibyte, --multibyte, --no-multibyte, and --no-unibyte
 command line arguments, and the EMACS_UNIBYTE environment variable, no
 longer have any effect.  (They were declared obsolete in Emacs 23.)
 
++++
 ** New command line option `--no-site-lisp' removes site-lisp directories
 from load-path.  -Q now implies this.
 
+---
 ** On Windows, Emacs now warns when the obsolete _emacs init file is used,
 and also when HOME is set to C:\ by default.
 
@@ -77,6 +80,7 @@ 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.
@@ -88,10 +92,12 @@ client frame in parent X window ID, via XEmbed.  This works like the
 *** New emacsclient argument --frame-parameters can be used to set the
 frame parameters of a newly-created graphical frame.
 
++++
 *** If emacsclient shuts down as a result of Emacs signalling an
 error, its exit status is 1.
 
 ** Completion
+
 *** shell-mode uses pcomplete rules, with the standard completion UI.
 
 *** Many packages have been changed to use completion-at-point rather than
@@ -111,25 +117,51 @@ and pops down the *Completions* buffer accordingly.
 *** `completing-read' can be customized using the new variable
 `completing-read-function'.
 
+*** minibuffer-local-filename-must-match-map is not used any more.
+Instead, the bindings in minibuffer-local-filename-completion-map are combined
+with minibuffer-local-must-match-map.
+
 ** auto-mode-case-fold is now enabled by default.
 
+** Mail changes
+
+The default of `send-mail-function' has changed from
+`sendmail-send-it' (on GNU/Linux and other Unix-like systems) or
+`mailclient-send-it' (on Windows) to `sendmail-query-once'.  This new
+default will ask the user (once) whether to use the internal smtpmail
+package to send email, or to use the old, external defaults.
+
 ** smtpmail changes
 
-** smtpmail has been largely rewritten to upgrade to STARTTLS if
+*** smtpmail has been largely rewritten to upgrade to STARTTLS if
 possible, and uses the auth-source framework for getting credentials.
 The rewrite should be largely compatible with previous versions of
 smtpmail, but there are two major incompatibilities:
 
-** `smtpmail-auth-credentials' no longer exists.  That variable could
-be either ~/.authinfo (in which case you're fine -- you won't see any
+*** `smtpmail-auth-credentials' no longer exists.  That variable used
+to be be either ~/.authinfo (in which case you won't see any
 difference), but if it were a direct list of user names and passwords,
-you will be prompted for the user name and the password instead, and
-they will then be saved to ~/.authinfo.
+it will be ignored, and you will be prompted for the user name and the
+password instead.  They will then be saved to ~/.authinfo.
+
+If you wish to copy over all the credentials from
+`smtpmail-auth-credentials' to your ~/.authinfo file manually, instead
+of letting smtpmail prompt you for these values, that's also possible.
 
-** Similarly, if you had `smtpmail-starttls-credentials' set, then
-then you need to put
+If you had, for instance,
 
-machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert"
+(setq smtpmail-auth-credentials
+      '(("mail.example.org" 25 "jim" "s!cret")))
+
+then the equivalent line in ~/.authinfo would be
+
+machine mail.example.org port 25 login jim password s!cret
+
+*** Similarly, `smtpmail-starttls-credentials' no longer exists.  If
+you had that set, then then you need to put
+
+machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert
+"~/.my_smtp_tls.cert"
 
 in your ~/.authinfo file instead.
 
@@ -139,7 +171,7 @@ in your ~/.authinfo file instead.
 *** Emacs now supports display and editing of bidirectional text.
 
 See the node "Bidirectional Editing" in the Emacs Manual for some
-initial documentation.
+additional documentation.
 
 To turn this on in any given buffer, set the buffer-local variable
 `bidi-display-reordering' to a non-nil value.  The default is nil.
@@ -158,10 +190,6 @@ Reordering of bidirectional text for display in Emacs is a "Full
 bidirectionality" class implementation of the Unicode Bidirectional
 Algorithm.
 
-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
@@ -327,6 +355,7 @@ 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.
 
 ** New primitive `secure-hash' that supports many secure hash algorithms
@@ -393,42 +422,52 @@ use the primary selection.
 In the following, we provide a list of these changes, followed by a
 list of steps to get the old behavior back if you prefer that.
 
-*** `mouse-drag-copy-region' now defaults to nil.
++++
 *** `select-active-regions' now defaults to t.
 Merely selecting text (e.g. with drag-mouse-1) no longer puts it in
-the kill-ring.  The selected text is put in the primary selection, if
+the kill ring.  The selected text is put in the primary selection, if
 the system possesses a separate primary selection facility (e.g. X).
 
++++
 **** `select-active-regions' also accepts a new value, `only'.
 This means to only set the primary selection for temporarily active
 regions (usually made by mouse-dragging or shift-selection);
 "ordinary" active regions, such as those made with C-SPC followed by
 point motion, do not alter the primary selection.
 
+---
+**** `mouse-drag-copy-region' now defaults to nil.
+
++++
 *** mouse-2 is now bound to `mouse-yank-primary'.
 This pastes from the primary selection, ignoring the kill-ring.
 Previously, mouse-2 was bound to `mouse-yank-at-click'.
 
++++
 *** `x-select-enable-clipboard' now defaults to t on all platforms.
++++
 *** `x-select-enable-primary' now defaults to nil.
 Thus, commands that kill text or copy it to the kill-ring (such as
 M-w, C-w, and C-k) also use the clipboard---not the primary selection.
 
+---
 **** The "Copy", "Cut", and "Paste" items in the "Edit" menu are now
 exactly equivalent to, respectively M-w, C-w, and C-y.
 
+---
 **** Note that on MS-Windows, `x-select-enable-clipboard' was already
 non-nil by default, as Windows does not support the primary selection
 between applications.
 
+---
 *** To return to the previous behavior, do the following:
-
 **** Change `select-active-regions' to nil.
 **** Change `mouse-drag-copy-region' to t.
 **** Change `x-select-enable-primary' to t (on X only).
 **** Change `x-select-enable-clipboard' to nil.
 **** Bind `mouse-yank-at-click' to mouse-2.
 
++++
 *** Support for X cut buffers has been removed.
 
 *** Support for X clipboard managers has been added.
@@ -447,6 +486,10 @@ $ESHELL nor variable `explicit-shell-file-name' is set.
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
+** MH-E
+
+*** Upgraded to MH-E version 8.2.91.  See MH-E-NEWS for details.
+
 ** comint and modes derived from it use the generic completion code.
 
 ** Compilation mode
@@ -471,6 +514,11 @@ Just set shell-dir-cookie-re to an appropriate regexp.
 
 ** BibTeX mode
 
+*** BibTeX mode now supports biblatex.
+Use the variable bibtex-dialect to select support for different BibTeX dialects.
+bibtex-entry-field-alist is now an obsolete alias for
+bibtex-BibTeX-entry-alist.
+
 *** New command `bibtex-search-entries' bound to C-c C-a.
 
 *** New `bibtex-entry-format' option `sort-fields', disabled by default.
@@ -481,7 +529,7 @@ Just set shell-dir-cookie-re to an appropriate regexp.
 
 ** FIXME: xdg-open for browse-url and reportbug, 2010/08.
 
-** Archive Mode has basic support to browse 7z archives.
+** Archive Mode has basic support to browse and update 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'.
@@ -803,6 +851,10 @@ 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.
 
+** CC Mode (C, C++, etc.)
+
+*** New feature to "guess" the style in an existing buffer.
+
 ** Miscellaneous
 
 +++
@@ -849,6 +901,13 @@ soap-inspect.el is an interactive inspector for SOAP WSDL structures.
 
 ** xmodmap-generic-mode for xmodmap files.
 
+** New emacs-lock.el package.
+(The pre-existing one has been renamed to old-emacs-lock.el and moved
+to obsolete/.)  Now, Emacs Lock is a proper minor mode
+`emacs-lock-mode'.  Protection against exiting Emacs and killing the
+buffer can be set separately.  The mechanism for auto turning off
+protection for buffers with inferior processes has been generalized.
+
 
 * Incompatible Lisp Changes in Emacs 24.1
 
@@ -923,6 +982,15 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 
 * Lisp changes in Emacs 24.1
 
+** Window changes
+
+*** `switch-to-buffer' has a new optional argument FORCE-SAME-WINDOW,
+which if non-nil requires the buffer to be displayed in the currently
+selected window, signaling an error otherwise.  If nil, another window
+can be used, e.g. if the selected one is strongly dedicated.
+
+*** FIXME: buffer-display-alist changes
+
 ** Completion
 *** New variable completion-extra-properties used to specify extra properties
 of the current completion:
@@ -1090,6 +1158,7 @@ as well as those in the -*- line.
 ---
 ** rx.el has a new `group-n' construct for explicitly numbered groups.
 
+** keymaps can inherit from multiple parents.
 
 * Changes in Emacs 24.1 on non-free operating systems
 
diff --git a/etc/TODO b/etc/TODO
index 6019473b92f..c38b04a681d 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -13,15 +13,10 @@ to the FSF.
 
 * Tentative plan for Emacs-24
 
-** Bidi
-** lexbind: I haven't checked the status of the code recently, so
-  I don't know how realistic it is to include it.  But it's been around
-  for a long time, and I trust Miles, so I have hope.
 ** concurrency: including it as an "experimental" compile-time option
   sounds good.  Of course there might still be big questions around
   "which form of concurrency" we'll want.
 ** Overhaul of customize: sounds wonderful.
-** some kind of color-theme: agreed.
 ** better support for dynamic embedded graphics: I like this idea (my
   mpc.el code could use it for the volume widget), tho I wonder if the
   resulting efficiency will be sufficient.
@@ -30,7 +25,6 @@ to the FSF.
   and expand.el (any other?) and then advertise/use/improve it.
 ** Improve VC: yes, there's a lot of work to be done there :-(
   And most of it could/should make it into Emacs-23.3.
-** package manager.
 
 ** Random things that cross my mind right now that I'd like to see (some of
 them from my local hacks), but it's not obvious at all whether they'll
@@ -645,6 +639,37 @@ up on top of all others
 
 **** Undo for color-drag face customization.
 
+** Bidirectional editing
+
+*** Allow the user to control the direction of the UI
+
+**** Introduce user option to control direction of mode line.
+This requires to figure out what to do with unibyte strings that are
+used in constructing the mode line.  Currently, unibyte strings are
+not reordered by bidi.c, without which R2L mode line will not display
+correctly.  One possibility would be to STRING_SET_MULTIBYTE all Lisp
+strings involved in the mode line, and then pass them through bidi.c.
+
+Another problem is the header line, which is produced by the same
+routines as the mode line.  While it makes sense to have the mode-line
+direction controlled by a single global variable, header lines are
+buffer-specific, so they need a separate treatment in this regard.
+
+**** User options to control direction of menu bar and tool bar.
+For the tool bar, it's relatively easy: set it.paragraph_embedding
+in redisplay_tool_bar according to the user variable, and make
+f->desired_tool_bar_string multibyte with STRING_SET_MULTIBYTE.  Some
+minor changes will be needed to set the right_box_line_p and
+left_box_line_p flags correctly for the R2L tool bar.
+
+However, it makes no sense to display the tool bar right to left if
+the menu bar cannot be displayed in the same direction.
+
+R2L menu bar is tricky for the same reasons as the mode line.  In
+addition, toolkit builds create their menu bars in toolkit-specific
+parts of code, bypassing xdisp.c, so those parts need to be enhanced
+with toolkit-specific code to display the menu bar right to left.
+
 ** ImageMagick support
 
 *** image-type-header-regexps priorities the jpeg loader over the
@@ -669,8 +694,8 @@ view, page-flipping becomes uselessly slow.
 
 *** Integrate with image-dired.
 
-*** Integrate with docview. 
-  
+*** Integrate with docview.
+
 *** Integrate with image-mode.
 Some work has been done, e.g. M-x image-transform-fit-to-height will
 fit the image to the height of the Emacs window.
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 8e19222143a..888c1f94c33 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -254,6 +254,7 @@ foo.c:8.23-45: Informational: message
 foo.c:8-23: message
 foo.c:8-45.3: message
 foo.c:8.23-9.1: message
+foo.el:3:1:Error: End of file during parsing
 jade:dbcommon.dsl:133:17:E: missing argument for function call
 G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.
 file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.
@@ -496,6 +497,16 @@ symbol: perl--Test
 
 # Failed test 1 in foo.t at line 6
 
+* Perl Test.pm module error messages comparing two values
+
+symbol: perl--Test2
+
+# Test 3 got: "99" (d-compilation-perl.t at line 29)
+#   Expected: "88" (my test name)
+#  d-compilation-perl.t line 29 is: ok(99,88,'my test name');
+
+# Test 6 got: "xx" (foo.t at line 33 fail #2)
+#   Expected: "yy"
 
 * Perl Test::Harness output
 
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index 0105080ab08..31f27d9fb8a 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -72,7 +72,6 @@ Ansi-Color faces are included.")
    `(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
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
new file mode 100644
index 00000000000..bd6bbaa88a2
--- /dev/null
+++ b/etc/themes/manoj-dark-theme.el
@@ -0,0 +1,700 @@
+;;; manoj-dark.el --- A dark theme from Manoj
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Manoj Srivastava <srivasta@ieee.org>
+;; Keywords: lisp, faces
+
+;; This program 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.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; I spend a lot of time workin in front of a screen (many hours in a
+;; dimly lit room) and eye fatigue is an issue. This is a dark color
+;; theme for emacs, which is easier on the eyes than light themes.
+
+;; It does not help that I am blue-green color blind, so subtle
+;; variations are often lost on me. I do want to use color contrast to
+;; increase productivity, but I also want to avoid the jarring angry
+;; fruit salad look, and so I am in the process of crafting a logical
+;; color scheme that is high contrast enough for me, without being too
+;; unpleasing.
+
+;; In circumstances where there a lot of related faces that can be
+;; viewed, for example, the Gnus group buffer, consistent and logical
+;; color choices are the only sane option. Gnus groups can be newa
+;; (blueish) or mail (greenish), have states (large number of under
+;; messages, normal, and empty). The large number unread groups have
+;; highest luminance (appear brighter), and the empty one have lower
+;; luminance (appear greyer), but have the same chroma and saturation.
+;; Sub states and group priorities are rendered using a color series
+;; which has constant luminance and saturation, and vary in hue by a
+;; constant separation -- so all the related groups have the same
+;; brightness ({mail,news}/{unread,normal,empty}), and a graded
+;; selection of foreground colors.  It sounds more complicated that it
+;; looks. The eye is drawn naturally to the unread groups, and first
+;; to the mail, then USENET groups (which is my preference).
+
+;; Similar color variations occur for individual messages in a group;
+;; high scoring messages bubble to the top, and have a higher
+;; luminance.  This color schema has made me slightly faster at
+;; reading mail/USENET.
+
+;; In the message itself, quoted mail messages from different people
+;; are color coordinated, with high contrast beteen citations that are
+;; close to each other in the heirarchy, so it is less likely that one
+;; misunderstands who said what in a long conversation.
+
+;; The following scheme covers programming languages, Gnus, Erc, mail,
+;; org-mode, CUA-mode, apt-utils, bbdb, compilation buffers, changelog
+;; mode, diff and ediff, eshell, and more. You need emacs-goodies
+;; package on Debian to use this.  See the wiki page at
+;; http://www.emacswiki.org/cgi-bin/wiki?ColorTheme for details. The
+;; project home page is at https://gna.org/projects/color-theme.
+
+;;; Code:
+
+(deftheme manoj-dark
+  "Very high contrast faces with a black background.
+This theme avoids subtle color variations, while avoiding the
+jarring angry fruit salad look to reduce eye fatigue.")
+
+(custom-theme-set-faces
+ 'manoj-dark
+ '(default ((t (:background "black" :foreground "WhiteSmoke"))))
+ ;; Font lock faces
+ '(font-lock-builtin-face       ((t (:foreground "LightSteelBlue"))))
+ '(font-lock-constant-face      ((t (:foreground "LightSlateBlue" :bold t))))
+ '(font-lock-preprocessor-face  ((t (:foreground "CornFlowerBlue" :italic t))))
+ '(font-lock-keyword-face       ((t (:foreground "cyan1"))))
+ '(font-lock-type-face          ((t (:foreground "SteelBlue1"))))
+ '(font-lock-regexp-grouping-backslash ((t (:bold t :weight bold))))
+ '(font-lock-regexp-grouping-construct ((t (:bold t :weight bold))))
+ '(font-lock-variable-name-face ((t (:foreground "Aquamarine"))))
+ '(font-lock-function-name-face ((t (:foreground "mediumspringgreen"
+                                     :weight bold :height 1.1))))
+ '(font-lock-string-face        ((t (:foreground "RosyBrown1"))))
+ '(font-lock-comment-face       ((t (:italic t :slant oblique :foreground "chocolate1"))))
+ '(font-lock-comment-delimiter-face ((t (:foreground "Salmon"))))
+ '(font-lock-doc-face           ((t (:italic t :slant oblique :foreground "LightCoral"))))
+ '(font-lock-doc-string-face    ((t (:foreground "Plum"))))
+ '(font-lock-warning-face ((t (:bold t :foreground "Pink" :weight bold))))
+
+ '(cperl-array-face ((t (:foreground "LawnGreen" :background "B;ack" :bold t))))
+ '(cperl-hash-face ((t (:foreground "SpringGreen" :background "B;ack" :bold t :italic t))))
+ '(cperl-nonoverridable-face ((t (:foreground "chartreuse3"))))
+
+ '(gnus-button ((t (:bold t :weight bold :background "#191932" :box (:line-width 2 :style released-button)))))
+ '(gnus-cite-attribution-face ((t (:italic t))))
+ '(gnus-cite-face-1  ((t (:foreground "CornflowerBlue"))))
+ '(gnus-cite-face-2  ((t (:foreground "PaleGreen"))))
+ '(gnus-cite-face-3  ((t (:foreground "LightGoldenrod"))))
+ '(gnus-cite-face-4  ((t (:foreground "LightPink"))))
+ '(gnus-cite-face-5  ((t (:foreground "turquoise"))))
+ '(gnus-cite-face-6  ((t (:foreground "khaki"))))
+ '(gnus-cite-face-7  ((t (:foreground "plum"))))
+ '(gnus-cite-face-8  ((t (:foreground "DeepSkyBlue1"))))
+ '(gnus-cite-face-9  ((t (:foreground "chartreuse1"))))
+ '(gnus-cite-face-10 ((t (:foreground "thistle1"))))
+ '(gnus-cite-face-11 ((t (:foreground "LightYellow1"))))
+ '(gnus-emphasis-bold ((t (:bold t :weight bold))))
+ '(gnus-emphasis-bold-italic ((t (:italic t :bold t :slant italic :weight bold))))
+ '(gnus-emphasis-highlight-words ((t (:background "black" :foreground "yellow"))))
+ '(gnus-emphasis-italic ((t (:italic t :slant italic))))
+ '(gnus-emphasis-strikethru ((t (:strike-through t))))
+ '(gnus-emphasis-underline ((t (:underline t))))
+ '(gnus-emphasis-underline-bold ((t (:bold t :underline t :weight bold))))
+ '(gnus-emphasis-underline-bold-italic ((t (:italic t :bold t :underline t :slant italic :weight bold))))
+ '(gnus-emphasis-underline-italic ((t (:italic t :underline t :slant italic))))
+
+ '(gnus-header-content ((t (:italic t :foreground "DarkKhaki" :slant italic))))
+ '(gnus-header-content-face ((t (:italic t :foreground "DarkKhaki" :slant italic))))
+ '(gnus-header-from ((t (:foreground "PaleGreen1"))))
+ '(gnus-header-from-face ((t (:foreground "PaleGreen1"))))
+ '(gnus-header-name ((t (:bold t :foreground "BlanchedAlmond" :weight bold))))
+ '(gnus-header-name-face ((t (:bold t :foreground "BlanchedAlmond" :weight bold))))
+ '(gnus-header-newsgroups ((t (:italic t :foreground "yellow" :slant italic))))
+ '(gnus-header-newsgroups-face ((t (:italic t :foreground "yellow" :slant italic))))
+ '(gnus-header-subject ((t (:foreground "coral1"))))
+ '(gnus-header-subject-face ((t (:foreground "coral1"))))
+ '(gnus-signature ((t (:italic t :slant italic))))
+ '(gnus-signature-face ((t (:italic t :slant italic))))
+ '(gnus-splash ((t (:foreground "#cccccc"))))
+ '(gnus-summary-cancelled ((t (:background "black" :foreground "yellow"))))
+ '(gnus-summary-cancelled-face ((t (:background "black" :foreground "yellow"))))
+ '(gnus-summary-high-ancient ((t (:bold t :foreground "CornflowerBlue" :weight bold))))
+ '(gnus-summary-high-ancient-face ((t (:bold t :foreground "CornflowerBlue" :weight bold))))
+ '(gnus-summary-normal-ancient ((t (:foreground "SkyBlue"))))
+ '(gnus-summary-normal-ancient-face ((t (:foreground "SkyBlue"))))
+ '(gnus-summary-low-ancient ((t (:italic t :foreground "LightSteelBlue" :slant italic))))
+ '(gnus-summary-low-ancien-facet ((t (:italic t :foreground "LightSteelBlue" :slant italic))))
+
+ '(gnus-summary-high-read ((t (:bold t :foreground "grey60" :weight bold))))
+ '(gnus-summary-high-read-face ((t (:bold t :foreground "grey60" :weight bold))))
+ '(gnus-summary-normal-read ((t (:foreground "grey50"))))
+ '(gnus-summary-normal-read-face ((t (:foreground "grey50"))))
+ '(gnus-summary-low-read ((t (:italic t :foreground "LightSlateGray" :slant italic))))
+ '(gnus-summary-low-read-face ((t (:italic t :foreground "LightSlateGray" :slant italic))))
+
+ '(gnus-summary-high-ticked ((t (:bold t :foreground "RosyBrown" :weight bold))))
+ '(gnus-summary-high-ticked-face ((t (:bold t :foreground "RosyBrown" :weight bold))))
+ '(gnus-summary-normal-ticked ((t (:foreground "LightSalmon"))))
+ '(gnus-summary-normal-ticked-face ((t (:foreground "LightSalmon"))))
+ '(gnus-summary-low-ticked ((t (:italic t :foreground "pink" :slant italic))))
+ '(gnus-summary-low-ticked-face ((t (:italic t :foreground "pink" :slant italic))))
+
+ '(gnus-summary-high-undownloaded ((t (:bold t :foreground "ivory3" :weight bold))))
+ '(gnus-summary-normal-undownloaded ((t (:foreground "LightGray" :weight normal))))
+ '(gnus-summary-low-undownloaded ((t (:italic t :foreground "grey75" :slant italic :weight normal))))
+
+ '(gnus-summary-high-unread ((t (:bold t :foreground "PaleGreen" :weight bold))))
+ '(gnus-summary-high-unread-face ((t (:bold t :foreground "PaleGreen" :weight bold))))
+ '(gnus-summary-normal-unread ((t (:foreground "YellowGreen"))))
+ '(gnus-summary-normal-unread-face ((t (:foreground "YellowGreen"))))
+ '(gnus-summary-low-unread ((t (:italic t :foreground "MediumSeaGreen" :slant italic))))
+ '(gnus-summary-low-unread-face ((t (:italic t :foreground "MediumSeaGreen" :slant italic))))
+ '(gnus-summary-root-face ((t (:bold t :foreground "Red" :weight bold))))
+ '(gnus-summary-selected ((t (:underline t :foreground "LemonChiffon"))))
+ '(gnus-summary-selected-face ((t (:underline t :foreground "LemonChiffon"))))
+ '(gnus-user-agent-bad-face ((t (:bold t :background "black" :foreground "red" :weight bold))))
+ '(gnus-user-agent-good-face ((t (:background "black" :foreground "green"))))
+ '(gnus-user-agent-unknown-face ((t (:bold t :background "black" :foreground "orange" :weight bold))))
+ '(gnus-x-face ((t (:background "white" :foreground "black"))))
+
+ '(gnus-group-mail-1 ((t (:bold t :foreground "#3BFF00" :weight normal))))
+ '(gnus-group-mail-1-face ((t (:bold t :foreground "#3BFF00" :weight normal))))
+ '(gnus-group-mail-2 ((t (:bold t :foreground "#5EFF00" :weight normal))))
+ '(gnus-group-mail-2-face ((t (:bold t :foreground "#5EFF00" :weight normal))))
+ '(gnus-group-mail-3 ((t (:bold t :foreground "#80FF00" :weight normal))))
+ '(gnus-group-mail-3-face ((t (:bold t :foreground "#A1FF00" :weight normal))))
+
+
+ '(gnus-group-mail-1-empty ((t (:foreground "#249900"))))
+ '(gnus-group-mail-1-empty-face ((t (:foreground "#249900"))))
+ '(gnus-group-mail-2-empty ((t (:foreground "#389900"))))
+ '(gnus-group-mail-2-empty-face ((t (:foreground "#389900"))))
+ '(gnus-group-mail-3-empty ((t (:foreground "#4D9900"))))
+ '(gnus-group-mail-3-empty-face ((t (:foreground "#4D9900"))))
+
+ '(gnus-group-mail-low ((t (:bold t :foreground "aquamarine2" :weight bold))))
+ '(gnus-group-mail-low-face ((t (:bold t :foreground "aquamarine2" :weight bold))))
+ '(gnus-group-mail-low-empty ((t (:foreground "aquamarine2"))))
+ '(gnus-group-mail-low-empty-face ((t (:foreground "aquamarine2"))))
+
+ '(gnus-group-news-1 ((t (:bold t :foreground "#8480FF" :weight bold))))
+ '(gnus-group-news-1-face ((t (:bold t :foreground "#8480FF" :weight bold))))
+ '(gnus-group-news-2 ((t (:bold t :foreground "#8088FF" :weight bold))))
+ '(gnus-group-news-2-face ((t (:bold t :foreground "#8088FF" :weight bold))))
+ '(gnus-group-news-3 ((t (:bold t :foreground "#8095FF" :weight bold))))
+ '(gnus-group-news-3-face ((t (:bold t :foreground "#8095FF" :weight bold))))
+ '(gnus-group-news-4 ((t (:bold t :foreground "#80A1FF" :weight bold))))
+ '(gnus-group-news-4-face ((t (:bold t :foreground "#80A1FF" :weight bold))))
+ '(gnus-group-news-5 ((t (:bold t :foreground "#80AEFF" :weight bold))))
+ '(gnus-group-news-5-face ((t (:bold t :foreground "#80AEFF" :weight bold))))
+ '(gnus-group-news-6 ((t (:bold t :foreground "#80BBFF" :weight bold))))
+ '(gnus-group-news-6-face ((t (:bold t :foreground "#80BBFF" :weight bold))))
+
+ '(gnus-group-news-1-empty ((t (:foreground "#524DFF"))))
+ '(gnus-group-news-1-empty-face ((t (:foreground "#524DFF"))))
+ '(gnus-group-news-2-empty ((t (:foreground "#4D58FF"))))
+ '(gnus-group-news-2-empty-face ((t (:foreground "#4D58FF"))))
+ '(gnus-group-news-3-empty ((t (:foreground "#4D6AFF"))))
+ '(gnus-group-news-3-empty-face ((t (:foreground "#4D6AFF"))))
+ '(gnus-group-news-4-empty ((t (:foreground "#4D7CFF"))))
+ '(gnus-group-news-4-empty-face ((t (:foreground "#4D7CFF"))))
+ '(gnus-group-news-5-empty ((t (:foreground "#4D8EFF"))))
+ '(gnus-group-news-5-empty-face ((t (:foreground "#4D8EFF"))))
+ '(gnus-group-news-6-empty ((t (:foreground "#4DA0FF"))))
+ '(gnus-group-news-6-empty-face ((t (:foreground "#4DA0FF"))))
+
+ '(gnus-group-news-low ((t (:bold t :foreground "DarkTurquoise" :weight bold))))
+ '(gnus-group-news-low-face ((t (:bold t :foreground "DarkTurquoise" :weight bold))))
+ '(gnus-group-news-low-empty ((t (:foreground "DarkTurquoise"))))
+ '(gnus-group-news-low-empty-face ((t (:foreground "DarkTurquoise"))))
+
+ ;;message faces
+ '(message-cited-text ((t (:foreground "red3"))))
+ '(message-header-cc ((t (:bold t :foreground "chartreuse1" :weight bold))))
+ '(message-header-cc-face ((t (:bold t :foreground "chartreuse1" :weight bold))))
+ '(message-header-name ((t (:foreground "green"))))
+ '(message-header-name-face ((t (:foreground "green"))))
+ '(message-header-newsgroups ((t (:italic t :bold t :foreground "papaya whip" :slant italic :weight bold))))
+ '(message-header-newsgroups-face ((t (:italic t :bold t :foreground "papaya whip" :slant italic :weight bold))))
+ '(message-header-other ((t (:foreground "ivory"))))
+ '(message-header-other-face ((t (:foreground "ivory"))))
+ '(message-header-subject ((t (:foreground "OliveDrab1"))))
+ '(message-header-subject-face ((t (:foreground "OliveDrab1"))))
+ '(message-header-to ((t (:bold t :foreground "floral white" :weight bold))))
+ '(message-header-to-face ((t (:bold t :foreground "floral white" :weight bold))))
+ '(message-header-xheader ((t (:foreground "DeepSkyBlue1"))))
+ '(message-header-xheader-face ((t (:foreground "DeepSkyBlue1"))))
+ '(message-mml ((t (:foreground "MediumSpringGreen"))))
+ '(message-mml-face ((t (:foreground "MediumSpringGreen"))))
+ '(message-separator ((t (:foreground "LightSkyBlue1"))))
+ '(message-separator-face ((t (:foreground "LightSkyBlue1"))))
+ '(message-url ((t (:bold t :foreground "blue" :weight bold))))
+
+ '(bg:erc-color-face0 ((t (:background "saddle brown"))))
+ '(bg:erc-color-face1 ((t (:background "black"))))
+ '(bg:erc-color-face10 ((t (:background "DodgerBlue4"))))
+ '(bg:erc-color-face11 ((t (:background "cyan4"))))
+ '(bg:erc-color-face12 ((t (:background "blue"))))
+ '(bg:erc-color-face13 ((t (:background "deeppink"))))
+ '(bg:erc-color-face14 ((t (:background "gray50"))))
+ '(bg:erc-color-face15 ((t (:background "grey15"))))
+ '(bg:erc-color-face2 ((t (:background "blue4"))))
+ '(bg:erc-color-face3 ((t (:background "green4"))))
+ '(bg:erc-color-face4 ((t (:background "red"))))
+ '(bg:erc-color-face5 ((t (:background "brown"))))
+ '(bg:erc-color-face6 ((t (:background "purple"))))
+ '(bg:erc-color-face7 ((t (:background "orange"))))
+ '(bg:erc-color-face8 ((t (:background "yellow4"))))
+ '(bg:erc-color-face9 ((t (:background "green"))))
+ '(erc-action-face ((t (:bold t :weight bold :foreground "turquoise1"))))
+ '(erc-bold-face ((t (:bold t :weight bold))))
+ '(erc-button ((t (:bold t :weight bold :foreground "RoyalBlue1" :box (:line-width 2 :style released-button)))))
+ '(erc-button-face ((t (:bold t :weight bold :foreground "RoyalBlue1" :box (:line-width 2 :style released-button)))))
+ '(erc-command-indicator-face ((t (:bold t :weight bold))))
+ '(erc-current-nick-face ((t (:bold t :foreground "DarkTurquoise" :weight bold))))
+ '(erc-dangerous-host-face ((t (:foreground "red"))))
+ '(erc-direct-msg-face ((t (:foreground "sandybrown"))))
+ '(erc-error-face ((t (:foreground "red"))))
+ '(erc-fool-face ((t (:foreground "dim gray"))))
+ '(erc-header-line ((t (:background "grey95" :foreground "ConFlowerBlue"))))
+ '(erc-input-face ((t (:foreground "brown"))))
+ '(erc-inverse-face ((t (:background "Black" :foreground "White"))))
+ '(erc-keyword-face ((t (:bold t :foreground "pale green" :weight bold))))
+ '(erc-my-nick-face ((t (:bold t :foreground "brown" :weight bold))))
+ '(erc-nick-default-face ((t (:bold t :weight bold :foreground "DodgerBlue1"))))
+ '(erc-button-nickname-face ((t (:bold t :weight bold :background "lightgrey" :foreground "black"  :box (:line-width 2 :style released-button) ))))
+ '(erc-nick-msg-face ((t (:bold t :foreground "IndianRed" :weight bold))))
+ '(erc-notice-face ((t (:bold t :foreground "SlateBlue" :weight bold))))
+ '(erc-pal-face ((t (:bold t :foreground "Magenta" :weight bold))))
+ '(erc-prompt-face ((t (:bold t :background "Navy" :foreground "lightBlue2" :weight bold))))
+ '(erc-timestamp-face ((t (:bold t :foreground "SeaGreen1" :weight bold))))
+ '(erc-underline-face ((t (:underline t))))
+ '(fg:erc-color-face0 ((t (:foreground "BlanchedAlmond"))))
+ '(fg:erc-color-face1 ((t (:foreground "beige"))))
+ '(fg:erc-color-face10 ((t (:foreground "pale goldenrod"))))
+ '(fg:erc-color-face11 ((t (:foreground "cyan"))))
+ '(fg:erc-color-face12 ((t (:foreground "lightblue1"))))
+ '(fg:erc-color-face13 ((t (:foreground "deeppink"))))
+ '(fg:erc-color-face14 ((t (:foreground "gray50"))))
+ '(fg:erc-color-face15 ((t (:foreground "gray90"))))
+ '(fg:erc-color-face2 ((t (:foreground "blue4"))))
+ '(fg:erc-color-face3 ((t (:foreground "green4"))))
+ '(fg:erc-color-face4 ((t (:foreground "red"))))
+ '(fg:erc-color-face5 ((t (:foreground "brown"))))
+ '(fg:erc-color-face6 ((t (:foreground "purple"))))
+ '(fg:erc-color-face7 ((t (:foreground "orange"))))
+ '(fg:erc-color-face8 ((t (:foreground "yellow"))))
+ '(fg:erc-color-face9 ((t (:foreground "green"))))
+
+ '(org-agenda-date ((t (:foreground "LightSkyBlue"))))
+ '(org-agenda-date-weekend ((t (:bold t :foreground "LightSkyBlue" :weight bold))))
+ '(org-agenda-restriction-lock ((t (:background "skyblue4"))))
+ '(org-agenda-structure ((t (:foreground "LightSkyBlue"))))
+ '(org-archived ((t (:foreground "grey70"))))
+ '(org-code ((t (:foreground "grey70"))))
+ '(org-column ((t (:background "grey30" :slant normal :weight normal :height 81 :family "unknown-DejaVu Sans Mono"))))
+ '(org-column-title ((t (:bold t :background "grey30" :underline t :weight bold))))
+ '(org-date ((t (:foreground "Cyan" :underline t))))
+ '(org-done ((t (:bold t :foreground "PaleGreen" :weight bold))))
+ '(org-drawer ((t (:foreground "LightSkyBlue"))))
+ '(org-ellipsis ((t (:foreground "LightGoldenrod" :underline t))))
+ '(org-formula ((t (:foreground "chocolate1"))))
+ '(org-headline-done ((t (:foreground "LightSalmon"))))
+ '(org-hide ((t (:foreground "black"))))
+ '(org-latex-and-export-specials ((t (:foreground "burlywood"))))
+ '(org-level-1 ((t (:foreground "LightSkyBlue"))))
+ '(org-level-2 ((t (:foreground "LightGoldenrod"))))
+ '(org-level-3 ((t (:foreground "Cyan1"))))
+ '(org-level-4 ((t (:foreground "chocolate1"))))
+ '(org-level-5 ((t (:foreground "PaleGreen"))))
+ '(org-level-6 ((t (:foreground "Aquamarine"))))
+ '(org-level-7 ((t (:foreground "LightSteelBlue"))))
+ '(org-level-8 ((t (:foreground "LightSalmon"))))
+ '(org-link ((t (:foreground "Cyan" :underline t))))
+ '(org-mode-line-clock  ((t (:foreground "DarkGreen" :underline t))))
+ '(org-scheduled-previously ((t (:foreground "chocolate1"))))
+ '(org-scheduled-today ((t (:foreground "PaleGreen"))))
+ '(org-sexp-date ((t (:foreground "Cyan"))))
+ '(org-special-keyword ((t (:foreground "LightSalmon"))))
+ '(org-table ((t (:foreground "LightSkyBlue"))))
+ '(org-tag ((t (:bold t :weight bold))))
+ '(org-target ((t (:underline t))))
+ '(org-time-grid ((t (:foreground "LightGoldenrod"))))
+ '(org-todo ((t (:bold t :foreground "Pink" :weight bold))))
+ '(org-upcoming-deadline ((t (:foreground "chocolate1"))))
+ '(org-verbatim ((t (:foreground "grey70" :underline t))))
+ '(org-warning ((t (:bold t :weight bold :foreground "Pink"))))
+ '(outline-1 ((t (:foreground "LightSkyBlue"))))
+ '(outline-2 ((t (:foreground "LightGoldenrod"))))
+ '(outline-3 ((t (:foreground "Cyan1"))))
+ '(outline-4 ((t (:foreground "chocolate1"))))
+ '(outline-5 ((t (:foreground "PaleGreen"))))
+ '(outline-6 ((t (:foreground "Aquamarine"))))
+ '(outline-7 ((t (:foreground "LightSteelBlue"))))
+ '(outline-8 ((t (:foreground "LightSalmon"))))
+
+
+ '(CUA-global-mark-face ((t (:background "cyan" :foreground "black"))))
+ '(CUA-rectangle-face ((t (:background "maroon" :foreground "white"))))
+ '(CUA-rectangle-noselect-face ((t (:background "dimgray" :foreground "white"))))
+ '(Info-title-1-face ((t (:bold t :weight bold :family "helv" :height 1.728))))
+ '(Info-title-2-face ((t (:bold t :family "helv" :weight bold :height 1.44))))
+ '(Info-title-3-face ((t (:bold t :weight bold :family "helv" :height 1.2))))
+ '(Info-title-4-face ((t (:bold t :family "helv" :weight bold))))
+ '(align-highlight-nochange-face ((t (:background "SkyBlue4"))))
+
+ '(antlr-font-lock-keyword-face ((t (:foreground "SteelBlue")))) ;%
+ '(antlr-font-lock-literal-face ((t (:foreground "PaleVioletRed"))))
+ '(antlr-font-lock-ruledef-face ((t (:foreground "DarkGreen"))))
+ '(antlr-font-lock-ruleref-face ((t (:foreground "SteelBlue"))))
+ '(antlr-font-lock-tokendef-face ((t (:foreground "khaki"))))
+ '(antlr-font-lock-tokenref-face ((t (:foreground "LightSteelBlue4"))))
+
+ '(bbdb-company ((t (:italic t :slant italic :foreground "indian red"))))
+ '(bbdb-field-name ((t (:bold t :weight bold :foreground "steel blue"))))
+ '(bbdb-field-value ((t (:foreground "AntiqueWhite2"))))
+ '(bbdb-name ((t (:underline t :foreground "cadet blue"))))
+
+ '(bold ((t (:bold t :weight bold))))
+ '(bold-italic ((t (:bold t :italic t :slant italic :weight bold))))
+ '(border ((t (:background "gold" :foreground "black" ))))
+ '(buffer-menu-buffer ((t (:bold t :weight bold))))
+ '(button ((t (:underline t :box (:line-width 2 :color "grey"
+                                              :style released-button)
+                          :foreground "black" :background "grey"
+                          :weight bold ))))
+ '(calendar-today-face ((t (:underline t :bold t :foreground "cornsilk"))))
+ '(change-log-acknowledgement-face ((t (:italic t :slant oblique :foreground "AntiqueWhite3"))))
+ '(change-log-conditionals-face ((t (:foreground "Aquamarine"))))
+ '(change-log-date-face ((t (:italic t :slant oblique :foreground "BurlyWood"))))
+ '(change-log-email-face ((t (:foreground "Aquamarine"))))
+ '(change-log-file-face ((t (:bold t :family "Verdana" :weight bold :foreground "LightSkyBlue" :height 0.9))))
+ '(change-log-function-face ((t (:foreground "Aquamarine"))))
+ '(change-log-list-face ((t (:foreground "LightSkyBlue"))))
+ '(change-log-name-face ((t (:bold t :weight bold :foreground "Gold"))))
+
+ '(comint-highlight-input ((t (:bold t :weight bold))))
+ '(comint-highlight-prompt ((t (:foreground "cyan1"))))
+ '(compilation-column-number ((t (:foreground "PaleGreen"))))
+ '(compilation-error ((t (:bold t :weight bold :foreground "Brown1"))))
+ '(compilation-info ((t (:bold t :foreground "LightPink1" :weight bold))))
+ '(compilation-line-number ((t (:foreground "LightGoldenrod"))))
+ '(compilation-message-face  ((t (:underline t))))
+ '(compilation-warning ((t (:bold t :foreground "Orange" :weight bold))))
+ '(compilation-warning-face ((t (:bold t :foreground "Orange" :weight bold))))
+ '(completions-common-part ((t (:family "unknown-DejaVu Sans Mono"
+                                        :width normal :weight normal
+                                        :slant normal :foreground "WhiteSmoke"
+                                        :background "black" :height 81))))
+ '(completions-first-difference ((t (:bold t :weight bold))))
+
+ '(css-selector ((t (:foreground "LightSteelBlue"))))
+ '(css-property ((t (:foreground "light sea green"))))
+
+ '(cursor ((t (:background "orchid"))))
+ '(custom-button-face ((t (:background "lightgrey" :foreground "black"
+                                       :box '(:line-width 2 :style released-button)))))
+ '(custom-button-pressed-face ((t (:background "lightgrey"
+                                               :foreground "black"
+                                               :box '(:line-width 2 :style pressed-button)))))
+ '(custom-changed-face ((t (:foreground "wheat" :background "blue"))))
+ '(custom-comment-face ((t (:background "dim gray"))))
+ '(custom-comment-tag-face ((t (:foreground "gray80"))))
+ '(custom-face-tag-face ((t (:bold t :family "helv" :weight bold :height 1.1))))
+ '(custom-group-tag-face ((t (:bold t :family "helv" :foreground "light blue" :weight bold :height 1.1))))
+ '(custom-group-tag-face-1 ((t (:bold t :family "helv" :foreground "pink" :weight bold :height 1.1))))
+ '(custom-invalid-face ((t (:background "red" :foreground "yellow"))))
+ '(custom-modified-face ((t (:background "blue" :foreground "white"))))
+ '(custom-rogue-face ((t (:background "black" :foreground "pink"))))
+ '(custom-saved-face ((t (:underline t))))
+ '(custom-set-face ((t (:background "white" :foreground "blue"))))
+ '(custom-state-face ((t (:foreground "lime green"))))
+ '(custom-variable-button-face ((t (:bold t :underline t :weight bold
+                                          :background "lightgrey"
+                                          :foreground "black"
+                                          :box '(:line-width 2 :style released-button)))))
+ '(custom-variable-tag-face ((t (:bold t :family "helv"
+                                       :foreground "light blue"
+                                       :weight bold :height 1.2))))
+
+ '(diary ((t (:foreground "IndianRed"))))
+ '(diary-anniversary ((t (:foreground "Cyan1"))))
+ '(diary-button ((t (:background "lightgrey" :foreground "black"  :box (:line-width 2 :style released-button)))))
+ '(diary-face ((t (:foreground "IndianRed"))))
+ '(diary-time ((t (:foreground "LightGoldenrod"))))
+ '(diff-added ((t (:foreground "Green"))))
+ '(diff-added-face ((t (:foreground "Green"))))
+ '(diff-changed-face ((t (:foreground "Khaki"))))
+ '(diff-context-face ((t (:foreground "grey70"))))
+ '(diff-file-header ((t (:bold t :background "grey20"  :foreground "ivory1" :weight bold))))
+ '(diff-file-header-face ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold))))
+ '(diff-function-face ((t (:foreground "SpringGreen1"))))
+ '(diff-header-face ((t (:background "SlateBlue4"))))
+ '(diff-hunk-header ((t (:slant italic :background "DodgerBlue4"))))
+ '(diff-hunk-header-face ((t (:slant italic :background "DodgerBlue4"))))
+ '(diff-index-face ((t (:bold t :weight bold :background "SteelBlue4" :foreground "linen" ))))
+ '(diff-nonexistent ((t (:bold t :weight bold :background "Black" :foreground "Wheat1"))))
+ '(diff-nonexistent-face ((t (:bold t :weight bold :background "Black" :foreground "Wheat1"))))
+ '(diff-removed ((t (:foreground "salmon1"))))
+ '(diff-removed-face ((t (:foreground "salmon1"))))
+ '(diff-refine-change-face ((t (:background "MidnightBlue"))))
+ '(diff-refine-change      ((t (:background "MidnightBlue"))))
+
+ '(ediff-current-diff-face-A ((t (:foreground "firebrick" :background "pale green"))))
+ '(ediff-current-diff-face-Ancestor ((t (:foreground "Black" :background "VioletRed"))))
+ '(ediff-current-diff-face-B ((t (:foreground "DarkOrchid" :background "Yellow"))))
+ '(ediff-current-diff-face-C ((t (:foreground "Navy" :background "Pink"))))
+ '(ediff-even-diff-face-A ((t (:foreground "Black" :background "light grey"))))
+ '(ediff-even-diff-face-Ancestor ((t (:foreground "White" :background "Grey"))))
+ '(ediff-even-diff-face-B ((t (:foreground "White" :background "Grey"))))
+ '(ediff-even-diff-face-C ((t (:foreground "Black" :background "light grey"))))
+ '(ediff-fine-diff-face-A ((t (:foreground "Navy" :background "sky blue"))))
+ '(ediff-fine-diff-face-Ancestor ((t (:foreground "Black" :background "Green"))))
+ '(ediff-fine-diff-face-B ((t (:foreground "Black" :background "cyan"))))
+ '(ediff-fine-diff-face-C ((t (:foreground "Black" :background "Turquoise"))))
+ '(ediff-odd-diff-face-A ((t (:foreground "White" :background "Grey"))))
+ '(ediff-odd-diff-face-Ancestor ((t (:foreground "Black" :background "light grey"))))
+ '(ediff-odd-diff-face-B ((t (:foreground "Black" :background "light grey"))))
+ '(ediff-odd-diff-face-C ((t (:foreground "White" :background "Grey"))))
+
+ '(eieio-custom-slot-tag-face ((t (:foreground "light blue"))))
+ '(eldoc-highlight-function-argument ((t (:bold t :weight bold))))
+ '(epa-field-body ((t (:italic t :foreground "turquoise" :slant italic))))
+ '(epa-field-name ((t (:bold t :foreground "PaleTurquoise" :weight bold))))
+ '(epa-mark ((t (:bold t :foreground "orange" :weight bold))))
+ '(epa-string ((t (:foreground "lightyellow"))))
+ '(epa-validity-disabled ((t (:italic t :slant italic))))
+ '(epa-validity-high ((t (:bold t :foreground "PaleTurquoise" :weight bold))))
+ '(epa-validity-low ((t (:italic t :slant italic))))
+ '(epa-validity-medium ((t (:italic t :foreground "PaleTurquoise" :slant italic))))
+
+ '(escape-glyph ((t (:foreground "cyan"))))
+
+ '(eshell-ls-archive-face ((t (:bold t :foreground "IndianRed"))))
+ '(eshell-ls-backup-face ((t (:foreground "Grey"))))
+ '(eshell-ls-clutter-face ((t (:foreground "DimGray"))))
+ '(eshell-ls-directory-face ((t (:bold t :foreground "MediumSlateBlue"))))
+ '(eshell-ls-executable-face ((t (:foreground "Coral"))))
+ '(eshell-ls-missing-face ((t (:foreground "black"))))
+ '(eshell-ls-picture-face ((t (:foreground "Violet"))))
+ '(eshell-ls-product-face ((t (:foreground "sandybrown"))))
+ '(eshell-ls-readonly-face ((t (:foreground "Aquamarine"))))
+ '(eshell-ls-special-face ((t (:foreground "Gold"))))
+ '(eshell-ls-symlink-face ((t (:foreground "DarkCyan" :bold t))))
+ '(eshell-ls-symlink-face ((t (:foreground "White"))))
+ '(eshell-ls-unreadable-face ((t (:foreground "DimGray"))))
+ '(eshell-prompt-face ((t (:foreground "MediumAquamarine"))))
+ '(eshell-test-failed-face ((t (:foreground "OrangeRed" :bold t))))
+ '(eshell-test-ok-face ((t (:foreground "Green" :bold t))))
+
+ '(excerpt ((t (:italic t))))
+ '(file-name-shadow ((t (:foreground "grey70"))))
+ '(fixed ((t (:bold t))))
+ '(fixed-pitch ((t (:family "courier"))))
+ '(flyspell-duplicate-face ((t (:foreground "IndianRed" :bold t :underline t))))
+ '(flyspell-incorrect-face ((t (:foreground "Pink" :bold t :underline t))))
+
+ '(fringe ((t (:background "grey30" :foreground "Wheat"))))
+ '(header-line ((t (:box (:line-width -1 :color "grey20" :style released-button) :background "grey20" :foreground "grey90"  :height 0.9))))
+ '(help-argument-name ((t (:italic t :slant italic))))
+ '(highlight ((t (:background "gray10" :foreground "Old Lace"))))
+ '(hl-line  ((t (:background "grey10" :foreground "Old Lace"))))
+ '(gnus-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
+ '(erc-button-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
+ '(align-highlight-change-face  ((t (:background "darkseagreen2" :foreground "blue"))))
+ '(goto-address-url-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
+ '(goto-address-url-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
+ '(ispell-highlight-face ((t (:background "darkseagreen2" :foreground "blue"))))
+ '(ispell-highlight-face ((t (:background "darkseagreen2" :foreground "blue"))))
+ '(widget-mouse-face  ((t (:background "darkseagreen2" :foreground "blue"))))
+
+ '(highlight-beyond-fill-column-face ((t (:underline t))))
+ '(highlight-changes ((t (:foreground nil :background "#382f2f"))))
+ '(highlight-changes-delete ((t (:foreground nil :background "#916868"))))
+
+ '(holiday ((t (:background "chocolate4"))))
+ '(holiday-face ((t (:background "chocolate4"))))
+
+ '(ibuffer-dired-buffer-face ((t (:foreground "mediumspringgreen" :weight bold :height 1.1))))
+ '(ibuffer-help-buffer-face  ((t (:italic t :slant oblique :foreground "chocolate1"))))
+ '(ibuffer-hidden-buffer-face  ((t (:bold t :foreground "Pink" :weight bold))))
+ '(ibuffer-occur-match-face ((t (:bold t :foreground "Pink" :weight bold))))
+ '(ibuffer-read-only-buffer-face ((t (:foreground "SteelBlue1"))))
+ '(ibuffer-special-buffer-face ((t (:foreground "SteelBlue1"))))
+
+ '(ido-first-match ((t (:bold t :weight bold))))
+ '(ido-incomplete-regexp ((t (:bold t :weight bold :foreground "Pink"))))
+ '(ido-indicator ((t (:background "red1" :foreground "yellow1" :width condensed))))
+ '(ido-only-match ((t (:foreground "ForestGreen"))))
+ '(ido-subdir ((t (:foreground "red1"))))
+ '(info-menu-5 ((t (:underline t))))
+ '(info-menu-header ((t (:bold t :family "helv" :weight bold))))
+ '(info-node ((t (:bold t :italic t :foreground "yellow"))))
+ '(info-node ((t (:italic t :bold t :foreground "white" :slant italic :weight bold))))
+ '(info-xref ((t (:bold t :foreground "DodgerBlue1"))))
+ '(info-xref ((t (:bold t :foreground "cyan" :weight bold))))
+ '(isearch ((t (:background "palevioletred2" :foreground "brown4"))))
+ '(isearch-fail ((t (:background "red4"))))
+ '(isearch-lazy-highlight-face ((t (:background "paleturquoise4"))))
+ '(isearch-secondary ((t (:foreground "red3"))))
+ '(italic ((t (:italic t))))
+
+ '(js2-builtin-face ((t (:foreground "sandy brown"))))
+ '(js2-comment-face ((t (:foreground "dark orchid"))))
+ '(js2-constant-face ((t (:foreground "pale violet red"))))
+ '(js2-error-face ((t (:background "indian red" :foreground "green" :bold t))))
+ '(js2-function-name-face ((t (:foreground "cadet blue"))))
+ '(js2-function-param-face ((t (:foreground "IndianRed1"))))
+ '(js2-instance-member-face ((t (:foreground "IndianRed1"))))
+ '(js2-jsdoc-tag-face ((t (:foreground "medium orchid"))))
+ '(js2-jsdoc-type-face ((t (:foreground "medium orchid"))))
+ '(js2-jsdoc-value-face ((t (:foreground "medium orchid"))))
+ '(js2-keyword-face ((t (:foreground "steel blue"))))
+ '(js2-private-function-call-face ((t (:foreground "cadet blue"))))
+ '(js2-private-member-face ((t (:foreground "IndianRed1"))))
+ '(js2-regexp-face ((t (:foreground "khaki"))))
+ '(js2-string-face ((t (:foreground "lemon chiffon"))))
+ '(js2-type-face ((t (:foreground "medium sea green"))))
+ '(js2-variable-name-face ((t (:foreground "IndianRed1"))))
+ '(js2-warning-face ((t (:background "indian red" :foreground "green"))))
+
+ '(lazy-highlight ((t (:background "paleturquoise4"))))
+ '(link ((t (:foreground "cyan1" :underline t))))
+ '(link-visited ((t (:underline t :foreground "violet"))))
+
+ '(makefile-space ((t (:background "hotpink"))))
+ '(man-bold ((t (:bold t))))
+ '(man-heading ((t (:bold t))))
+ '(man-italic ((t (:foreground "yellow"))))
+ '(man-xref ((t (:underline t))))
+ '(match ((t (:background "RoyalBlue3"))))
+ '(minibuffer-prompt ((t (:foreground "cyan"))))
+ '(mode-line ((t (:background "grey75" :foreground "Blue"
+                  :box '(:line-width -1 :style released-button)
+                  :height 0.9))))
+ '(mode-line-buffer-id ((t (:background "grey65" :foreground "red"
+                                        :bold t :weight bold :height 0.9))))
+ '(mode-line-emphasis ((t (:bold t :weight bold))))
+ '(mode-line-highlight ((t (:box (:line-width 2 :color "grey40"
+                                              :style released-button :height 0.9)))))
+ '(mode-line-inactive ((t (:background "grey30" :foreground "grey80"
+                                       :box '(:line-width -1 :color "grey40")
+                                       :weight light :height 0.9))))
+ '(mouse ((t (:background "OrangeRed"))))
+
+ '(next-error ((t (:background "blue3"))))
+ '(nobreak-space ((t (:foreground "cyan" :underline t))))
+ '(paren-blink-off ((t (:foreground "black"))))
+ '(paren-mismatch-face ((t (:bold t :background "white" :foreground "red"))))
+ '(paren-no-match-face ((t (:bold t :background "white" :foreground "red"))))
+ '(query-replace ((t (:foreground "brown4" :background "palevioletred2"))))
+ '(region ((t (:background "blue3"))))
+ '(scroll-bar ((t (:background "grey75" :foreground "WhiteSmoke"))))
+ '(secondary-selection ((t (:background "SkyBlue4"))))
+ '(semantic-dirty-token-face ((t (:background "lightyellow"))))
+ '(semantic-highlight-edits-face ((t (:background "gray20"))))
+ '(semantic-unmatched-syntax-face ((t (:underline "red"))))
+ '(senator-intangible-face ((t (:foreground "gray75"))))
+ '(senator-momentary-highlight-face ((t (:background "gray30"))))
+ '(senator-read-only-face ((t (:background "#664444"))))
+ '(sgml-doctype-face ((t (:foreground "orange"))))
+ '(sgml-end-tag-face ((t (:foreground "greenyellow"))))
+ '(sgml-entity-face ((t (:foreground "gold"))))
+ '(sgml-ignored-face ((t (:foreground "gray20" :background "gray60"))))
+ '(sgml-sgml-face ((t (:foreground "yellow"))))
+ '(sgml-start-tag-face ((t (:foreground "mediumspringgreen"))))
+ '(shadow ((t (:foreground "grey70"))))
+
+ '(show-paren-match ((t (:background "steelblue3"))))
+ '(show-paren-match-face ((t (:background "steelblue3"))))
+ '(show-paren-mismatch ((t (:background "purple" :foreground "white"))))
+ '(smerge-base ((t (:foreground "orange"))))
+ '(smerge-markers ((t (:background "grey30"))))
+ '(smerge-mine ((t (:foreground "cyan"))))
+ '(smerge-other ((t (:foreground "lightgreen"))))
+ '(smerge-refined-change ((t (:background "blue4"))))
+ '(speedbar-button-face ((t (:foreground "green3"))))
+ '(speedbar-directory-face ((t (:foreground "light blue"))))
+ '(speedbar-file-face ((t (:foreground "cyan"))))
+ '(speedbar-highlight-face ((t (:background "sea green"))))
+ '(speedbar-selected-face ((t (:foreground "red" :underline t))))
+ '(speedbar-separator-face ((t (:background "blue" :foreground "white" :overline "gray"))))
+ '(speedbar-tag-face ((t (:foreground "yellow"))))
+ '(table-cell ((t (:background "blue1" :foreground "gray90"))))
+
+ '(tool-bar ((t (:background "grey75" :foreground "black" :box (:line-width 1 :style released-button)))))
+ '(tooltip ((t (:family "helv" :background "lightyellow" :foreground "black"))))
+ '(trailing-whitespace ((t (:background "red1"))))
+ '(underline ((t (:underline t))))
+ '(variable-pitch ((t (:family "helv"))))
+ '(vcursor ((t (:foreground "blue" :background "cyan" :underline t))))
+ '(vertical-border ((t (:background "dim gray"))))
+ '(vhdl-font-lock-attribute-face ((t (:foreground "Orchid"))))
+ '(vhdl-font-lock-directive-face ((t (:foreground "CadetBlue"))))
+ '(vhdl-font-lock-enumvalue-face ((t (:foreground "Gold4"))))
+ '(vhdl-font-lock-function-face ((t (:foreground "Orchid4"))))
+ '(vhdl-font-lock-prompt-face ((t (:foreground "Red" :bold t))))
+ '(vhdl-font-lock-reserved-words-face ((t (:foreground "Orange" :bold t))))
+ '(vhdl-font-lock-translate-off-face ((t (:background "LightGray"))))
+ '(vhdl-speedbar-architecture-face ((t (:foreground "Blue"))))
+ '(vhdl-speedbar-architecture-selected-face ((t (:foreground "Blue" :underline t))))
+ '(vhdl-speedbar-configuration-face ((t (:foreground "DarkGoldenrod"))))
+ '(vhdl-speedbar-configuration-selected-face ((t (:foreground "DarkGoldenrod" :underline t))))
+ '(vhdl-speedbar-entity-face ((t (:foreground "ForestGreen"))))
+ '(vhdl-speedbar-entity-selected-face ((t (:foreground "ForestGreen" :underline t))))
+ '(vhdl-speedbar-instantiation-face ((t (:foreground "Brown"))))
+ '(vhdl-speedbar-instantiation-selected-face ((t (:foreground "Brown" :underline t))))
+ '(vhdl-speedbar-package-face ((t (:foreground "Grey50"))))
+ '(vhdl-speedbar-package-selected-face ((t (:foreground "Grey50" :underline t))))
+
+ '(viper-minibuffer-emacs-face ((t (:foreground "Black" :background "darkseagreen2"))))
+ '(viper-minibuffer-insert-face ((t (:foreground "Black" :background "pink"))))
+ '(viper-minibuffer-vi-face ((t (:foreground "DarkGreen" :background "grey"))))
+ '(viper-replace-overlay-face ((t (:foreground "Black" :background "darkseagreen2"))))
+ '(viper-search-face ((t (:foreground "Black" :background "khaki"))))
+ '(vm-highlight-url-face  ((t (:bold t :italic t :slant italic :weight bold))))
+ '(vm-highlighted-header-face  ((t (:bold t :weight bold))))
+ '(vm-mime-button-face  ((t (:background "grey75" :foreground "black" :box (:line-width 2 :style released-button)))))
+ '(vm-summary-highlight-face  ((t (:bold t :weight bold))))
+ '(vm-xface ((t (:background "white" :foreground "black"))))
+
+ '(which-func ((t (:foreground "Blue1"))))
+ '(widget ((t (:height 1.2 :background "Gray80" :foreground "black"))))
+ '(widget-button ((t (:bold t :weight bold :box (:line-width 2 :style released-button)))))
+ '(widget-button-face ((t (:bold t :weight bold :box (:line-width 2 :style released-button)))))
+ '(widget-button-pressed ((t (:foreground "red1" :background "lightgrey" :box (:line-width 2 :style pressed-button)))))
+ '(widget-button-pressed-face ((t (:foreground "red1" :background "lightgrey" :box (:line-width 2 :style pressed-button)))))
+ '(widget-documentation ((t (:foreground "lime green"))))
+ '(widget-documentation-face ((t (:foreground "lime green"))))
+ '(widget-field ((t (:background "dim gray"))))
+ '(widget-field-face ((t (:background "dim gray"))))
+ '(widget-inactive ((t (:foreground "grey70"))))
+ '(widget-inactive-face ((t (:foreground "grey70"))))
+ '(widget-single-line-field ((t (:background "dim gray"))))
+ '(widget-single-line-field-face ((t (:background "dim gray"))))
+ '(woman-bold-face ((t (:bold t))))
+ '(woman-italic-face ((t (:foreground "beige"))))
+ '(woman-unknown-face ((t (:foreground "LightSalmon")))))
+
+(provide-theme 'manoj-dark)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; manoj-dark.el ends here
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index b5621d10320..403370c90cb 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -86,7 +86,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-variable-name-face ((,class (:foreground ,orange-1))))
    `(font-lock-warning-face ((,class (:foreground ,red-0))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue-1))))
    `(link ((,class (:underline t :foreground ,blue-1))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
    ;; Gnus faces
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index c58e0036353..9d0f0aca94a 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -77,7 +77,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-variable-name-face ((,class (:foreground ,orange-4))))
    `(font-lock-warning-face ((,class (:foreground ,red-2))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue-3))))
    `(link ((,class (:underline t :foreground ,blue-3))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
    ;; Gnus faces
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index aaa43435ddf..82732765885 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -33,6 +33,8 @@ Used and created by Tassilo Horn.")
  '(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
  '(diff-removed ((t (:inherit diff-changed :background "dark red"))))
  '(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(gnus-button ((t (:inherit button))))
+ '(gnus-header-name ((t (:box (:line-width 1 :style released-button) :weight bold))))
  '(header-line ((t (:inherit mode-line :inverse-video t))))
  '(hl-line ((t (:background "grey28"))))
  '(message-header-subject ((t (:foreground "SkyBlue"))))
@@ -53,6 +55,7 @@ Used and created by Tassilo Horn.")
  '(outline-6 ((t (:inherit font-lock-constant-face :weight bold))))
  '(outline-7 ((t (:inherit font-lock-builtin-face :weight bold))))
  '(outline-8 ((t (:inherit font-lock-string-face :weight bold))))
+ '(rcirc-my-nick ((t (:foreground "LightSkyBlue" :weight bold))))
  '(region ((t (:background "SteelBlue4"))))
  '(show-paren-match ((t (:background "DarkGreen"))))
  '(show-paren-mismatch ((t (:background "deep pink"))))
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el
index e7a2bafb03e..f62cea4eb47 100644
--- a/etc/themes/tsdh-light-theme.el
+++ b/etc/themes/tsdh-light-theme.el
@@ -33,6 +33,8 @@ Used and created by Tassilo Horn.")
  '(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
  '(diff-removed ((t (:inherit diff-changed :background "sandy brown"))))
  '(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(gnus-button ((t (:inherit button))))
+ '(gnus-header-name ((t (:box (:line-width 1 :style released-button) :weight bold))))
  '(header-line ((t (:inherit mode-line :inverse-video t))))
  '(hl-line ((t (:background "grey95"))))
  '(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
@@ -52,6 +54,7 @@ Used and created by Tassilo Horn.")
  '(outline-6 ((t (:inherit font-lock-constant-face :weight bold))))
  '(outline-7 ((t (:inherit font-lock-builtin-face :weight bold))))
  '(outline-8 ((t (:inherit font-lock-string-face :weight bold))))
+ '(rcirc-my-nick ((t (:foreground "LightSkyBlue" :weight bold))))
  '(region ((t (:background "lightgoldenrod1"))))
  '(show-paren-match ((t (:background "LightCyan2"))))
  '(show-paren-mismatch ((t (:background "deep pink"))))
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 3a08bb63d96..9f8772c4d6e 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -47,7 +47,6 @@ of green, brown, and blue.")
    `(font-lock-variable-name-face ((,class (:foreground "yellow green"))))
    `(font-lock-warning-face ((,class (:foreground "salmon1"))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground "cyan"))))
    `(link ((,class (:underline t :foreground "cyan"))))
    `(link-visited ((,class (:underline t :foreground "dark cyan"))))
    ;; Gnus faces
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh
index a7dc9e63a4a..da628a3af68 100644
--- a/etc/tutorials/TUTORIAL.zh
+++ b/etc/tutorials/TUTORIAL.zh
@@ -1,4 +1,4 @@
-Emacs 快速指南（.
+Emacs 快速指南.
 
 Emacs 指令通常包含有 CONTROL 鍵（有時候以 CTRL 或 CTL 來標示）或是
 META 鍵（有時候以 EDIT 或 ALT 來標示）。為了避免每一次都要寫出其全名，