[Emacs-diffs] /srv/bzr/emacs/trunk r104966: * emacs-lock.el (emacs-lock-mode): Fix typo in variable name.

[Juanma Barranquero]

------------------------------------------------------------
revno: 104966
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-05 17:09:19 +0200
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/emacs-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-05 14:25:21 +0000
+++ b/lisp/ChangeLog    2011-07-05 15:09:19 +0000
@@ -1,3 +1,9 @@
+2011-07-05  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * font-lock.el (font-lock-builtin-face): Change from Orchid to

=== modified file 'lisp/emacs-lock.el'
--- a/lisp/emacs-lock.el        2011-07-05 12:05:06 +0000
+++ b/lisp/emacs-lock.el        2011-07-05 15:09:19 +0000
@@ -195,7 +195,7 @@
   :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 @@
   (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)