diff lisp/emacs-lock.el @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children 376148b31b5e
line wrap: on
line diff
--- a/lisp/emacs-lock.el	Sat Jan 09 11:27:11 2010 -0500
+++ b/lisp/emacs-lock.el	Sat Jan 16 06:57:09 2010 -0500
@@ -1,7 +1,7 @@
 ;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked
 
 ;; Copyright (C) 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc
 
 ;; Author: Tom Wurgler <twurgler@goodyear.com>
 ;; Created: 12/8/94