Make M-x woman respect display-buffer-alist

Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 2511 bytes --]

Hi,

I was trying to make the WoMan buffers open as I intend to using
display-buffer-alist. But that was not working.

So I dug into the woman.el source and made these edits:

(defun WoMan-find-buffer ()
  "Switch to buffer corresponding to `woman-buffer-number' and return it.
If such a buffer does not exist then remove its association from the
alist in `woman-buffer-alist' and return nil."
  (if (zerop woman-buffer-number)
      (let ((buffer (get-buffer (cdr (car woman-buffer-alist)))))
(if buffer
            ;; (switch-to-buffer buffer) ; Edit
            (display-buffer buffer) ; Edit
          ;; 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
          ;; (switch-to-buffer buffer) ; Edit
          (display-buffer buffer) ; Edit
        ;; Delete alist element:
        (setcdr prev-ptr (cdr (cdr prev-ptr)))
        (if (>= woman-buffer-number (length woman-buffer-alist))
            (setq woman-buffer-number 0))
        nil))))

(defun woman-really-find-file (filename compressed bufname)
  "Find, decompress, and decode a UN*X man page FILENAME.
If COMPRESSED is non-nil, turn on auto-compression mode to decompress
the file if necessary.  Set buffer name BUFNAME and major mode.
Do not call directly!"
  (let ((WoMan-current-file filename)) ; used for message logging
    (if woman-use-own-frame
(select-frame
 (or (and (frame-live-p woman-frame) woman-frame)
     (setq woman-frame (make-frame)))))
    (set-buffer (get-buffer-create bufname))
    (condition-case nil
        ;; (switch-to-buffer (current-buffer)) ; Edit
        (display-buffer (current-buffer)) ; Edit
      (error (pop-to-buffer (current-buffer))))
    (buffer-disable-undo)
    (setq buffer-read-only nil)
    (erase-buffer) ; NEEDED for reformat
    (woman-insert-file-contents filename compressed)
    ;; Set buffer's default directory to that of the file.
    (setq default-directory (file-name-directory filename))
    (set (make-local-variable 'backup-inhibited) t)
    (set-visited-file-name "")
    (woman-process-buffer)))

The edited lines have the "; Edit" comments.

I simply replaced `switch-to-buffer' with `display-buffer' at 3 places.

If doing so does not have any unexpected bad outcomes, can that change be
made in the master?

PS: Not sure if this should have been a bug report; so posted here.

[-- Attachment #2: Type: text/html, Size: 3746 bytes --]

Re: Make M-x woman respect display-buffer-alist

[Michael Heerdegen]

Hi Kaushal,

> I was trying to make the WoMan buffers open as I intend to using
> display-buffer-alist. But that was not working.

I guess your message got lost here, better make a bug report, and
better include a patch than the whole changed code.

> can that change be made in the master?

I think it would be an improvement.

The very same applies to eww:

--8<---------------cut here---------------start------------->8---
(defun eww-setup-buffer ()
  (switch-to-buffer (get-buffer-create "*eww*")) ; <-----
  (let ((inhibit-read-only t))
    (remove-overlays)
    (erase-buffer))
  (unless (eq major-mode 'eww-mode)
    (eww-mode)))
--8<---------------cut here---------------end--------------->8---

Maybe there are more cases.  It's surely worth discussing.


Regards,

Michael.

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 2670 bytes --]

Hi,

This was posted on the emacs-devel list a while back and it was suggested
that this be posted on bug-gnu-emacs.

The aim of this patch is that opening M-x woman buffers be controlled using
display-buffer-alist. Using display-buffer function instead of
switch-to-buffer function will allow the user to control how they want to
open the WoMan buffers (same window, other window, popup, etc)

The patch is below:

Date: Mon, 13 Jul 2015 11:00:39 -0400
Subject: [PATCH] Allow display-buffer-alist to control woman bufs

---
 lisp/woman.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/woman.el b/lisp/woman.el
index 75c3d2e..e903caa 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1651,7 +1651,7 @@ Do not call directly!"
      (setq woman-frame (make-frame)))))
     (set-buffer (get-buffer-create bufname))
     (condition-case nil
-        (switch-to-buffer (current-buffer))
+        (display-buffer (current-buffer))
       (error (pop-to-buffer (current-buffer))))
     (buffer-disable-undo)
     (setq buffer-read-only nil)
@@ -2061,14 +2061,14 @@ alist in `woman-buffer-alist' and return nil."
   (if (zerop woman-buffer-number)
       (let ((buffer (get-buffer (cdr (car woman-buffer-alist)))))
  (if buffer
-    (switch-to-buffer buffer)
+    (display-buffer 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
-  (switch-to-buffer buffer)
+  (display-buffer buffer)
  ;; Delete alist element:
  (setcdr prev-ptr (cdr (cdr prev-ptr)))
  (if (>= woman-buffer-number (length woman-buffer-alist))
-- 
1.9.2


On Wed, Jun 24, 2015 at 12:03 PM Michael Heerdegen <michael_heerdegen@web.de>
wrote:

> Hi Kaushal,
>
> > I was trying to make the WoMan buffers open as I intend to using
> > display-buffer-alist. But that was not working.
>
> I guess your message got lost here, better make a bug report, and
> better include a patch than the whole changed code.
>
> > can that change be made in the master?
>
> I think it would be an improvement.
>
> The very same applies to eww:
>
> --8<---------------cut here---------------start------------->8---
> (defun eww-setup-buffer ()
>   (switch-to-buffer (get-buffer-create "*eww*")) ; <-----
>   (let ((inhibit-read-only t))
>     (remove-overlays)
>     (erase-buffer))
>   (unless (eq major-mode 'eww-mode)
>     (eww-mode)))
> --8<---------------cut here---------------end--------------->8---
>
> Maybe there are more cases.  It's surely worth discussing.
>
>
> Regards,
>
> Michael.
>

[-- Attachment #2: Type: text/html, Size: 4446 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 2913 bytes --]

Can someone please review this?

On Mon, Jul 13, 2015 at 11:06 AM Kaushal <kaushal.modi@gmail.com> wrote:

> Hi,
>
> This was posted on the emacs-devel list a while back and it was suggested
> that this be posted on bug-gnu-emacs.
>
> The aim of this patch is that opening M-x woman buffers be controlled
> using display-buffer-alist. Using display-buffer function instead of
> switch-to-buffer function will allow the user to control how they want to
> open the WoMan buffers (same window, other window, popup, etc)
>
> The patch is below:
>
> Date: Mon, 13 Jul 2015 11:00:39 -0400
> Subject: [PATCH] Allow display-buffer-alist to control woman bufs
>
> ---
>  lisp/woman.el | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lisp/woman.el b/lisp/woman.el
> index 75c3d2e..e903caa 100644
> --- a/lisp/woman.el
> +++ b/lisp/woman.el
> @@ -1651,7 +1651,7 @@ Do not call directly!"
>       (setq woman-frame (make-frame)))))
>      (set-buffer (get-buffer-create bufname))
>      (condition-case nil
> -        (switch-to-buffer (current-buffer))
> +        (display-buffer (current-buffer))
>        (error (pop-to-buffer (current-buffer))))
>      (buffer-disable-undo)
>      (setq buffer-read-only nil)
> @@ -2061,14 +2061,14 @@ alist in `woman-buffer-alist' and return nil."
>    (if (zerop woman-buffer-number)
>        (let ((buffer (get-buffer (cdr (car woman-buffer-alist)))))
>   (if buffer
> -    (switch-to-buffer buffer)
> +    (display-buffer 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
> -  (switch-to-buffer buffer)
> +  (display-buffer buffer)
>   ;; Delete alist element:
>   (setcdr prev-ptr (cdr (cdr prev-ptr)))
>   (if (>= woman-buffer-number (length woman-buffer-alist))
> --
> 1.9.2
>
>
> On Wed, Jun 24, 2015 at 12:03 PM Michael Heerdegen <
> michael_heerdegen@web.de> wrote:
>
>> Hi Kaushal,
>>
>> > I was trying to make the WoMan buffers open as I intend to using
>> > display-buffer-alist. But that was not working.
>>
>> I guess your message got lost here, better make a bug report, and
>> better include a patch than the whole changed code.
>>
>> > can that change be made in the master?
>>
>> I think it would be an improvement.
>>
>> The very same applies to eww:
>>
>> --8<---------------cut here---------------start------------->8---
>> (defun eww-setup-buffer ()
>>   (switch-to-buffer (get-buffer-create "*eww*")) ; <-----
>>   (let ((inhibit-read-only t))
>>     (remove-overlays)
>>     (erase-buffer))
>>   (unless (eq major-mode 'eww-mode)
>>     (eww-mode)))
>> --8<---------------cut here---------------end--------------->8---
>>
>> Maybe there are more cases.  It's surely worth discussing.
>>
>>
>> Regards,
>>
>> Michael.
>>
>

[-- Attachment #2: Type: text/html, Size: 4577 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Stefan Monnier]

> Can someone please review this?

Looks OK to me,


        Stefan

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

Thanks!

I don't have the commit rights. Can you please apply this patch to the
master?

--
Kaushal Modi
On Aug 21, 2015 1:42 AM, "Stefan Monnier" <monnier@iro.umontreal.ca> wrote:

> > Can someone please review this?
>
> Looks OK to me,
>
>
>         Stefan
>

[-- Attachment #2: Type: text/html, Size: 585 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[martin rudalics]

 > I don't have the commit rights. Can you please apply this patch to the
 > master?

Pushed as 8c01e88..244a008  master -> master.

Thanks, martin

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

Thanks! There goes my first little patch. :)

--
Kaushal Modi
On Aug 21, 2015 8:25 AM, "martin rudalics" <rudalics@gmx.at> wrote:

> > I don't have the commit rights. Can you please apply this patch to the
> > master?
>
> Pushed as 8c01e88..244a008  master -> master.
>
> Thanks, martin
>

[-- Attachment #2: Type: text/html, Size: 583 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 881 bytes --]

I apologize for this maintenance type of request. I saw that my patch was
associated with just my first name "Kaushal" instead of my full name
"Kaushal Modi". I then noticed that that's perhaps because I have probably
unintentionally hidden my last name in the emacs-devel list.

While I figure out and fix this, is it possible to correct the author name
from "Kaushal" to "Kaushal Modi" to be consistent with the first and last
name author convention as seen on all other commits?

Thanks.

Kaushal Modi
On Aug 21, 2015 8:30 AM, "Kaushal" <kaushal.modi@gmail.com> wrote:

> Thanks! There goes my first little patch. :)
>
> --
> Kaushal Modi
> On Aug 21, 2015 8:25 AM, "martin rudalics" <rudalics@gmx.at> wrote:
>
>> > I don't have the commit rights. Can you please apply this patch to the
>> > master?
>>
>> Pushed as 8c01e88..244a008  master -> master.
>>
>> Thanks, martin
>>
>

[-- Attachment #2: Type: text/html, Size: 1517 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[martin rudalics]

 > I apologize for this maintenance type of request. I saw that my patch was
 > associated with just my first name "Kaushal" instead of my full name
 > "Kaushal Modi". I then noticed that that's perhaps because I have probably
 > unintentionally hidden my last name in the emacs-devel list.

My bad.  I really should have asked before committing.  But I was
distracted that your patch didn't apply.  Kindly send the next patch as
an attachment to your mail.

 > While I figure out and fix this, is it possible to correct the author name
 > from "Kaushal" to "Kaushal Modi" to be consistent with the first and last
 > name author convention as seen on all other commits?

I'll correct the ChangeLog entry as soon as it appears in ChangeLog.2.
As for the commit message there's hardly anything we can do now.

martin

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]

> Kindly send the next patch as an attachment to your mail.

Will do so, thanks.

> I'll correct the ChangeLog entry as soon as it appears in ChangeLog.2.

Thanks.

On Fri, Aug 21, 2015 at 11:11 AM martin rudalics <rudalics@gmx.at> wrote:

>  > I apologize for this maintenance type of request. I saw that my patch
> was
>  > associated with just my first name "Kaushal" instead of my full name
>  > "Kaushal Modi". I then noticed that that's perhaps because I have
> probably
>  > unintentionally hidden my last name in the emacs-devel list.
>
> My bad.  I really should have asked before committing.  But I was
> distracted that your patch didn't apply.  Kindly send the next patch as
> an attachment to your mail.
>
>  > While I figure out and fix this, is it possible to correct the author
> name
>  > from "Kaushal" to "Kaushal Modi" to be consistent with the first and
> last
>  > name author convention as seen on all other commits?
>
> I'll correct the ChangeLog entry as soon as it appears in ChangeLog.2.
> As for the commit message there's hardly anything we can do now.
>
> martin
>

[-- Attachment #2: Type: text/html, Size: 2281 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]

One more thing.. also this bug now needs to be closed, right? And also
referenced in that commit message.

On Fri, Aug 21, 2015 at 11:13 AM Kaushal <kaushal.modi@gmail.com> wrote:

> > Kindly send the next patch as an attachment to your mail.
>
> Will do so, thanks.
>
> > I'll correct the ChangeLog entry as soon as it appears in ChangeLog.2.
>
> Thanks.
>
> On Fri, Aug 21, 2015 at 11:11 AM martin rudalics <rudalics@gmx.at> wrote:
>
>>  > I apologize for this maintenance type of request. I saw that my patch
>> was
>>  > associated with just my first name "Kaushal" instead of my full name
>>  > "Kaushal Modi". I then noticed that that's perhaps because I have
>> probably
>>  > unintentionally hidden my last name in the emacs-devel list.
>>
>> My bad.  I really should have asked before committing.  But I was
>> distracted that your patch didn't apply.  Kindly send the next patch as
>> an attachment to your mail.
>>
>>  > While I figure out and fix this, is it possible to correct the author
>> name
>>  > from "Kaushal" to "Kaushal Modi" to be consistent with the first and
>> last
>>  > name author convention as seen on all other commits?
>>
>> I'll correct the ChangeLog entry as soon as it appears in ChangeLog.2.
>> As for the commit message there's hardly anything we can do now.
>>
>> martin
>>
>

[-- Attachment #2: Type: text/html, Size: 2783 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[martin rudalics]

> One more thing.. also this bug now needs to be closed, right?

Please do that.

> And also
> referenced in that commit message.

I'll do that.  Please remind me as soon as you see the commit in
ChangeLog.2.

martin

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

I don't know how to close a debbugs. I believe only a debbugs admin can do
that?

On Fri, Aug 21, 2015 at 11:30 AM martin rudalics <rudalics@gmx.at> wrote:

> > One more thing.. also this bug now needs to be closed, right?
>
> Please do that.
>
> > And also
> > referenced in that commit message.
>
> I'll do that.  Please remind me as soon as you see the commit in
> ChangeLog.2.
>
> martin
>
>

[-- Attachment #2: Type: text/html, Size: 694 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[martin rudalics]

> I don't know how to close a debbugs. I believe only a debbugs admin can do
> that?

It's easy.  You have to append -done to the bug number in the recipient.
As I'm doing just now ...

martin

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

Noted that for the next time. Thanks!

On Fri, Aug 21, 2015 at 11:58 AM martin rudalics <rudalics@gmx.at> wrote:

> > I don't know how to close a debbugs. I believe only a debbugs admin can
> do
> > that?
>
> It's easy.  You have to append -done to the bug number in the recipient.
> As I'm doing just now ...
>
> martin
>
>
>

[-- Attachment #2: Type: text/html, Size: 610 bytes --]

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[martin rudalics]

 >> I'll correct the ChangeLog entry as soon as it appears in ChangeLog.2.
 >
 > Thanks.

Should be done now.  Please have a look.

Thanks again, martin

bug#21047: 25.0.50; Make M-x woman respect display-buffer-alist

[Kaushal Modi]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

Looks good.

Thank you.

--
Kaushal Modi
On Aug 24, 2015 4:16 AM, "martin rudalics" <rudalics@gmx.at> wrote:

> >> I'll correct the ChangeLog entry as soon as it appears in ChangeLog.2.
> >
> > Thanks.
>
> Should be done now.  Please have a look.
>
> Thanks again, martin
>

[-- Attachment #2: Type: text/html, Size: 593 bytes --]