upstream

7 files changed, 34 insertions, 13 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0e31638a9af..c2f7e3cb0d2 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * themes/dichromacy-theme.el:
+        * themes/wheatgrass-theme.el:
+        * themes/tango-theme.el:
+        * themes/tango-dark-theme.el: Add error, warning, and success
+        faces.
+
 2011-08-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * refcards/orgcard.tex: Document `org-copy-visible'.
diff --git a/etc/NEWS b/etc/NEWS
index 8707a8b0adc..ec863dacef8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -234,6 +234,9 @@ these image types, minus those listed in `imagemagick-types-inhibit'.
 
 See the Emacs Lisp Reference Manual for more information.
 
+** New basic faces `error', `warning', `success' are available to
+highlight strings that indicate failure, caution or successful operation.
+
 ** The colors for selected text (the region face) are taken from the GTK
 theme when Emacs is built with GTK.
 
@@ -1043,15 +1046,17 @@ of function value which looks like (closure ENV ARGS &rest BODY).
 *** New function `special-variable-p' to check whether a variable is
 declared as dynamically bound.
 
-** New function `string-mark-left-to-right'.
++++
+** New function `bidi-string-mark-left-to-right'.
 Given a string containing right-to-left (RTL) script, this function
-returns another string with a terminating LRM (left-to-right mark)
-character.  If this string is inserted into a buffer, Emacs treats the
-LRM as the end of an RTL segment and displays following text as LTR.
+returns another string which can be safely inserted into a buffer as a
+distinct RTL "segment", without causing any following text to be
+displayed as RTL.  (This is done by appending a Unicode "left-to-right
+mark" character.)
 
 This is useful when the buffer has overall left-to-right (LTR)
-paragraph direction and you need to insert a string whose contents
-(and hence directionality) are not known in advance.
+paragraph direction and you need to insert a string whose contents and
+directionality are not known in advance.
 
 ** pre/post-command-hook are not reset to nil upon error.
 Instead, the offending function is removed.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 09042786456..1579a31b8d5 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -17,8 +17,8 @@
 \pdflayout=(0l)
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index 31f27d9fb8a..3c260118b26 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -60,6 +60,10 @@ Ansi-Color faces are included.")
    ;; Escape and prompt faces
    `(minibuffer-prompt ((,class (:weight bold :foreground ,blue))))
    `(escape-glyph ((,class (:foreground ,vermillion))))
+   `(error ((,class (:weight bold :slant italic
+                             :foreground ,vermillion))))
+   `(warning ((,class (:foreground ,orange))))
+   `(success ((,class (:foreground ,bluegreen))))
    ;; Font lock faces
    `(font-lock-builtin-face ((,class (:foreground ,blue))))
    `(font-lock-comment-face ((,class (:slant italic :foreground ,bluegreen))))
@@ -69,8 +73,6 @@ Ansi-Color faces are included.")
    `(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
    `(link ((,class (:underline t :foreground ,blue))))
    `(link-visited ((,class (:underline t :foreground ,redpurple))))
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index 403370c90cb..8f91d35e6a1 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -75,6 +75,9 @@ Semantic, and Ansi-Color faces are included.")
    ;; Escape and prompt faces
    `(minibuffer-prompt ((,class (:foreground ,cham-0))))
    `(escape-glyph ((,class (:foreground ,butter-3))))
+   `(error ((,class (:foreground ,red-0))))
+   `(warning ((,class (:foreground ,orange-1))))
+   `(success ((,class (:foreground ,cham-1))))
    ;; Font lock faces
    `(font-lock-builtin-face ((,class (:foreground ,plum-1))))
    `(font-lock-comment-face ((,class (:foreground ,cham-2))))
@@ -84,7 +87,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-string-face ((,class (:foreground ,choc-1))))
    `(font-lock-type-face ((,class (:foreground ,blue-0))))
    `(font-lock-variable-name-face ((,class (:foreground ,orange-1))))
-   `(font-lock-warning-face ((,class (:foreground ,red-0))))
    ;; Button and link faces
    `(link ((,class (:underline t :foreground ,blue-1))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index 9d0f0aca94a..f504d764277 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -66,6 +66,9 @@ Semantic, and Ansi-Color faces are included.")
    ;; Escape and prompt faces
    `(minibuffer-prompt ((,class (:weight bold :foreground ,blue-3))))
    `(escape-glyph ((,class (:foreground ,red-3))))
+   `(error ((,class (:foreground ,red-3))))
+   `(warning ((,class (:foreground ,orange-3))))
+   `(success ((,class (:foreground ,cham-3))))
    ;; Font lock faces
    `(font-lock-builtin-face ((,class (:foreground ,plum-2))))
    `(font-lock-comment-face ((,class (:slant italic :foreground ,alum-5))))
@@ -75,7 +78,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-string-face ((,class (:foreground ,plum-3))))
    `(font-lock-type-face ((,class (:foreground ,blue-3))))
    `(font-lock-variable-name-face ((,class (:foreground ,orange-4))))
-   `(font-lock-warning-face ((,class (:foreground ,red-2))))
    ;; Button and link faces
    `(link ((,class (:underline t :foreground ,blue-3))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 9f8772c4d6e..63ebc247b9d 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -30,6 +30,9 @@ of green, brown, and blue.")
    'wheatgrass
    `(default ((,class (:foreground "wheat" :background "black"))))
    `(cursor ((,class (:foreground "black" :background "thistle"))))
+   `(error ((,class (:foreground "salmon1"))))
+   `(warning ((,class (:foreground "orange"))))
+   `(success ((,class (:foreground "yellow green"))))
    ;; Highlighting faces
    `(highlight ((,class (:foreground "white" :background "dark green"))))
    `(region ((,class (:foreground "white" :background "dark green"))))
@@ -45,7 +48,6 @@ of green, brown, and blue.")
    `(font-lock-string-face ((,class (:foreground "dark khaki"))))
    `(font-lock-type-face ((,class (:foreground "aquamarine"))))
    `(font-lock-variable-name-face ((,class (:foreground "yellow green"))))
-   `(font-lock-warning-face ((,class (:foreground "salmon1"))))
    ;; Button and link faces
    `(link ((,class (:underline t :foreground "cyan"))))
    `(link-visited ((,class (:underline t :foreground "dark cyan"))))