procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use pop-to-buffer-same-window in woman.el

Browse source 
* lisp/woman.el (woman-really-find-file): Work around going to
the wrong buffer by using `pop-to-buffer-same-window' (bug#22332).
(WoMan-find-buffer): Ditto.
This commit is contained in:
Ari Roponen 2016-02-20 18:57:44 +11:00 • committed by Lars Ingebrigtsen
parent 2a75f64dd2
commit 24c1c1d5c3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/woman.el
View file

@ -1654,7 +1654,7 @@ Do not call directly!"
(setq woman-frame (make-frame))))) (setq woman-frame (make-frame)))))
(set-buffer (get-buffer-create bufname)) (set-buffer (get-buffer-create bufname))
(condition-case nil (condition-case nil
(display-buffer (current-buffer)) (pop-to-buffer-same-window (current-buffer))
(error (pop-to-buffer (current-buffer)))) (error (pop-to-buffer (current-buffer))))
(buffer-disable-undo) (buffer-disable-undo)
(setq buffer-read-only nil) (setq buffer-read-only nil)
@ -2064,14 +2064,14 @@ alist in `woman-buffer-alist' and return nil."
(if (zerop woman-buffer-number) (if (zerop woman-buffer-number)
(let ((buffer (get-buffer (cdr (car woman-buffer-alist))))) (let ((buffer (get-buffer (cdr (car woman-buffer-alist)))))
(if buffer (if buffer
(display-buffer buffer) (pop-to-buffer-same-window buffer)
;; Delete alist element: ;; Delete alist element:
(setq woman-buffer-alist (cdr woman-buffer-alist)) (setq woman-buffer-alist (cdr woman-buffer-alist))
nil)) nil))
(let* ((prev-ptr (nthcdr (1- woman-buffer-number) woman-buffer-alist)) (let* ((prev-ptr (nthcdr (1- woman-buffer-number) woman-buffer-alist))
(buffer (get-buffer (cdr (car (cdr prev-ptr)))))) (buffer (get-buffer (cdr (car (cdr prev-ptr))))))
(if buffer (if buffer
(display-buffer buffer) (pop-to-buffer-same-window buffer)
;; Delete alist element: ;; Delete alist element:
(setcdr prev-ptr (cdr (cdr prev-ptr))) (setcdr prev-ptr (cdr (cdr prev-ptr)))
(if (>= woman-buffer-number (length woman-buffer-alist)) (if (>= woman-buffer-number (length woman-buffer-alist))