diff lisp/ediff-merg.el @ 103650:e561e9f73ad4

* xftfont.c (xftfont_open): Avoid passing NULL argument to XftLockFace.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 30 Jun 2009 22:07:44 +0000
parents c55394eee0de
children affb617d6101
line wrap: on
line diff