Fix nixBufferBuilders for newer emacs
This commit is contained in:
parent
65cbebcb81
commit
994f2560d0
|
@ -15,16 +15,16 @@ rec {
|
||||||
(when (eq nixpkgs--buffer-count 0)
|
(when (eq nixpkgs--buffer-count 0)
|
||||||
(make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer)
|
(make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer)
|
||||||
; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer
|
; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer
|
||||||
(defun nixpkgs--around-generate (orig name)
|
(defun nixpkgs--around-generate (orig name &optional ibh)
|
||||||
(if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s))
|
(if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s))
|
||||||
(let ((buf (funcall orig name)))
|
(let ((buf (funcall orig name ibh)))
|
||||||
(progn
|
(progn
|
||||||
(inherit-local-inherit-child buf)
|
(inherit-local-inherit-child buf)
|
||||||
(with-current-buffer buf
|
(with-current-buffer buf
|
||||||
(setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
|
(setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
|
||||||
(add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t)))
|
(add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t)))
|
||||||
buf)
|
buf)
|
||||||
(funcall orig name)))
|
(funcall orig name ibh)))
|
||||||
(advice-add 'generate-new-buffer :around #'nixpkgs--around-generate)
|
(advice-add 'generate-new-buffer :around #'nixpkgs--around-generate)
|
||||||
; When we have no more nixpkgs buffers, tear down the buffer handling
|
; When we have no more nixpkgs buffers, tear down the buffer handling
|
||||||
(defun nixpkgs--decrement-buffer-count ()
|
(defun nixpkgs--decrement-buffer-count ()
|
||||||
|
|
Loading…
Reference in a new issue