Mercurial > emacs
comparison src/fontset.c @ 90729:6588c6259dfb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 16 Dec 2006 01:29:26 +0000 |
parents | 6d8c81691fc8 6ee41fdd69ff |
children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
90728:a65a92d83186 | 90729:6588c6259dfb |
---|---|
1 /* Fontset handler. | 1 /* Fontset handler. |
2 Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | 2 Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
3 Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005 | 3 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
4 2005, 2006 | |
4 National Institute of Advanced Industrial Science and Technology (AIST) | 5 National Institute of Advanced Industrial Science and Technology (AIST) |
5 Registration Number H14PRO021 | 6 Registration Number H14PRO021 |
6 Copyright (C) 2003, 2006 | 7 Copyright (C) 2003, 2006 |
7 National Institute of Advanced Industrial Science and Technology (AIST) | 8 National Institute of Advanced Industrial Science and Technology (AIST) |
8 Registration Number H13PRO009 | 9 Registration Number H13PRO009 |