Merge from emacs-23

[gnu-emacs] / lisp / font-core.el

diff --git a/lisp/font-core.el b/lisp/font-core.el
index 5f8af5a5215b0f3b80050f64b676173c4e2f919e..a8a641f6b08990df29f7cf863cb3f668b1044ee9 100644 (file)
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -1,7 +1,7 @@
 ;;; font-core.el --- Core interface to font-lock
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF