summaryrefslogtreecommitdiff
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2008-01-08 20:46:54 +0000
committerMiles Bader <miles@gnu.org>2008-01-08 20:46:54 +0000
commit59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (patch)
treec17b8f002edf6892e273ff53214b1b23c880e69f /lisp/desktop.el
parent0664ff722152f34c2e87e9e644bbab401530b9d4 (diff)
parentbf515869577b12abd42777fb0647259920c862fc (diff)
downloademacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.tar.gz
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index c34bf8105ea..4837aeec32d 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,7 +1,7 @@
;;; desktop.el --- save partial status of Emacs when killed
;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
;; Keywords: convenience