]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Mon, 16 Aug 2021 15:01:03 +0000 (08:01 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 16 Aug 2021 15:01:03 +0000 (08:01 -0700)
commit958f5915672f77f2b98c425fae4035dea5dc5116
treed159ff926d76c7d723b9ca0f2a0203e3a020a38b
parent5d7b1d5fc75752a986ed19d3fd333167ddc29d4e
parent9664ee182c3af476c1532354a867a421f9fbacf1
Merge from origin/emacs-27

9664ee182c (origin/emacs-27) C++ Mode: Don't confuse the pointer oper...
b3aec9ee48 CC Mode: Fix unstable fontification of doc strings.

# Conflicts:
# lisp/progmodes/cc-fonts.el
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-fonts.el