]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a903f0 c26d452)
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 29 Apr 2019 16:12:53 +0000 (09:12 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 29 Apr 2019 16:12:53 +0000 (09:12 -0700)
commit7c7ee1dd52239ecc3665b7542bd5e0ebc9b74795
tree9ac0d4b0cb1888b3fd4c836044341a40105cf3fatree | snapshot
parent3a903f09a10fc506df8bd0f0242856c7595c8e7dcommit | diff
parentc26d452ae15a74f0eeec53ba529eebaa95eb5489commit | diff
Merge from origin/emacs-26

c26d452 (origin/emacs-26) * src/macfont.m (macfont_shape): Use conven...
140e7f8 Recommend using font-lock-face over face (Bug#35044)
7cb5364 Check if mouse_face_overlay was deleted (Bug#35273)

# Conflicts:
# src/macfont.m
doc/lispref/modes.texi diff1 | diff2 | blob | history
src/macfont.m diff1 | diff2 | blob | history
src/xdisp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.