all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* pdf-view removed from mailcap.el
@ 2017-09-17 10:37 N. Raghavendra
  2017-09-17 12:30 ` Mark Oteiza
  0 siblings, 1 reply; 14+ messages in thread
From: N. Raghavendra @ 2017-09-17 10:37 UTC (permalink / raw)
  To: emacs-devel

It looks like commit c3445aed5194 removed the element

("pdf"
  (viewer . pdf-view-mode)
  (type . "application/pdf")
  (test . (eq window-system 'x)))

from `mailcap-mime-data', with the commit message

* lisp/net/mailcap.el ... (mailcap-mime-data): Remove some entries for
ancient functions.

Support for pdf-view was added fairly recently, in commit 931e7babcb81
on 2015-02-23, and pdf-tools is an active project, so removing it along
with other old functions was perhaps an oversight.  I certainly use it,
and I've seen queries on the Web about using pdf-view in Gnus, so there
are others who seem to be using it too.  So I suggest adding it back to
`mailcap-mime-data'.  Meanwhile, I've added it to
`mailcap-user-mime-data' in my init file as a temporary fix.

Cheers,
Raghu.

--
N. Raghavendra <raghu@hri.res.in>, http://www.retrotexts.net/
Harish-Chandra Research Institute, http://www.hri.res.in/



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 10:37 pdf-view removed from mailcap.el N. Raghavendra
@ 2017-09-17 12:30 ` Mark Oteiza
  2017-09-17 13:38   ` N. Raghavendra
  0 siblings, 1 reply; 14+ messages in thread
From: Mark Oteiza @ 2017-09-17 12:30 UTC (permalink / raw)
  To: emacs-devel

"N. Raghavendra" <nyraghu27132@gmail.com> writes:

> It looks like commit c3445aed5194 removed the element
>
> ("pdf"
>   (viewer . pdf-view-mode)
>   (type . "application/pdf")
>   (test . (eq window-system 'x)))

My fault--restored in 34a6774daa.  Thanks for reporting.



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 12:30 ` Mark Oteiza
@ 2017-09-17 13:38   ` N. Raghavendra
  2017-09-17 13:49     ` Óscar Fuentes
  2017-09-17 13:52     ` Kaushal Modi
  0 siblings, 2 replies; 14+ messages in thread
From: N. Raghavendra @ 2017-09-17 13:38 UTC (permalink / raw)
  To: emacs-devel

At 2017-09-17T08:30:30-04:00, Mark Oteiza wrote:

> "N. Raghavendra" <nyraghu27132@gmail.com> writes:
>
>> It looks like commit c3445aed5194 removed the element
>>
>> ("pdf"
>>   (viewer . pdf-view-mode)
>>   (type . "application/pdf")
>>   (test . (eq window-system 'x)))
>
> My fault--restored in 34a6774daa.  Thanks for reporting.

Thanks for the quick action.  The restoration is only in the emacs-26
branch.  Will the new change be incorporated into the master branch
later?  I ask this because I usually build Emacs from the master branch.

Raghu.

--
N. Raghavendra <raghu@hri.res.in>, http://www.retrotexts.net/
Harish-Chandra Research Institute, http://www.hri.res.in/



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 13:38   ` N. Raghavendra
@ 2017-09-17 13:49     ` Óscar Fuentes
  2017-09-17 14:13       ` N. Raghavendra
  2017-09-17 13:52     ` Kaushal Modi
  1 sibling, 1 reply; 14+ messages in thread
From: Óscar Fuentes @ 2017-09-17 13:49 UTC (permalink / raw)
  To: emacs-devel; +Cc: N. Raghavendra

"N. Raghavendra" <nyraghu27132@gmail.com> writes:

> Thanks for the quick action.  The restoration is only in the emacs-26
> branch.  Will the new change be incorporated into the master branch
> later?  I ask this because I usually build Emacs from the master branch.

Yes. Changes made in the release branch are merged into the master
branch from time to time.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 13:38   ` N. Raghavendra
  2017-09-17 13:49     ` Óscar Fuentes
@ 2017-09-17 13:52     ` Kaushal Modi
  2017-09-17 14:37       ` Eli Zaretskii
  1 sibling, 1 reply; 14+ messages in thread
From: Kaushal Modi @ 2017-09-17 13:52 UTC (permalink / raw)
  To: N. Raghavendra, Emacs developers, Eli Zaretskii, John Wiegley

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

On Sun, Sep 17, 2017, 9:38 AM N. Raghavendra <nyraghu27132@gmail.com> wrote:

>
> Thanks for the quick action.  The restoration is only in the emacs-26
> branch.  Will the new change be incorporated into the master branch
> later?  I ask this because I usually build Emacs from the master branch.
>

I often wonder that. Shouldn't each commit made to the stable branches be
merged to master at the same time?

I like that kind of flow in the Org repo. Notice how each time commits made
to maint (Org stable) branch are followed by merge commits to master: http
://orgmode.org/cgit.cgi/org-mode.git/log/

-- 

Kaushal Modi

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

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 13:49     ` Óscar Fuentes
@ 2017-09-17 14:13       ` N. Raghavendra
  2017-09-17 14:39         ` Eli Zaretskii
  0 siblings, 1 reply; 14+ messages in thread
From: N. Raghavendra @ 2017-09-17 14:13 UTC (permalink / raw)
  To: emacs-devel

At 2017-09-17T15:49:30+02:00, Óscar Fuentes wrote:

> Yes. Changes made in the release branch are merged into the master
> branch from time to time.

Thanks for the information.  Just curious, how often are these merges
done?

Raghu.

-- 
N. Raghavendra <raghu@hri.res.in>, http://www.retrotexts.net/
Harish-Chandra Research Institute, http://www.hri.res.in/



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 13:52     ` Kaushal Modi
@ 2017-09-17 14:37       ` Eli Zaretskii
  2017-09-17 14:59         ` Kaushal Modi
  0 siblings, 1 reply; 14+ messages in thread
From: Eli Zaretskii @ 2017-09-17 14:37 UTC (permalink / raw)
  To: Kaushal Modi; +Cc: nyraghu27132, johnw, emacs-devel

> From: Kaushal Modi <kaushal.modi@gmail.com>
> Date: Sun, 17 Sep 2017 13:52:47 +0000
> 
> Shouldn't each commit made to the stable branches be merged to master at the same
> time?

It would be nice, but it is not required.  Merging from the release
branch to master usually requires some manual work, and is sometimes
not for the faint at heart.

> I like that kind of flow in the Org repo. Notice how each time commits made to maint (Org stable) branch are
> followed by merge commits to master: http://orgmode.org/cgit.cgi/org-mode.git/log/

An example to follow, I'm sure.  Maybe we could have someone volunteer
to be our "merge champion"?



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 14:13       ` N. Raghavendra
@ 2017-09-17 14:39         ` Eli Zaretskii
  2017-09-17 14:41           ` N. Raghavendra
  0 siblings, 1 reply; 14+ messages in thread
From: Eli Zaretskii @ 2017-09-17 14:39 UTC (permalink / raw)
  To: N. Raghavendra; +Cc: emacs-devel

> From: "N. Raghavendra" <nyraghu27132@gmail.com>
> Date: Sun, 17 Sep 2017 19:43:16 +0530
> 
> Just curious, how often are these merges done?

"From time to time" is the best answer we can give, sorry.



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 14:39         ` Eli Zaretskii
@ 2017-09-17 14:41           ` N. Raghavendra
  2017-09-17 16:55             ` Eli Zaretskii
  0 siblings, 1 reply; 14+ messages in thread
From: N. Raghavendra @ 2017-09-17 14:41 UTC (permalink / raw)
  To: emacs-devel

At 2017-09-17T17:39:29+03:00, Eli Zaretskii wrote:

>> Just curious, how often are these merges done?
>
> "From time to time" is the best answer we can give, sorry.

Sure, thanks.

Cheers,
Raghu.

-- 
N. Raghavendra <raghu@hri.res.in>, http://www.retrotexts.net/
Harish-Chandra Research Institute, http://www.hri.res.in/



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 14:37       ` Eli Zaretskii
@ 2017-09-17 14:59         ` Kaushal Modi
  2017-09-17 15:37           ` Eli Zaretskii
  0 siblings, 1 reply; 14+ messages in thread
From: Kaushal Modi @ 2017-09-17 14:59 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: nyraghu27132, johnw, emacs-devel

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

On Sun, Sep 17, 2017, 10:37 AM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Kaushal Modi <kaushal.modi@gmail.com>
> > Date: Sun, 17 Sep 2017 13:52:47 +0000
> >
> > Shouldn't each commit made to the stable branches be merged to master at
> the same
> > time?
>
> It would be nice, but it is not required.


It would be great if it is encouraged then.

 Merging

from the release
> branch to master usually requires some manual work, and is sometimes
> not for the faint at heart.
>

If each committer makes sure to merge their commit, others don't have to
review if they are merging others' commits correctly. I can talk of my
experience in Org repo.. after my commits to the maint branch, all I need
to do is check out master and do a merge.. as simple as this in Magit: "b
b" (checkout master) "m m" (merge maint).

> I like that kind of flow in the Org repo. Notice how each time commits
> made to maint (Org stable) branch are
> > followed by merge commits to master:
> http://orgmode.org/cgit.cgi/org-mode.git/log/
>
> An example to follow, I'm sure.  Maybe we could have someone volunteer
> to be our "merge champion"?
>

One doesn't need to be a "champion" as they are just making sure that their
commit is landing in master too.

Would you consider documenting and at least recommending this flow?

Thanks.

> --

Kaushal Modi

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

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 14:59         ` Kaushal Modi
@ 2017-09-17 15:37           ` Eli Zaretskii
  0 siblings, 0 replies; 14+ messages in thread
From: Eli Zaretskii @ 2017-09-17 15:37 UTC (permalink / raw)
  To: Kaushal Modi; +Cc: nyraghu27132, johnw, emacs-devel

> From: Kaushal Modi <kaushal.modi@gmail.com>
> Date: Sun, 17 Sep 2017 14:59:16 +0000
> Cc: emacs-devel@gnu.org, johnw@gnu.org, nyraghu27132@gmail.com
> 
> It would be great if it is encouraged then. 

I think it already is, as we surely don't discourage that.

> If each committer makes sure to merge their commit, others don't have to review if they are merging others'
> commits correctly. I can talk of my experience in Org repo.. after my commits to the maint branch, all I need to
> do is check out master and do a merge.. as simple as this in Magit: "b b" (checkout master) "m m" (merge
> maint). 

It's not that easy in Emacs, see gitmerge.el and the references to it
in CONTRIBUTE.

> One doesn't need to be a "champion" as they are just making sure that their commit is landing in master too.

It's more complicated than that, unfortunately.  Even experienced
people made mistakes with that, so I guess it's not as easy as in
other projects.  Specific suggestions for how to make the process
better will be welcome, I'm sure, but please study the existing
documentation and code first.

> Would you consider documenting and at least recommending this flow?

What we thought needed to be documented is in CONTRIBUTE already.



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 14:41           ` N. Raghavendra
@ 2017-09-17 16:55             ` Eli Zaretskii
  2017-09-17 18:27               ` N. Raghavendra
  0 siblings, 1 reply; 14+ messages in thread
From: Eli Zaretskii @ 2017-09-17 16:55 UTC (permalink / raw)
  To: N. Raghavendra; +Cc: emacs-devel

> From: "N. Raghavendra" <nyraghu27132@gmail.com>
> Date: Sun, 17 Sep 2017 20:11:55 +0530
> 
> At 2017-09-17T17:39:29+03:00, Eli Zaretskii wrote:
> 
> >> Just curious, how often are these merges done?
> >
> > "From time to time" is the best answer we can give, sorry.
> 
> Sure, thanks.

Btw, during the time a new release is being prepared from a release
branch, people who track Emacs development are encouraged to track the
release branch, not master.  This gives the new release more testing
and reveals any problems sooner, thus helping us release Emacs 26.1
sooner rather than later.

TIA



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 16:55             ` Eli Zaretskii
@ 2017-09-17 18:27               ` N. Raghavendra
  2017-09-17 19:00                 ` Eli Zaretskii
  0 siblings, 1 reply; 14+ messages in thread
From: N. Raghavendra @ 2017-09-17 18:27 UTC (permalink / raw)
  To: emacs-devel

At 2017-09-17T19:55:11+03:00, Eli Zaretskii wrote:

> Btw, during the time a new release is being prepared from a release
> branch, people who track Emacs development are encouraged to track the
> release branch, not master.  This gives the new release more testing
> and reveals any problems sooner, thus helping us release Emacs 26.1
> sooner rather than later.
>
> TIA

I don't think I use any special features of the master branch, and am
shifting to the emacs-26 branch.

Cheers,
Raghu.

--
N. Raghavendra <raghu@hri.res.in>, http://www.retrotexts.net/
Harish-Chandra Research Institute, http://www.hri.res.in/



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: pdf-view removed from mailcap.el
  2017-09-17 18:27               ` N. Raghavendra
@ 2017-09-17 19:00                 ` Eli Zaretskii
  0 siblings, 0 replies; 14+ messages in thread
From: Eli Zaretskii @ 2017-09-17 19:00 UTC (permalink / raw)
  To: N. Raghavendra; +Cc: emacs-devel

> From: "N. Raghavendra" <nyraghu27132@gmail.com>
> Date: Sun, 17 Sep 2017 23:57:03 +0530
> 
> I don't think I use any special features of the master branch, and am
> shifting to the emacs-26 branch.

Thank you.  (For now, the two branches are very similar anyway.)



^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2017-09-17 19:00 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-17 10:37 pdf-view removed from mailcap.el N. Raghavendra
2017-09-17 12:30 ` Mark Oteiza
2017-09-17 13:38   ` N. Raghavendra
2017-09-17 13:49     ` Óscar Fuentes
2017-09-17 14:13       ` N. Raghavendra
2017-09-17 14:39         ` Eli Zaretskii
2017-09-17 14:41           ` N. Raghavendra
2017-09-17 16:55             ` Eli Zaretskii
2017-09-17 18:27               ` N. Raghavendra
2017-09-17 19:00                 ` Eli Zaretskii
2017-09-17 13:52     ` Kaushal Modi
2017-09-17 14:37       ` Eli Zaretskii
2017-09-17 14:59         ` Kaushal Modi
2017-09-17 15:37           ` Eli Zaretskii

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.