[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master updated (a50c95d -> 2393085)
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master updated (a50c95d -> 2393085) |
Date: |
Mon, 23 Mar 2015 17:34:01 +0000 |
eggert pushed a change to branch master.
from a50c95d Get rid of json-decode-char0 as well
adds a5d1f94 Backport: ruby-mode: Expect regexp after { or | too
adds f74843a Backport: ruby-mode: Change faces used for self, true,
false and nil
adds 1c4900d Backport: ruby-mode: Detect regexps after `!'
adds 17ad6f8 Fix problems caused by calling 'recenter' in auto-revert
(Bug#20122)
new bfed046 Merge from origin/emacs-24
adds e72edc0 Fix lisp/ChangeLog entry from last commit.
new 325c554 Merge from origin/emacs-24
adds ae3d733 Backport 20156 fix (stack corruption)
new 821b600 Merge from origin/emacs-24
adds bb7b23c In `debug' don't try using window on inaccessible frame
(Bug#17170).
new a660037 Merge from origin/emacs-24
adds a4ff05a ChangeLog fix No need to merge to trunk, since it
corrects a backported entry that should not appear in trunk.
new 7f55d42 Merge from origin/emacs-24
adds c3c4b75 Fixes: debbugs:18939
adds 0bfe915 * etc/PROBLEMS: Add entry about dir-locals and some
auto-mounters.
adds e7f92aa authors.el small additions
adds 90b46f5 lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work
for the case nnmail-expiry-target is an nnmh group (bug#20170)
adds ff3878d * configure.ac: Fix jpeg version check to work with gcc
>= 5.
adds 33e2236 * display.texi (Useless Whitespace): Fix thinko.
adds 1291ce1 Minor documentation fix in ELisp manual (Bug#20174)
adds 5e2951b Improve docs of 'posn-actual-col-row' (Bug#20169)
adds ad89f85 Another minor improvement in ELisp manual (Bug#20168)
new 2393085 Merge from origin/emacs-24
Summary of changes:
ChangeLog | 4 ++++
admin/authors.el | 2 ++
configure.ac | 18 +++++++++++-------
doc/emacs/display.texi | 2 +-
doc/lispref/ChangeLog | 8 ++++++++
doc/lispref/commands.texi | 15 +++++++++++----
etc/PROBLEMS | 26 ++++++++++++++++++++++++--
lisp/ChangeLog | 15 +++++++++++++++
lisp/emacs-lisp/debug.el | 6 ++++--
lisp/gnus/ChangeLog | 5 +++++
lisp/gnus/nnmh.el | 4 ++--
lisp/simple.el | 3 ++-
12 files changed, 89 insertions(+), 19 deletions(-)
- [Emacs-diffs] master updated (a50c95d -> 2393085),
Paul Eggert <=
- [Emacs-diffs] master bfed046 1/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master a660037 4/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master 7f55d42 5/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master 2393085 6/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master 325c554 2/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master 821b600 3/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23