Merge from mainline.

etc/ChangeLog

+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.

etc/themes/misterioso-theme.el

+;;; 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

lisp/ChangeLog

+2011-03-22  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacs-lisp/derived.el (define-derived-mode): Wrap declaration of
+	keymap variable in `with-no-warnings' to avoid a warning when the
+	keymap has been already `defconst'ed.
+
 2011-03-22  Leo Liu  <sdl.web@gmail.com>
 
 	* abbrev.el (write-abbrev-file): Use utf-8 for writing if it can

lisp/emacs-lisp/derived.el

@@ -201,7 +201,7 @@ No problems result if this variable is not bound.
 		       name))))
        (unless (boundp ',map)
 	 (put ',map 'definition-name ',child))
-       (defvar ,map (make-sparse-keymap))
+       (with-no-warnings (defvar ,map (make-sparse-keymap)))
        (unless (get ',map 'variable-documentation)
 	 (put ',map 'variable-documentation
 	      (purecopy ,(format "Keymap for `%s'." child))))

src/ChangeLog

-2011-03-22  Paul Eggert  <eggert@cs.ucla.edu>
+2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* coding.c (encode_coding_raw_text): Avoid unnecessary test
 	the first time through the loop, since we know p0 < p1 then.
@@ -22,8 +22,6 @@
 	* scroll.c (do_scrolling): Work around GCC bug 48228.
 	See <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48228>.
 
-2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
-
 	* frame.c (Fmodify_frame_parameters): Simplify loop counter.
 	This also avoids a warning with gcc -Wstrict-overflow.
 	(validate_x_resource_name): Simplify count usage.
@@ -125,6 +123,11 @@
 	* callproc.c (call_process_cleanup): Now static.
 	(relocate_fd): Rename locals to avoid shadowing.
 
+2011-03-22  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xterm.c (x_clear_frame): Remove XClearWindow call.  This appears
+	not to be necessary, and produces flickering.
+
 2011-03-20  Glenn Morris  <rgm@gnu.org>
 
 	* config.in: Remove file.

src/xterm.c

@@ -2928,10 +2928,14 @@ x_clear_frame (struct frame *f)
   /* We don't set the output cursor here because there will always
      follow an explicit cursor_to.  */
   BLOCK_INPUT;
-  XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
 
-  /* We have to clear the scroll bars, too.  If we have changed
-     colors or something like that, then they should be notified.  */
+  /* The following calls have been commented out because they do not
+     seem to accomplish anything, apart from causing flickering during
+     window resize.  */
+  /* XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); */
+
+  /* We have to clear the scroll bars.  If we have changed colors or
+     something like that, then they should be notified.  */
   x_scroll_bar_clear (f);
 
 #if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)