Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org

10 files changed, 55 insertions, 23 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b07a6b0d851..41c68d7fbee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2014-10-12  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        Fix import completion.  (Bug#18582)
+        * progmodes/python.el (python-shell-completion-get-completions):
+        Fix import case regexp.
+
+2014-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo
+        (bug#18622).  Reported by Arni Magnusson <arnima@hafro.is>.
+        * progmodes/prolog.el (prolog-electric--underscore): Same.
+
 2014-10-12  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-get-remote-id): Check also for "gid".
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 5a8a9b250a1..38e2eb7a96f 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,15 @@
+2014-10-12  Christopher Schmidt  <ch@ristopher.com>
+
+        * org.el (orgstruct-make-binding): Do not use loop in interpreted code.
+
+2014-10-12  Mike McLean  <mike.mclean@pobox.com>  (tiny change)
+
+        * org-agenda.el (org-agenda-time-grid): Change docstring.
+
+2014-10-12  Nicolas Goaziou  <mail@nicolasgoaziou.fr>
+
+        * ox.el (org-export-async-start): Allow to use symbols as function.
+
 2014-10-03  Achim Gratz  <Stromeko@Stromeko.DE>
 
         * ob-sh.el (org-babel-sh-initiate-session): After initiating a
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 6f9db514d43..c11c1c8ba41 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1472,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed:
  weekly        if the agenda shows an entire week
  today         show grid on current date, independent of daily/weekly display
  require-timed show grid only if at least one item has a time specification
+ remove-match  skip grid times already present in an entry
 
 The second item is a string which will be placed behind the grid time.
 
@@ -5088,8 +5089,7 @@ of what a project is and how to check if it stuck, customize the variable
   "Get the (Emacs Calendar) diary entries for DATE."
   (require 'diary-lib)
   (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
-         (diary-display-hook '(fancy-diary-display))
-         (diary-display-function 'fancy-diary-display)
+         (diary-display-function 'diary-fancy-display)
          (pop-up-frames nil)
          (diary-list-entries-hook
           (cons 'org-diary-default-entry diary-list-entries-hook))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index b96025785c2..aae65cc6d37 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-release "8.2.8"))
+   (let ((org-release "8.2.10"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-git-version "release_8.2.8"))
+   (let ((org-git-version "release_8.2.10"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 05a26a80cbe..1604241f6b3 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9099,14 +9099,16 @@ if `orgstruct-heading-prefix-regexp' is not empty."
             (if fallback
                 (let* ((orgstruct-mode)
                        (binding
-                        (loop with key = ,key
-                              for rep in
-                              '(nil
-                                ("<\\([^>]*\\)tab>" . "\\1TAB")
-                                ("<\\([^>]*\\)return>" . "\\1RET")
-                                ("<\\([^>]*\\)escape>" . "\\1ESC")
-                                ("<\\([^>]*\\)delete>" . "\\1DEL"))
-                              do
+                        (let ((key ,key))
+                          (catch 'exit
+                            (dolist
+                                (rep
+                                 '(nil
+                                   ("<\\([^>]*\\)tab>" . "\\1TAB")
+                                   ("<\\([^>]*\\)return>" . "\\1RET")
+                                   ("<\\([^>]*\\)escape>" . "\\1ESC")
+                                   ("<\\([^>]*\\)delete>" . "\\1DEL"))
+                                 nil)
                               (when rep
                                 (setq key (read-kbd-macro
                                            (let ((case-fold-search))
@@ -9114,7 +9116,8 @@ if `orgstruct-heading-prefix-regexp' is not empty."
                                               (car rep)
                                               (cdr rep)
                                               (key-description key))))))
-                              thereis (key-binding key))))
+                              (when (key-binding key)
+                                (throw 'exit (key-binding key))))))))
                   (if (keymapp binding)
                       (org-set-transient-map binding)
                     (let ((func (or binding
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 1dc790daf37..efc70d22a83 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -881,7 +881,7 @@ publishing will be done asynchronously, in another process."
                           ;; project is still a string here.
                           (list (assoc project org-publish-project-alist)))))
     (if async
-        (org-export-async-start 'ignore
+        (org-export-async-start (lambda (results) nil)
           `(let ((org-publish-use-timestamps-flag
                   (if ',force nil ,org-publish-use-timestamps-flag)))
              (org-publish-projects ',project-alist)))
@@ -899,7 +899,7 @@ optional argument ASYNC, publishing will be done asynchronously,
 in another process."
   (interactive "P")
   (if async
-      (org-export-async-start 'ignore
+      (org-export-async-start (lambda (results) nil)
         `(progn
            (when ',force (org-publish-remove-all-timestamps))
            (let ((org-publish-use-timestamps-flag
@@ -921,7 +921,7 @@ asynchronously, in another process."
   (interactive "P")
   (let ((file (buffer-file-name (buffer-base-buffer))))
     (if async
-        (org-export-async-start 'ignore
+        (org-export-async-start (lambda (results) nil)
           `(let ((org-publish-use-timestamps-flag
                   (if ',force nil ,org-publish-use-timestamps-flag)))
              (org-publish-file ,file)))
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index dd81ad13d1d..1327ae409ed 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -5479,8 +5479,9 @@ to `:default' encoding. If it fails, return S."
 (defmacro org-export-async-start  (fun &rest body)
   "Call function FUN on the results returned by BODY evaluation.
 
-BODY evaluation happens in an asynchronous process, from a buffer
-which is an exact copy of the current one.
+FUN is an anonymous function of one argument.  BODY evaluation
+happens in an asynchronous process, from a buffer which is an
+exact copy of the current one.
 
 Use `org-export-add-to-stack' in FUN in order to register results
 in the stack.
diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el
index e328cfa0d8b..266c24adcca 100644
--- a/lisp/progmodes/bat-mode.el
+++ b/lisp/progmodes/bat-mode.el
@@ -78,11 +78,11 @@
              "goto" "gtr" "if" "in" "leq" "lss" "neq" "not" "start"))
           (UNIX
            '("bash" "cat" "cp" "fgrep" "grep" "ls" "sed" "sh" "mv" "rm")))
-      `(("\\<_\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?"
+      `(("\\_<\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?"
          (2 font-lock-constant-face t))
         ("^:[^:].*"
          . 'bat-label-face)
-        ("\\<_\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)"
+        ("\\_<\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)"
          (2 font-lock-variable-name-face))
         ("%\\(\\w+\\)%?"
          (1 font-lock-variable-name-face))
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 853f2d0dad2..3f98708e2e3 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -3139,7 +3139,7 @@ the following comma and whitespace, if any."
                  (eq (char-before) ?_)
                  (save-excursion
                    (skip-chars-backward "[:alpha:]_")
-                   (looking-at "\\<_[_[:upper:]][[:alnum:]_]*\\_>")))
+                   (looking-at "\\_<[_[:upper:]][[:alnum:]_]*\\_>")))
         (replace-match "_")
         (skip-chars-forward ", \t\n")))))
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index dfefe837569..b230992fc98 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2886,9 +2886,13 @@ When IMPORT is non-nil takes precedence over INPUT for
 completion."
   (with-current-buffer (process-buffer process)
     (let* ((prompt
-            (let ((prompt-boundaries (python-util-comint-last-prompt)))
+            ;; Get last prompt of the inferior process buffer (this
+            ;; intentionally avoids using `comint-last-prompt' because
+            ;; of incompatibilities with Emacs 24.x).
+            (save-excursion
               (buffer-substring-no-properties
-               (car prompt-boundaries) (cdr prompt-boundaries))))
+               (line-beginning-position) ;End of prompt.
+               (re-search-backward "^"))))
            (completion-code
             ;; Check whether a prompt matches a pdb string, an import
             ;; statement or just the standard prompt and use the