diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-25 11:16:05 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-25 11:16:05 -0700 |
commit | 1bb8ac0c02d91c64ae14e37680fc90ff899da2b4 (patch) | |
tree | f8a36a8338b59b5ffeaca8b3049c10e385ddf611 /lisp/emacs-lisp/lisp-mode.el | |
parent | 00a86a558ed3cde443b41c0e24934f61dea99236 (diff) | |
parent | 48d39c39e822a792f7c20254c3d9f94aa298be31 (diff) | |
download | emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.tar.gz emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.tar.bz2 emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.zip |
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...
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions