diff options
| author | Glenn Morris | 2019-04-29 09:12:53 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-04-29 09:12:53 -0700 |
| commit | 7c7ee1dd52239ecc3665b7542bd5e0ebc9b74795 (patch) | |
| tree | 9ac0d4b0cb1888b3fd4c836044341a40105cf3fa /src/buffer.h | |
| parent | 3a903f09a10fc506df8bd0f0242856c7595c8e7d (diff) | |
| parent | c26d452ae15a74f0eeec53ba529eebaa95eb5489 (diff) | |
| download | emacs-7c7ee1dd52239ecc3665b7542bd5e0ebc9b74795.tar.gz emacs-7c7ee1dd52239ecc3665b7542bd5e0ebc9b74795.zip | |
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
Diffstat (limited to 'src/buffer.h')
0 files changed, 0 insertions, 0 deletions