Mercurial > emacs

diff lisp/smerge-mode.el @ 111366:7be30ce79ffd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backport fix for Bug#6287 from trunk. * font.c (font_delete_unmatched): Check Vface_ignored_fonts. Don't sheck SPEC if it is nil. (font_list_entities): Call font_delete_unmatched if Vface_ignored_fonts is non-nil.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 04 Nov 2010 15:47:27 -0400
parents 1d1d5d9bd884
children 46ac70591556 376148b31b5e
line wrap: on
line diff