emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove third argument from doom/popup-close* fns

Browse source
This commit is contained in:
Henrik Lissner 2016-10-11 13:19:55 +02:00
parent 8f76e50242
commit 8c5deda9e3
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/core-helm.el
View file

@ -159,10 +159,10 @@
;; This prevents helm-ag from switching between windows and buffers. ;; This prevents helm-ag from switching between windows and buffers.
(defadvice helm-ag--edit-abort (around helm-ag-edit-abort-popup-compat activate) (defadvice helm-ag--edit-abort (around helm-ag-edit-abort-popup-compat activate)
(cl-letf (((symbol-function 'select-window) 'ignore)) ad-do-it) (cl-letf (((symbol-function 'select-window) 'ignore)) ad-do-it)
(doom/popup-close nil t t)) (doom/popup-close nil t))
(defadvice helm-ag--edit-commit (around helm-ag-edit-commit-popup-compat activate) (defadvice helm-ag--edit-commit (around helm-ag-edit-commit-popup-compat activate)
(cl-letf (((symbol-function 'select-window) 'ignore)) ad-do-it) (cl-letf (((symbol-function 'select-window) 'ignore)) ad-do-it)
(doom/popup-close nil t t)) (doom/popup-close nil t))
(defadvice helm-ag--edit (around helm-ag-edit-popup-compat activate) (defadvice helm-ag--edit (around helm-ag-edit-popup-compat activate)
(cl-letf (((symbol-function 'other-window) 'ignore) (cl-letf (((symbol-function 'other-window) 'ignore)
((symbol-function 'switch-to-buffer) 'doom/popup-buffer)) ((symbol-function 'switch-to-buffer) 'doom/popup-buffer))

4
core/defuns/defuns-popups.el
View file

@ -49,7 +49,7 @@ window. Returns nil or the popup window."
`(let ((popup-p (doom/popups-p)) `(let ((popup-p (doom/popups-p))
(in-popup-p (doom/popup-p))) (in-popup-p (doom/popup-p)))
(when popup-p (when popup-p
(doom/popup-close-all t t)) (doom/popup-close-all t))
(prog1 (prog1
,@body ,@body
(when popup-p (when popup-p
@ -101,7 +101,7 @@ window. Returns nil or the popup window."
"Closes all popups (kill them if DONT-KILL-BUFFERS is non-nil)." "Closes all popups (kill them if DONT-KILL-BUFFERS is non-nil)."
(interactive) (interactive)
(let ((orig-win (selected-window))) (let ((orig-win (selected-window)))
(mapc (lambda (w) (doom/popup-close w dont-kill t)) (mapc (lambda (w) (doom/popup-close w dont-kill))
(--filter (and (doom/popup-p it) (not (eq it orig-win))) (--filter (and (doom/popup-p it) (not (eq it orig-win)))
(window-list))))) (window-list)))))

2
modules/defuns/defuns-quickrun.el
View file

@ -85,7 +85,7 @@ elisp buffer). Otherwise forward the region to Quickrun."
"Allows us to re-run quickrun from inside the quickrun buffer." "Allows us to re-run quickrun from inside the quickrun buffer."
(awhen (get-buffer-window quickrun/buffer-name) (awhen (get-buffer-window quickrun/buffer-name)
(shut-up! (quickrun/kill-running-process)) (shut-up! (quickrun/kill-running-process))
(doom/popup-close it nil t))) (doom/popup-close it nil)))
;;;###autoload ;;;###autoload
(defun doom|quickrun-after-run () (defun doom|quickrun-after-run ()