summaryrefslogtreecommitdiff
path: root/lisp/emacs-lock.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lock.el')
-rw-r--r--lisp/emacs-lock.el10
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 47ab615d976..0cded29193a 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -88,6 +88,9 @@ The functions get one argument, the first locked buffer found."
:group 'emacs-lock
:version "24.3")
+(define-obsolete-variable-alias 'emacs-lock-from-exiting
+ 'emacs-lock-mode "24.1")
+
(defvar-local emacs-lock-mode nil
"If non-nil, the current buffer is locked.
It can be one of the following values:
@@ -185,16 +188,11 @@ Return a value appropriate for `kill-buffer-query-functions' (which see)."
;; anything else (turn off)
mode))))
-(define-obsolete-variable-alias 'emacs-lock-from-exiting
- 'emacs-lock-mode "24.1")
-
;;;###autoload
(define-minor-mode emacs-lock-mode
"Toggle Emacs Lock mode in the current buffer.
If called with a plain prefix argument, ask for the locking mode
-to be used. With any other prefix ARG, turn mode on if ARG is
-positive, off otherwise. If called from Lisp, enable the mode if
-ARG is omitted or nil.
+to be used.
Initially, if the user does not pass an explicit locking mode, it
defaults to `emacs-lock-default-locking-mode' (which see);