merge and fixes

[gnu-emacs] / lisp / progmodes / cmacexp.el

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 920b5c93ab6b03d3a7751bbb415d6d3e25a4e5e5..61b5c22918feaf0e3c8700c894b20b48353a95e0 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -1,7 +1,7 @@
 ;;; cmacexp.el --- expand C macros in a region
 
-;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Francesco Potorti` <pot@gnu.org>
 ;; Adapted-By: ESR