]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2016 09:50:48 +0000 (02:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2016 09:50:48 +0000 (02:50 -0700)
commit394bdb8f2317e312d39e071b588581802dd3027a
tree159fc5496fbecff8760a3c434e82f95f67e99e61
parent46288dd6321e2ff4028781383660786050933304
parent50fa7d64d36c3f2d6ab11e7136575fbca7012cae
Merge from origin/emacs-25

50fa7d6 ;* src/w32heap.c: Fix typo and wording of the comments.
6f1325e electric-quote mode no longer worries about coding
c2a1792 * src/regex.c (re_search_2): Make new code safe for -Wjump-mi...
f6134bb Port to GCC 6.2.1 + --enable-gcc-warnings
b2ba630 Explain how to debug emacsclient lisp errors
9da53e2 Let describe-function work for lambda again
5c2da93 Fix kill-line's docstring
ad66b3f Fix handling of allocation in regex matching
5a26c9b * lisp/electric.el (electric-quote-mode): Improve doc (Bug#24...
3877c91 vc-region-history: Search just on lines intersecting the region
8988327 Fix documentation of 'alist-get'
b6998ea * src/regex.h (re_match_object): Improve commentary.

# Conflicts:
# etc/NEWS
# lisp/help-fns.el
doc/lispref/debugging.texi
lisp/electric.el
lisp/help-fns.el
lisp/simple.el
src/dired.c
src/regex.c
src/regex.h
src/search.c
src/w32heap.c