diff options
| author | Miles Bader <miles@gnu.org> | 2005-08-26 09:51:52 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-08-26 09:51:52 +0000 |
| commit | d4cccb140682cfa548a8658f905764ceb4a38cb2 (patch) | |
| tree | 5230af18ee25b37efed50fa38cac1eefb47d03fc /lisp/emacs-lisp/derived.el | |
| parent | 5e10f34207ff594cd6570928bc0292a7b53297b8 (diff) | |
| parent | f3f01d5df3156fb408b43da0c670796c37ed084f (diff) | |
| download | emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.tar.gz emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.tar.bz2 emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
Diffstat (limited to 'lisp/emacs-lisp/derived.el')
| -rw-r--r-- | lisp/emacs-lisp/derived.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 764f58bcd23..8e1f79f95ee 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -1,7 +1,8 @@ ;;; derived.el --- allow inheritance of major modes ;; (formerly mode-clone.el) -;; Copyright (C) 1993, 1994, 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) ;; Maintainer: FSF |