Merge from mainline.

3 files changed, 90 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 45dfb211bb0..520a12ba15f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+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
@@ -382,7 +390,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/NEWS b/etc/NEWS
index 6e9171e55c8..3cc463db4a8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -137,9 +137,8 @@ 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.
+with Xft.  To change font, use the X resource font, for example:
+Emacs.pane.menubar.font:  Courier-12
 
 +++
 ** Enhanced support for characters that have no glyphs in available fonts
@@ -588,7 +587,7 @@ 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".
 
 ** VC and related modes
 
@@ -606,7 +605,17 @@ 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.
 
 ** Miscellaneous
 
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el
new file mode 100644
index 00000000000..60f9fa8dc9d
--- /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
+  "Theme with 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