[Emacs-diffs] master updated (be30748 -> 4fda400)

[Stefan Monnier]

monnier pushed a change to branch master.

      from  be30748   * lisp: Prefer inlinable functions to macros.
      adds  bb19b22   Python.el: Update commentary on RET-behavior
       new  0bb24df   Merge from origin/emacs-24
      adds  babb0ca   ChangeLog fix (do not merge to master)
       new  0c3f76c   Merge from origin/emacs-24
      adds  59c4d5f   Fix bug #19211 with move-end-of-line in non-interactive 
session.
      adds  e97b6e6   * lisp/progmodes/prog-mode.el 
(prettify-symbols--compose-symbol): Refine.
       new  fca389d   Merge from emacs-24
      adds  f9f2509   Auto-commit of loaddefs files.
       new  0d7b2c9   Merge from origin/emacs-24
      adds  d83f061   * .gitignore: Remove redundant pattern (subsumed by _*).
      adds  11b65bc   * .gitignore: Avoid "**", as it requires Git 1.8.2 or 
later.
      adds  ec7e07b   * admin/update_autogen (commit): With git, call "add" 
before "commit".
      adds  b8775f0   * lisp/simple.el (newline): Place the hook 
buffer-locally, to make sure it's first.
      adds  02d462b   * admin/update_autogen (commit): Revert earlier change.
      adds  d9d3831   More flicker fixes for OSX, related to bug 18757.
      adds  e3c24b1   * lisp/progmodes/sh-script.el: Fix indentation rule of "| 
while".
      adds  c1c2cee   * src/eval.c (Fsignal): Remove duplicate test.
       new  4fda400   Merge from emacs-24


Summary of changes:
 .gitignore                  |   12 +++++++-----
 ChangeLog                   |    6 ++++++
 admin/gitmerge.el           |   25 +++++++++++--------------
 lisp/ChangeLog              |   24 ++++++++++++++++++++++++
 lisp/progmodes/prog-mode.el |    8 +++++---
 lisp/progmodes/python.el    |   10 ++++++----
 lisp/progmodes/sh-script.el |    4 ++--
 lisp/simple.el              |    6 +++---
 src/ChangeLog               |   18 ++++++++++++++++++
 src/eval.c                  |    6 ++----
 src/nsfns.m                 |    9 +--------
 src/nsterm.h                |    6 +++++-
 src/nsterm.m                |   27 +++++++++++++++++++++++++++
 test/indent/shell.sh        |   11 +++++++++++
 14 files changed, 128 insertions(+), 44 deletions(-)