[Emacs-diffs] [emacs] branch master updated (d409545 -> 1a71302)

[Stefan Monnier]

monnier pushed a change to branch master
in repository emacs.

      from  d409545   Add faces for the VC modeline state indicator
      adds  ac03795   Git transition patch
      adds  e18c2a5   [Backport] lisp/gnus/mml2015.el 
(mml2015-display-key-image): New variable
      adds  3d08bc4   Backport .gitignore changes from master.
      adds  5cf2e27   .gitignore: Add more ignorables.
      adds  f8c4f8d   Backport fix for minor Bazaar leftovers.
      adds  6688117   Fixes: 19036
      adds  6a079d5   Ignore all built versions of Emacs (and .gitattributes)
      adds  df33e85   (emacs-repository-get-version): Call `git log' with 
proper format argument
      adds  15ec2d7   Backport Use derived-mode-p in python.el instead of 
equality test with major-mode
      adds  4cd0f2d   * .gitignore: Add a few more missing entries.
      adds  d5a1d36   .gitignore: Add lib-src/blessmail
      adds  71e866c   src/window.h (WINDOW_FRAME_LINE_HEIGHT): Fix a typo in a 
comment.
      adds  836c444   Fixes: 18757
      adds  b8c9a4e   Fix getting frame size wrong when restoring desktop.
      adds  20478c2   (report-emacs-bug): Make a better guess at envelope-from
      adds  1040099   Mark last change as "tiny"
      adds  260cede   Backport: Fixes: debbugs:18940
      adds  d4fceca   Fix cherry-pick conflict.
      adds  1fb97e7   Fix bug #19060 with inaccurate pixel-based scrolling.
      adds  a6b4278   Backport: Fix for 18993.
      adds  89ebffc   Fix region indentation
      adds  b6cd03a   Ignore generated file lib/stdalign.h.
      adds  92f5857   Fixes: debbugs:18432
      adds  899a5a9   Backport 2014-06-30 admin/update_autogen change
      adds  1033147   Use git rev-parse to get repository version
      adds  4f4cf9c   Don't ignore .gitattributes
       new  9075fcc   Merge from emacs-24
       new  1a71302   Resolve pull conflict

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                     |   18 +++++-
 ChangeLog                      |   19 +++++-
 admin/ChangeLog                |   16 ++++--
 admin/update_autogen           |   13 ++++-
 lisp/ChangeLog                 |   36 +++++++++---
 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, 321 insertions(+), 61 deletions(-)