Mercurial > emacs
comparison lisp/desktop.el @ 112239:fd7837a29da3
merge emacs-23
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Tue, 04 Jan 2011 15:57:54 +0900 |
parents | 376148b31b5e |
children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
112083:0f72a721050c | 112239:fd7837a29da3 |
---|---|
1 ;;; desktop.el --- save partial status of Emacs when killed | 1 ;;; desktop.el --- save partial status of Emacs when killed |
2 | 2 |
3 ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, | 3 ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, |
4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
5 ;; Free Software Foundation, Inc. | 5 ;; Free Software Foundation, Inc. |
6 | 6 |
7 ;; Author: Morten Welinder <terra@diku.dk> | 7 ;; Author: Morten Welinder <terra@diku.dk> |
8 ;; Keywords: convenience | 8 ;; Keywords: convenience |
9 ;; Favourite-brand-of-beer: None, I hate beer. | 9 ;; Favourite-brand-of-beer: None, I hate beer. |