comparison lisp/ChangeLog.4 @ 90737:95d0cdf160ea

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 586-614) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - Merge from erc--main--0 - Make byte compiler correctly write circular constants * gnus--rel--5.10 (patch 186-196) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
author Miles Bader <miles@gnu.org>
date Fri, 26 Jan 2007 06:16:11 +0000
parents 6588c6259dfb e3694f1cb928
children 52a7f3f50b89
comparison
equal deleted inserted replaced
90736:ef1369583937 90737:95d0cdf160ea
8937 * faces.el (x-resolve-font-name): Give correct error message 8937 * faces.el (x-resolve-font-name): Give correct error message
8938 depending on whether or not FACE was non-nil. 8938 depending on whether or not FACE was non-nil.
8939 8939
8940 See ChangeLog.3 for earlier changes. 8940 See ChangeLog.3 for earlier changes.
8941 8941
8942 Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006 8942 Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
8943 Free Software Foundation, Inc. 8943 Free Software Foundation, Inc.
8944 Copying and distribution of this file, with or without modification, 8944 Copying and distribution of this file, with or without modification,
8945 are permitted provided the copyright notice and this notice are preserved. 8945 are permitted provided the copyright notice and this notice are preserved.
8946 8946
8947 ;;; arch-tag: 91035822-35c7-44a9-8417-2454b88c3db2 8947 ;;; arch-tag: 91035822-35c7-44a9-8417-2454b88c3db2