diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-07 11:51:13 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-07 11:51:13 -0800 |
commit | 9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch) | |
tree | 3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /lisp/emacs-lisp/derived.el | |
parent | dbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff) | |
parent | 6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff) | |
download | emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.bz2 emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/derived.el')
-rw-r--r-- | lisp/emacs-lisp/derived.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 55ea102ed2a..119479b2c0a 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -1,7 +1,7 @@ ;;; derived.el --- allow inheritance of major modes ;; (formerly mode-clone.el) -;; Copyright (C) 1993-1994, 1999, 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 1999, 2001-2012 Free Software Foundation, Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) ;; Maintainer: FSF |