From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 25 Sep 2017 18:16:05 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1bb8ac0c02d91c64ae14e37680fc90ff899da2b4;p=emacs.git

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

1bb8ac0c02d91c64ae14e37680fc90ff899da2b4