Mercurial > emacs
diff lisp/emacs-lisp/lisp.el @ 90737:95d0cdf160ea
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 26 Jan 2007 06:16:11 +0000 |
parents | bc10a33dd40b 7a3f13e2dd57 |
children | 4ef881a120fe |
line wrap: on
line diff
--- a/lisp/emacs-lisp/lisp.el Fri Jan 26 02:30:28 2007 +0000 +++ b/lisp/emacs-lisp/lisp.el Fri Jan 26 06:16:11 2007 +0000 @@ -1,7 +1,7 @@ ;;; lisp.el --- Lisp editing commands for Emacs ;; Copyright (C) 1985, 1986, 1994, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; 2005, 2006, 2007 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages