(diff-mode-shared-map): Don't bind M-W, M-U, M-C,

[gnu-emacs] / lisp / emacs-lock.el

diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 729a0d0439ae3f30192498e3add2a690fec41866..7a084adcb6b7747e5828a0747570fb8cdb15c589 100644 (file)
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -1,10 +1,11 @@
 ;;; emacs-lock.el --- prevents you from exiting emacs if a buffer is locked
 
-;; Copyright (C) 1994, 1997 Free Software Foundation, Inc
+;; Copyright (C) 1994, 1997, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc
 
 ;; Author: Tom Wurgler <twurgler@goodyear.com>
 ;; Created: 12/8/94
-;; Keywords:
+;; Keywords: extensions, processes
 
 ;; This file is part of GNU Emacs.
 
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -74,7 +75,7 @@ If t is found, signal error and display the locked buffer name."
       (error "Buffer `%s' is locked, can't delete it" (buffer-name))))
 
 ; These next defuns make it so if you exit a shell that is locked,  the lock
-; is shut off for that shell so you can exit emacs.  same for telnet.
+; is shut off for that shell so you can exit emacs.  Same for telnet.
 ; Also, if a shell or a telnet buffer was locked and the process killed,
 ; turn the lock back on again if the process is restarted.
 
@@ -85,7 +86,7 @@ If t is found, signal error and display the locked buffer name."
 (defun emacs-lock-clear-sentinel (proc str)
   (if emacs-lock-from-exiting
       (progn
-        (setq emacs-lock-from-exiting nil)
+       (setq emacs-lock-from-exiting nil)
        (setq emacs-lock-buffer-locked t)
        (message "Buffer is now unlocked"))
     (setq emacs-lock-buffer-locked nil)))
@@ -103,4 +104,5 @@ If t is found, signal error and display the locked buffer name."
 
 (provide 'emacs-lock)
 
+;;; arch-tag: 58e6cb43-7cf0-401a-bcb6-4902a0b8bdc1
 ;;; emacs-lock.el ends here