]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Sep 2017 18:16:05 +0000 (11:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Sep 2017 18:16:05 +0000 (11:16 -0700)
48d39c39e8 Search for Syntax section when viewing MDN
9d101376b4 Allow smerge-keep-current to work for empty hunks
13aba24add Call vc-setup-buffer in vc-git-log-{in,out}going
1d599df5e0 Fix last change to textmodes/page-ext.el
a726e09a9a * test/src/lcms-tests.el (lcms-cri-cam02-ucs): Skip if lcm...


Trivial merge