]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Sat, 6 Jul 2019 19:51:30 +0000 (12:51 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 6 Jul 2019 19:51:30 +0000 (12:51 -0700)
e97c043 Fix python.el docstring (Bug#36458)
e660801 ; Add thing-at-point-looking-at test (Bug#35708)
f5b4846 ; Fix typo, insure -> ensure in ChangeLogs
cb8fb59 * lisp/hi-lock.el (hi-lock-line-face-buffer): Doc fix.  (Bug3...

1  2 
lisp/ChangeLog.5
lisp/hi-lock.el
lisp/progmodes/python.el
test/lisp/thingatpt-tests.el

Simple merge
diff --cc lisp/hi-lock.el
Simple merge
Simple merge
Simple merge