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/generic.el | |
| parent | 5e10f34207ff594cd6570928bc0292a7b53297b8 (diff) | |
| parent | f3f01d5df3156fb408b43da0c670796c37ed084f (diff) | |
| download | emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.tar.gz | |
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/generic.el')
| -rw-r--r-- | lisp/emacs-lisp/generic.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el index f40b5eeb574..4dd10ad3a9c 100644 --- a/lisp/emacs-lisp/generic.el +++ b/lisp/emacs-lisp/generic.el @@ -1,6 +1,7 @@ ;;; generic.el --- defining simple major modes with comment and font-lock ;; -;; Copyright (C) 1997, 1999, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Fri Sep 27 1996 @@ -101,8 +102,7 @@ (defvar generic-font-lock-keywords nil "Keywords for `font-lock-defaults' in a generic mode.") (make-variable-buffer-local 'generic-font-lock-keywords) -(defvaralias 'generic-font-lock-defaults 'generic-font-lock-keywords) -(make-obsolete-variable 'generic-font-lock-defaults 'generic-font-lock-keywords "22.1") +(define-obsolete-variable-alias 'generic-font-lock-defaults 'generic-font-lock-keywords "22.1") ;;;###autoload (defvar generic-mode-list nil |