]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2016 22:01:17 +0000 (15:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2016 22:01:17 +0000 (15:01 -0700)
dbb3410 python.el: Fix detection of native completion in Python 3 (bu...
91c97b6 * Makefile.in (install-arch-indep): Skip etc/refcards/emacsve...
9c1cb8d * lisp/subr.el (set-transient-map): Exit for unbound events (...
9c247d2 Update category-table for Chinese characters
43986d1 Inhibit buffer relocation during regex searches
fee4cef Revert fixes to allocation of regex matching

1  2 
Makefile.in
lisp/international/characters.el
lisp/progmodes/python.el
lisp/subr.el
src/dired.c
src/regex.c
src/regex.h
src/search.c

diff --cc Makefile.in
Simple merge
Simple merge
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/dired.c
Simple merge
diff --cc src/regex.c
Simple merge
diff --cc src/regex.h
Simple merge
diff --cc src/search.c
Simple merge