bug#22332: 25.0.50; woman moves point in a wrong buffer

[Ari Roponen <ari.roponen@gmail.com>]

Hi,

Kaushal Modi <kaushal.modi@gmail.com> writes:

> Can you please try this updated patch? This time, I hope to have it tested
> all the woman buffer switching activities.
>

Unfortunately, the patch doesn't apply, because of some line wrapping.

Recently, eww replaced display-buffer with pop-to-buffer-same-window
(commit 6191003fcd2bc65f2b18d5337f6f390d43f07173). Perhaps we could do
the same in the emacs-25 branch? Patch below.


diff --git a/lisp/woman.el b/lisp/woman.el
index 28a4798..a4a0da2 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1654,7 +1654,7 @@ woman-really-find-file
 	     (setq woman-frame (make-frame)))))
     (set-buffer (get-buffer-create bufname))
     (condition-case nil
-        (display-buffer (current-buffer))
+        (pop-to-buffer-same-window (current-buffer))
       (error (pop-to-buffer (current-buffer))))
     (buffer-disable-undo)
     (setq buffer-read-only nil)
@@ -2064,14 +2064,14 @@ WoMan-find-buffer
   (if (zerop woman-buffer-number)
       (let ((buffer (get-buffer (cdr (car woman-buffer-alist)))))
 	(if buffer
-	    (display-buffer buffer)
+	    (pop-to-buffer-same-window buffer)
 	  ;; Delete alist element:
 	  (setq woman-buffer-alist (cdr woman-buffer-alist))
 	  nil))
     (let* ((prev-ptr (nthcdr (1- woman-buffer-number) woman-buffer-alist))
 	   (buffer (get-buffer (cdr (car (cdr prev-ptr))))))
       (if buffer
-	  (display-buffer buffer)
+	  (pop-to-buffer-same-window buffer)
 	;; Delete alist element:
 	(setcdr prev-ptr (cdr (cdr prev-ptr)))
 	(if (>= woman-buffer-number (length woman-buffer-alist))

--
Ari Roponen