]> git.eshelyaron.com Git - emacs.git/commit
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)
commit1bb8ac0c02d91c64ae14e37680fc90ff899da2b4
treef8a36a8338b59b5ffeaca8b3049c10e385ddf611
parent00a86a558ed3cde443b41c0e24934f61dea99236
parent48d39c39e822a792f7c20254c3d9f94aa298be31
Merge from origin/emacs-26

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...