[Emacs-diffs] [emacs] 02/02: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Jay Belanger]

jpb pushed a commit to branch master
in repository emacs.

commit bc5d86fe909e2808194bc738c8086599245f22c5
Merge: 1a30156 1a71302
Author: Jay Belanger <address@hidden>
Date:   Sat Nov 15 23:27:48 2014 -0600

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
    
    Conflicts:
        lisp/ChangeLog

 .gitignore                     |   18 +++++-
 ChangeLog                      |   19 +++++-
 admin/ChangeLog                |   16 ++++--
 admin/update_autogen           |   13 ++++-
 lisp/ChangeLog                 |   37 ++++++++++---
 lisp/gnus/ChangeLog            |    4 +
 lisp/mail/emacsbug.el          |   17 ++++--
 lisp/progmodes/python.el       |   52 +++++++++++------
 lisp/version.el                |    4 +-
 src/ChangeLog                  |   24 +++++++-
 src/nsfns.m                    |   23 +++++++-
 src/nsmenu.m                   |    5 ++
 src/nsterm.m                   |    1 -
 src/window.c                   |   18 ++++--
 src/window.h                   |    2 +-
 test/ChangeLog                 |   11 ++++
 test/automated/python-tests.el |  119 ++++++++++++++++++++++++++++++++++++++++
 17 files changed, 322 insertions(+), 61 deletions(-)

diff --cc lisp/ChangeLog
index 9a9e431,2fabb8e..1c49034
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,23 +1,29 @@@
 +2014-11-16  Thierry Banel <address@hidden>  (tiny change)
 +
 +      * calc/calc-arith.el (math-max-list, math-min-list): Fix bug
 +      for date handling.
 +
+ 2014-11-16  Andreas Schwab  <address@hidden>
+ 
+       * version.el (emacs-repository-get-version): Use git rev-parse
+       instead of git log.
+ 
+ 2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
+ 
+       * progmodes/python.el (python-indent-calculate-levels):
+       Fix indentation behavior multiline dedenter statement.  (Bug#18432)
+ 
+ 2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
+ 
+       * progmodes/python.el (python-indent-region):
+       Use python-indent-line and skip special cases.  (Bug#18843)
+ 
+ 2014-11-16  Peder O. Klingenberg  <address@hidden>  (tiny change)
+ 
+       * mail/emacsbug.el (report-emacs-bug): Make a better guess at
+         envelope-from when reporting through sendmail (bug#19054).
++>>>>>>> 1a713024a012f574d16084cf42703e6ef49473cf
+ 
  2014-11-16  Oscar Fuentes <address@hidden>
  
        Add faces for the VC modeline state indicator.