]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 13 May 2016 14:45:30 +0000 (07:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 13 May 2016 14:45:30 +0000 (07:45 -0700)
9c2a1a2 * doc/misc/texinfo.tex: Sync from gnulib.
66cd4d8 * lisp/emacs-lisp/find-func.el (find-feature-regexp) (find-al...
1a5a05c Do not mistake colon at the end of regexp for slash symbol
4c5a00b Make package-install-from-buffer not move point
9596ea1 ; Revert "* emacs-lisp/lisp-mnt.el (lm-header): save-excursion"
f79c352 Redo the fix for bug#21839
8d2f78c Don't treat JS spread as contination method call

1  2 
lisp/emacs-lisp/find-func.el
lisp/emacs-lisp/package.el
lisp/help.el
lisp/progmodes/js.el
test/lisp/progmodes/ruby-mode-tests.el
test/manual/indent/js.js

Simple merge
Simple merge
diff --cc lisp/help.el
Simple merge
Simple merge
Simple merge