auto upstream

4 files changed, 43 insertions, 5 deletions

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,