auto upstream

4 files changed, 18 insertions, 3 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 85b365695fd..493095e9621 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-09  Tassilo Horn  <tsdh@gnu.org>
+
+        * themes/tsdh-dark-theme.el (tsdh-dark): Add some more faces.
+
+2013-04-09  Masatake YAMATO  <yamato@redhat.com>
+
+        * NEWS: Mention `sh-mode' own `add-log-current-defun-function'.
+
 2013-04-07  Jan Djärv  <jan.h.d@swipnet.se>
 
         * PROBLEMS: Mention Ubuntu warnings about libdbusmenu.
diff --git a/etc/NEWS b/etc/NEWS
index d893f496ef0..6014ee36219 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -84,6 +84,11 @@ Eg View mode, etc.
 
 ** New command `kmacro-to-register' to store keyboard macros in registers.
 
+** Shell Script mode
+
+*** `sh-mode' now has the mode own `add-log-current-defun-function'.
+You can pick the name of the function and the variables with `C-x 4 a'.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index bc86c7cb373..0cfc0ad0c14 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1412,17 +1412,16 @@ When you start Emacs you may see something like this:
 (emacs:2286): LIBDBUSMENU-GTK-CRITICAL **: watch_submenu: assertion 
 `GTK_IS_MENU_SHELL(menu)' failed
 
-This happens if the Emacs binary has been renamed.  The cause it the Ubuntu
+This happens if the Emacs binary has been renamed.  The cause is the Ubuntu
 appmenu concept.  It tries to track Emacs menus and show them in the top
 panel, instead of in each Emacs window.  This is not properly implemented,
 so it fails for Emacs.  The order of menus is wrong, and things like copy/paste
-that depends on what state Emacs is in, is usually wrong (i.e. paste disabled
+that depend on what state Emacs is in are usually wrong (i.e. paste disabled
 even if you should be able to paste, and similar).
 
 You can get back menus on each frame by starting emacs like this:
 % env UBUNTU_MENUPROXY= emacs
 
-
 * Runtime problems on character terminals
 
 ** The meta key does not work on xterm.
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index 011133808a2..879f8f10e8a 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -64,7 +64,10 @@ Used and created by Tassilo Horn.")
  '(highlight ((t (:background "sea green"))))
  '(hl-line ((t (:background "grey25"))))
  '(hl-paren-face ((t (:weight bold))) t)
+ '(icomplete-first-match ((t (:foreground "deep sky blue" :weight bold))))
  '(lusty-file-face ((t (:foreground "SpringGreen1"))) t)
+ '(magit-header ((t (:box 1 :weight bold))))
+ '(magit-section-title ((t (:inherit magit-header :background "dark slate blue"))))
  '(menu ((t (:background "gray30" :foreground "gray70"))))
  '(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
  '(mode-line ((t (:box (:line-width 1 :color "red") :family "DejaVu Sans"))))