Merge from trunk

3 files changed, 123 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 53cd307e3cc..b4a3d6d6ae7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/etc/NEWS b/etc/NEWS
index a7ec965e3d6..969b1cdcf5f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -162,6 +162,9 @@ cannot be encoded by the `terminal-coding-system'.
 
 ** On graphical displays, the mode-line no longer ends in dashes.
 
+** 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.
 
@@ -745,7 +748,13 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 
 * Lisp changes in Emacs 24.1
 
+** pre/post-command-hook are not reset to nil upon error.
+Instead, the offending function is removed.
+
+** New low-level function run-hook-wrapped.
+
 ** 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
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
new file mode 100644
index 00000000000..864d31d9b09
--- /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
+  "Theme for faces, using light colors on a dark gray 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