From b27640fef2c099a5c2191ee6ada5d29737faa68a Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Jul 2011 17:09:19 +0200 Subject: [PATCH] * emacs-lock.el (emacs-lock-mode): Fix typo in variable name. Fix check of `emacs-lock-unlockable-modes'. Coerce true values of `emacs-lock--try-unlocking' to t. --- lisp/ChangeLog | 6 ++++++ lisp/emacs-lock.el | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6455a9e6f..3214ed2882 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-07-05 Juanma Barranquero + + * emacs-lock.el (emacs-lock-mode): Fix typo in variable name. + Fix check of `emacs-lock-unlockable-modes'. + Coerce true values of `emacs-lock--try-unlocking' to t. + 2011-07-05 Lars Magne Ingebrigtsen * font-lock.el (font-lock-builtin-face): Change from Orchid to diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index 7cf0f33770..18411f7d2e 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -195,7 +195,7 @@ Other values are interpreted as usual." :init-value nil :lighter ("" (emacs-lock--try-unlocking " locked:" " Locked:") - (:eval (symbol-name emacs-lock-model))) + (:eval (symbol-name emacs-lock-mode))) :group 'emacs-lock :variable (emacs-lock-mode . (lambda (mode) @@ -203,9 +203,10 @@ Other values are interpreted as usual." (when emacs-lock-mode (setq emacs-lock--old-mode emacs-lock-mode) (setq emacs-lock--try-unlocking - (or (and (eq emacs-lock-unlockable-modes t) - (emacs-lock-live-process-p (current-buffer))) - (assq major-mode emacs-lock-unlockable-modes))))) + (and (if (eq emacs-lock-unlockable-modes t) + (emacs-lock-live-process-p (current-buffer)) + (assq major-mode emacs-lock-unlockable-modes)) + t)))) (unless noninteractive (add-hook 'kill-buffer-query-functions 'emacs-lock--kill-buffer-query-functions) -- 2.39.2