Merge from emacs-24

5 files changed, 79 insertions, 34 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 634412ec989..42de048e429 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,26 @@
+2014-11-16  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * version.el (emacs-repository-get-version): Use git rev-parse
+        instead of git log.
+
+2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-indent-calculate-levels):
+        Fix indentation behavior multiline dedenter statement.  (Bug#18432)
+
+2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-indent-region):
+        Use python-indent-line and skip special cases.  (Bug#18843)
+
+2014-11-16  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+
+        * mail/emacsbug.el (report-emacs-bug): Make a better guess at
+          envelope-from when reporting through sendmail (bug#19054).
+
 2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * emacs-lisp/backquote.el (backquote-process): Optimize away the ,' case.
+        * emacs-lisp/backquote.el (backquote-process): Optimize away ",'".
 
 2014-11-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -94,13 +114,13 @@
 
 2014-11-10  Kenjiro NAKAYAMA  <nakayamakenjiro@gmail.com>
 
-        * net/eww.el(eww-form-file(defface)): New defface of file upload form.
-        (eww-submit-file): New key map of file upload.
-        (eww-form-file): New file upload button and file name context.
-        (eww-select-file): Select file and display selected file name.
-        (eww-tag-input): Handle input tag of file type.
-        (eww-update-field): Add point offset.
-        (eww-submit): Add submit with multipart/form-data.
+        * net/eww.el(eww-form-file(defface)): New defface of file upload form.
+        (eww-submit-file): New key map of file upload.
+        (eww-form-file): New file upload button and file name context.
+        (eww-select-file): Select file and display selected file name.
+        (eww-tag-input): Handle input tag of file type.
+        (eww-update-field): Add point offset.
+        (eww-submit): Add submit with multipart/form-data.
 
 2014-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e107dbd3b5a..1d9b1465fa5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-16  Adam Sjøgren  <asjo@koldfront.dk>
+
+        * mml2015.el (mml2015-display-key-image): New variable.
+
 2014-11-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-sum.el (gnus-summary-exit-no-update): Don't query about
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 4e3eb324e59..5dde90b9fe4 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -137,6 +137,12 @@ This requires either the OS X \"open\" command, or the freedesktop
                            (concat "mailto:" to)))
         (error "Subject, To or body not found")))))
 
+;; It's the default mail mode, so it seems OK to use its features.
+(autoload 'message-bogus-recipient-p "message")
+(autoload 'message-make-address "message")
+(defvar message-send-mail-function)
+(defvar message-sendmail-envelope-from)
+
 ;;;###autoload
 (defun report-emacs-bug (topic &optional unused)
   "Report a bug in GNU Emacs.
@@ -164,7 +170,12 @@ Prompts for bug subject.  Leaves you in a mail buffer."
       ;; that report-emacs-bug-orig-text remains valid.  (Bug#5178)
       (message-sort-headers)
       ;; Stop message-mode stealing the properties we will add.
-      (set (make-local-variable 'message-strip-special-text-properties) nil))
+      (set (make-local-variable 'message-strip-special-text-properties) nil)
+      ;; Make sure we default to the From: address as envelope when sending
+      ;; through sendmail.
+      (when (and (not message-sendmail-envelope-from)
+                 (message-bogus-recipient-p (message-make-address)))
+        (set (make-local-variable 'message-sendmail-envelope-from) 'header)))
     (rfc822-goto-eoh)
     (forward-line 1)
     ;; Move the mail signature to the proper place.
@@ -346,10 +357,6 @@ usually do not have translators for other languages.\n\n")))
 
 (define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.3")
 
-;; It's the default mail mode, so it seems OK to use its features.
-(autoload 'message-bogus-recipient-p "message")
-(defvar message-send-mail-function)
-
 (defun report-emacs-bug-hook ()
   "Do some checking before sending a bug report."
   (save-excursion
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 961aebeeecd..7ed218c7c98 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -964,7 +964,11 @@ START is the buffer position where the sexp starts."
 
 (defun python-indent-calculate-levels ()
   "Calculate `python-indent-levels' and reset `python-indent-current-level'."
-  (if (not (python-info-dedenter-statement-p))
+  (if (or (python-info-continuation-line-p)
+          (not (python-info-dedenter-statement-p)))
+      ;; XXX: This asks for a refactor.  Even if point is on a
+      ;; dedenter statement, it could be multiline and in that case
+      ;; the continuation lines should be indented with normal rules.
       (let* ((indentation (python-indent-calculate-indentation))
              (remainder (% indentation python-indent-offset))
              (steps (/ (- indentation remainder) python-indent-offset)))
@@ -1070,24 +1074,34 @@ Called from a program, START and END specify the region to indent."
       (or (bolp) (forward-line 1))
       (while (< (point) end)
         (or (and (bolp) (eolp))
-            (let (word)
-              (forward-line -1)
-              (back-to-indentation)
-              (setq word (current-word))
-              (forward-line 1)
-              (when (and word
-                         ;; Don't mess with strings, unless it's the
-                         ;; enclosing set of quotes.
-                         (or (not (python-syntax-context 'string))
-                             (eq
-                              (syntax-after
-                               (+ (1- (point))
-                                  (current-indentation)
-                                  (python-syntax-count-quotes (char-after) (point))))
-                              (string-to-syntax "|"))))
-                (beginning-of-line)
-                (delete-horizontal-space)
-                (indent-to (python-indent-calculate-indentation)))))
+            (when (and
+                   ;; Skip if previous line is empty or a comment.
+                   (save-excursion
+                     (let ((line-is-comment-p
+                            (python-info-current-line-comment-p)))
+                       (forward-line -1)
+                       (not
+                        (or (and (python-info-current-line-comment-p)
+                                 ;; Unless this line is a comment too.
+                                 (not line-is-comment-p))
+                            (python-info-current-line-empty-p)))))
+                   ;; Don't mess with strings, unless it's the
+                   ;; enclosing set of quotes.
+                   (or (not (python-syntax-context 'string))
+                       (eq
+                        (syntax-after
+                         (+ (1- (point))
+                            (current-indentation)
+                            (python-syntax-count-quotes (char-after) (point))))
+                        (string-to-syntax "|")))
+                   ;; Skip if current line is a block start, a
+                   ;; dedenter or block ender.
+                   (save-excursion
+                     (back-to-indentation)
+                     (not (looking-at
+                           (python-rx
+                            (or block-start dedenter block-ender))))))
+              (python-indent-line)))
         (forward-line 1))
       (move-marker end nil))))
 
diff --git a/lisp/version.el b/lisp/version.el
index 1ea38da9cae..cab2d28db4c 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -187,8 +187,8 @@ only ask the VCS if we cannot find any information ourselves."
            (let ((default-directory (file-name-as-directory dir)))
              (and (eq 0
                       (condition-case nil
-                          (call-process "git" nil '(t nil) nil "log"
-                                        "-1" "--pretty=format:%H")
+                          (call-process "git" nil '(t nil) nil "rev-parse"
+                                        "HEAD")
                         (error nil)))
                   (not (zerop (buffer-size)))
                   (replace-regexp-in-string "\n" "" (buffer-string))))))))