auto upstream

13 files changed, 161 insertions, 11 deletions

diff --git a/autogen/configure b/autogen/configure
index db574207d75..d4df3a49174 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -9842,7 +9842,7 @@ fi
   W32_RES="emacs.res"
   # Tell the linker that emacs.res is an object (which we compile from
   # the rc file), not a linker script.
-  W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res"
+  W32_RES_LINK="-Wl,emacs.res"
 fi
 
 
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"))))
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95aadd40fd6..01887620250 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2013-04-10  Masatake YAMATO  <yamato@redhat.com>
+
+        * progmodes/sh-script.el: Implement `sh-mode' own
+        `add-log-current-defun-function' (bug#14112).
+        (sh-current-defun-name): New function.
+        (sh-mode): Use the function.
+
+2013-04-09  Bastien Guerry  <bzg@gnu.org>
+
+        * simple.el (choose-completion-string): Fix docstring (bug#14163).
+
 2013-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/edebug.el (edebug-mode): Fix typo (bug#14144).
diff --git a/lisp/pcmpl-x.el b/lisp/pcmpl-x.el
index 6ef592b969d..86d8dc652c3 100644
--- a/lisp/pcmpl-x.el
+++ b/lisp/pcmpl-x.el
@@ -1,23 +1,25 @@
 ;;; pcmpl-x.el --- completion for miscellaneous tools  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2013 Free Software Foundation, Inc.
 
 ;; Author: Leo Liu <sdl.web@gmail.com>
 ;; Keywords: processes, tools, convenience
 ;; Package: pcomplete
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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.
 
-;; This program is distributed in the hope that it will be useful,
+;; 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 8f1954402e5..e197f9cfabe 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -353,6 +353,28 @@ See `sh-feature' and `imenu-generic-expression'."
   :group 'sh-script
   :version "20.4")
 
+(defun sh-current-defun-name ()
+  "Find the name of function or variable at point.
+For use in `add-log-current-defun-function'."
+  (save-excursion
+    (end-of-line)
+    (when (re-search-backward
+           (concat "\\(?:"
+                   ;; function FOO
+                   ;; function FOO()
+                   "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*\\(?:()\\)?"
+                   "\\)\\|\\(?:"
+                   ;; FOO()
+                   "^\\s-*\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*()"
+                   "\\)\\|\\(?:"
+                   ;; FOO=
+                   "^\\([[:alpha:]_][[:alnum:]_]*\\)="
+                   "\\)")
+           nil t)
+      (or (match-string-no-properties 1)
+          (match-string-no-properties 2)
+          (match-string-no-properties 3)))))
+
 (defvar sh-shell-variables nil
   "Alist of shell variable names that should be included in completion.
 These are used for completion in addition to all the variables named
@@ -1533,6 +1555,7 @@ with your script for an edit-interpret-debug cycle."
   (setq-local skeleton-newline-indent-rigidly t)
   (setq-local defun-prompt-regexp
               (concat "^\\(function[ \t]\\|[[:alnum:]]+[ \t]+()[ \t]+\\)"))
+  (setq-local add-log-current-defun-function #'sh-current-defun-name)
   ;; Parse or insert magic number for exec, and set all variables depending
   ;; on the shell thus determined.
   (sh-set-shell
diff --git a/lisp/simple.el b/lisp/simple.el
index 9baa1b7c884..5adb634e195 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6628,7 +6628,9 @@ the default method of inserting the completion in BUFFER.")
 (defun choose-completion-string (choice &optional
                                         buffer base-position insert-function)
   "Switch to BUFFER and insert the completion choice CHOICE.
-BASE-POSITION, says where to insert the completion."
+BASE-POSITION says where to insert the completion.
+INSERT-FUNCTION says how to insert the completion and falls
+back on `completion-list-insert-choice-function' when nil."
 
   ;; If BUFFER is the minibuffer, exit the minibuffer
   ;; unless it is reading a file name and CHOICE is a directory,
diff --git a/src/ChangeLog b/src/ChangeLog
index 04dcee7b6eb..402792b5460 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (Ftest_completion): Ignore non-string/symbol keys in hash
+        tables (bug#14054).
+
 2013-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.c (select_window): Don't record_buffer while the invariant is
diff --git a/src/minibuf.c b/src/minibuf.c
index 68c39310f01..4cc1f8d435a 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1800,17 +1800,21 @@ the values STRING, PREDICATE and `lambda'.  */)
     {
       struct Lisp_Hash_Table *h = XHASH_TABLE (collection);
       i = hash_lookup (h, string, NULL);
+      Lisp_Object key = Qnil;
       if (i >= 0)
         tem = HASH_KEY (h, i);
       else
         for (i = 0; i < HASH_TABLE_SIZE (h); ++i)
           if (!NILP (HASH_HASH (h, i))
+              && (key = HASH_KEY (h, i),
+                  SYMBOLP (key) ? key = Fsymbol_name (key) : key,
+                  STRINGP (key))
               && EQ (Fcompare_strings (string, make_number (0), Qnil,
-                                       HASH_KEY (h, i), make_number (0) , Qnil,
+                                       key, make_number (0) , Qnil,
                                        completion_ignore_case ? Qt : Qnil),
                      Qt))
             {
-              tem = HASH_KEY (h, i);
+              tem = key;
               break;
             }
       if (!STRINGP (tem))
diff --git a/test/ChangeLog b/test/ChangeLog
index cd4414cd079..bf68984e9e8 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Masatake YAMATO  <yamato@redhat.com>
+
+        * automated/add-log-tests.el: New file. (Bug#14112)
+
 2013-03-30  Fabián Ezequiel Gallina  <fabian@anue.biz>
 
         * automated/python-tests.el (python-indent-block-enders): New test.
diff --git a/test/automated/add-log-tests.el b/test/automated/add-log-tests.el
new file mode 100644
index 00000000000..28029e18b99
--- /dev/null
+++ b/test/automated/add-log-tests.el
@@ -0,0 +1,84 @@
+;;; add-log-tests.el --- Test suite for add-log.
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Masatake YAMATO <yamato@redhat.com>
+;; Keywords: vc tools
+
+;; 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:
+
+(require 'add-log)
+
+(defmacro add-log-current-defun-deftest (name doc major-mode
+                                              content marker expected-defun)
+  "Generate an ert test for mode-own `add-log-current-defun-function'.
+Run `add-log-current-defun' at the point where MARKER specifies in a
+buffer which content is CONTENT under MAJOR-MODE. Then it compares the
+result with EXPECTED-DEFUN."
+  (let ((xname (intern (concat "add-log-current-defun-test-"
+                               (symbol-name name)
+                               ))))
+    `(ert-deftest ,xname ()
+         ,doc
+       (with-temp-buffer
+         (insert ,content)
+         (goto-char (point-min))
+         (funcall ',major-mode)
+         (should (equal (when (search-forward ,marker nil t)
+                          (replace-match "" nil t)
+                          (add-log-current-defun))
+                        ,expected-defun))))))
+
+(add-log-current-defun-deftest
+ sh-func1
+ "Test sh-current-defun-name can find function."
+ sh-mode "
+function foo
+{
+        ><
+}" "><" "foo")
+
+(add-log-current-defun-deftest
+ sh-func2
+ "Test sh-current-defun-name can find function."
+ sh-mode "
+foo()
+{
+        ><
+}" "><" "foo")
+
+(add-log-current-defun-deftest
+ sh-func3
+ "Test sh-current-defun-name can find function."
+ sh-mode "
+function foo()
+{
+        ><
+}" "><" "foo")
+
+(add-log-current-defun-deftest
+ sh-var
+ "Test sh-current-defun-name can find variabe definition."
+ sh-mode "
+PATH=a:/ab:/usr/abc
+DIR=/pr><oc"
+"><" "DIR")
+
+(provide 'add-log-tests)
+
+;;; add-log-tests.el ends here