Glenn Morris 7c7ee1dd52 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		2019-04-29 09:12:53 -07:00
..
emacs	Merge from origin/emacs-26	2019-04-29 09:08:19 -07:00
lispintro	Merge from origin/emacs-26	2019-03-09 10:07:46 -08:00
lispref	Merge from origin/emacs-26	2019-04-29 09:12:53 -07:00
man	Merge from origin/emacs-26	2018-12-31 17:57:29 -08:00
misc	Merge from origin/emacs-26	2019-04-21 07:51:38 -07:00