mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-31 11:13:50 +00:00
lisp/bs.el, emacs-lock.el: Use defvar-local, setq-local.
* lisp/bs.el (bs-buffer-show-mark): Make defvar-local. (bs-mode): Use setq-local. * lisp/emacs-lock.el (emacs-lock-mode, emacs-lock--old-mode) (emacs-lock--try-unlocking): Make defvar-local.
This commit is contained in:
parent
2663dd23eb
commit
388573ee7c
@ -1,3 +1,11 @@
|
||||
2013-06-22 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* bs.el (bs-buffer-show-mark): Make defvar-local.
|
||||
(bs-mode): Use setq-local.
|
||||
|
||||
* emacs-lock.el (emacs-lock-mode, emacs-lock--old-mode)
|
||||
(emacs-lock--try-unlocking): Make defvar-local.
|
||||
|
||||
2013-06-22 Glenn Morris <rgm@fencepost.gnu.org>
|
||||
|
||||
* play/cookie1.el (cookie-apropos): Minor simplification.
|
||||
|
17
lisp/bs.el
17
lisp/bs.el
@ -336,15 +336,13 @@ Used internally, only.")
|
||||
;; Internal globals
|
||||
;; ----------------------------------------------------------------------
|
||||
|
||||
(defvar bs-buffer-show-mark nil
|
||||
(defvar-local bs-buffer-show-mark nil
|
||||
"Flag for the current mode for showing this buffer.
|
||||
A value of nil means buffer will be shown depending on the current
|
||||
configuration.
|
||||
A value of `never' means to never show the buffer.
|
||||
A value of `always' means to show buffer regardless of the configuration.")
|
||||
|
||||
(make-variable-buffer-local 'bs-buffer-show-mark)
|
||||
|
||||
;; Make face named region (for XEmacs)
|
||||
(unless (facep 'region)
|
||||
(make-face 'region)
|
||||
@ -648,17 +646,14 @@ available Buffer Selection Menu configuration.
|
||||
to show always.
|
||||
\\[bs-visit-tags-table] -- call `visit-tags-table' on current line's buffer.
|
||||
\\[bs-help] -- display this help text."
|
||||
(make-local-variable 'font-lock-defaults)
|
||||
(make-local-variable 'font-lock-verbose)
|
||||
(make-local-variable 'font-lock-global-modes)
|
||||
(buffer-disable-undo)
|
||||
(setq buffer-read-only t
|
||||
truncate-lines t
|
||||
show-trailing-whitespace nil
|
||||
font-lock-global-modes '(not bs-mode)
|
||||
font-lock-defaults '(bs-mode-font-lock-keywords t)
|
||||
font-lock-verbose nil)
|
||||
(set (make-local-variable 'revert-buffer-function) 'bs-refresh)
|
||||
show-trailing-whitespace nil)
|
||||
(setq-local font-lock-defaults '(bs-mode-font-lock-keywords t))
|
||||
(setq-local font-lock-verbose nil)
|
||||
(setq-local font-lock-global-modes '(not bs-mode))
|
||||
(setq-local revert-buffer-function 'bs-refresh)
|
||||
(add-hook 'window-size-change-functions 'bs--track-window-changes)
|
||||
(add-hook 'kill-buffer-hook 'bs--remove-hooks nil t)
|
||||
(add-hook 'change-major-mode-hook 'bs--remove-hooks nil t))
|
||||
|
@ -27,7 +27,7 @@
|
||||
;; This package defines a minor mode Emacs Lock to mark a buffer as
|
||||
;; protected against accidental killing, or exiting Emacs, or both.
|
||||
;; Buffers associated with inferior modes, like shell or telnet, can
|
||||
;; be treated specially, by auto-unlocking them if their interior
|
||||
;; be treated specially, by auto-unlocking them if their inferior
|
||||
;; processes are dead.
|
||||
|
||||
;;; Code:
|
||||
@ -88,26 +88,23 @@ The functions get one argument, the first locked buffer found."
|
||||
:group 'emacs-lock
|
||||
:version "24.3")
|
||||
|
||||
(defvar emacs-lock-mode nil
|
||||
(defvar-local emacs-lock-mode nil
|
||||
"If non-nil, the current buffer is locked.
|
||||
It can be one of the following values:
|
||||
exit -- Emacs cannot exit while the buffer is locked
|
||||
kill -- the buffer cannot be killed, but Emacs can exit as usual
|
||||
all -- the buffer is locked against both actions
|
||||
nil -- the buffer is not locked")
|
||||
(make-variable-buffer-local 'emacs-lock-mode)
|
||||
(put 'emacs-lock-mode 'permanent-local t)
|
||||
|
||||
(defvar emacs-lock--old-mode nil
|
||||
(defvar-local emacs-lock--old-mode nil
|
||||
"Most recent locking mode set on the buffer.
|
||||
Internal use only.")
|
||||
(make-variable-buffer-local 'emacs-lock--old-mode)
|
||||
(put 'emacs-lock--old-mode 'permanent-local t)
|
||||
|
||||
(defvar emacs-lock--try-unlocking nil
|
||||
(defvar-local emacs-lock--try-unlocking nil
|
||||
"Non-nil if current buffer should be checked for auto-unlocking.
|
||||
Internal use only.")
|
||||
(make-variable-buffer-local 'emacs-lock--try-unlocking)
|
||||
(put 'emacs-lock--try-unlocking 'permanent-local t)
|
||||
|
||||
(defun emacs-lock-live-process-p (buffer-or-name)
|
||||
@ -188,6 +185,7 @@ Return a value appropriate for `kill-buffer-query-functions' (which see)."
|
||||
|
||||
(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.
|
||||
|
Loading…
Reference in New Issue
Block a user