Mercurial > emacs
comparison src/textprop.c @ 108396:842d29bdc9a5
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 13 Jan 2010 14:05:08 +0000 |
parents | 1d1d5d9bd884 |
children | 51a1add37c3f |
comparison
equal
deleted
inserted
replaced
108395:e36c1160a378 | 108396:842d29bdc9a5 |
---|---|
1 /* Interface code for dealing with text properties. | 1 /* Interface code for dealing with text properties. |
2 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, | 2 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, |
3 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 3 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4 | 4 |
5 This file is part of GNU Emacs. | 5 This file is part of GNU Emacs. |
6 | 6 |
7 GNU Emacs is free software: you can redistribute it and/or modify | 7 GNU Emacs is free software: you can redistribute it and/or modify |
8 it under the terms of the GNU General Public License as published by | 8 it under the terms of the GNU General Public License as published by |