Mercurial > emacs
comparison lisp/desktop.el @ 107617:c5f9e4613394
Merge from mainline.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 16 Jan 2010 06:57:09 -0500 |
| parents | 1d1d5d9bd884 |
| children | c56cc351f300 |
comparison
equal
deleted
inserted
replaced
| 107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
|---|---|
| 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 Free Software Foundation, Inc. | 4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5 | 5 |
| 6 ;; Author: Morten Welinder <terra@diku.dk> | 6 ;; Author: Morten Welinder <terra@diku.dk> |
| 7 ;; Keywords: convenience | 7 ;; Keywords: convenience |
| 8 ;; Favourite-brand-of-beer: None, I hate beer. | 8 ;; Favourite-brand-of-beer: None, I hate beer. |
| 9 | 9 |