X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a1479eac569994eda72c24d4d0061e876a039881..23a8a5ab697f3389ea6478cdfefe4e67fff28051:/lisp/emacs-lock.el

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)