summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/generic.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-02-08 04:26:44 +0000
committerMiles Bader <miles@gnu.org>2006-02-08 04:26:44 +0000
commit380874900ca183ec2fdce91949d841328852d7a8 (patch)
tree6918a4182f8657251e83223511aa7827fb8820ed /lisp/emacs-lisp/generic.el
parent72b464afc12a7532fc8555352db04c65647c15ae (diff)
parentc96ec15a58817ac97db5348187e2d8695f609cb5 (diff)
downloademacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 43-57) - Update from CVS - Merge from erc--emacs--0 - Make constrain-to-field notice overlays - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 18-21) - Update from CVS - Merge from emacs--devo--0
Diffstat (limited to 'lisp/emacs-lisp/generic.el')
-rw-r--r--lisp/emacs-lisp/generic.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 4dd10ad3a9c..e52072e9db1 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -1,7 +1,7 @@
;;; generic.el --- defining simple major modes with comment and font-lock
;;
;; Copyright (C) 1997, 1999, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Fri Sep 27 1996