emacs-25-merge has been merged to master

emacs-25-merge has been merged to master

[John Wiegley]

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

Please let me know if you notice problems. Merges will now take place every
weekend.

The ChangeLog still needs updating. I will fix that before the next merge.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 629 bytes --]

Re: emacs-25-merge has been merged to master

[Angelo Graziosi]

John Wiegley wrote:
> Please let me know if you notice problems.

For completeness, I notice the following issue (at least on OSX, NS build)

Usually I do a NS build on OSX adding to 'configure' the option:

   --with-file-notification=gfile


and it worked fine.

Now, 'configure' fails with this message:

   configure: error: File notification 'gfile' requested but 
requirements not found

The first 'master' commit which gives this is:

   Merge emacs-25 into master (using imerge)
   9f2f14a0725211b13a744573344636b57b9c98b9


instead the previous commit:

   Fix typos in CC Mode manual
   e823c34072bf045800d91e12c7ddb61fa23c6e30

works as expected.


   Angelo

Re: emacs-25-merge has been merged to master

[Michael Albinus]

Angelo Graziosi <angelo.graziosi@alice.it> writes:

Hi,

> Usually I do a NS build on OSX adding to 'configure' the option:
>
>   --with-file-notification=gfile
>
> and it worked fine.

No, it didn't work. See Bug#20280. Therefore, gfile-based file
notification has been disabled for OS X.

> Now, 'configure' fails with this message:
>
>   configure: error: File notification 'gfile' requested but
> requirements not found

Meanwhile, kqueue file notification has been added to the master
branch. You could call configure with --with-file-notification=kqueue. 
However, this is the default, so you don't need to say anything about
file notification on OSX.

>   Angelo

Best regards, Michael.

Re: emacs-25-merge has been merged to master

[Angelo Graziosi]

Thanks for clarification!

  Angelo

Il 03/01/2016 11:42, Michael Albinus ha scritto:
> Angelo Graziosi <angelo.graziosi@alice.it> writes:
>
> Hi,
>
>> Usually I do a NS build on OSX adding to 'configure' the option:
>>
>>    --with-file-notification=gfile
>>
>> and it worked fine.
>
> No, it didn't work. See Bug#20280. Therefore, gfile-based file
> notification has been disabled for OS X.
>
>> Now, 'configure' fails with this message:
>>
>>    configure: error: File notification 'gfile' requested but
>> requirements not found
>
> Meanwhile, kqueue file notification has been added to the master
> branch. You could call configure with --with-file-notification=kqueue.
> However, this is the default, so you don't need to say anything about
> file notification on OSX.
>
>>    Angelo
>
> Best regards, Michael.
>

Re: emacs-25-merge has been merged to master

[Eli Zaretskii]

> From: Angelo Graziosi <angelo.graziosi@alice.it>
> Date: Sun, 3 Jan 2016 11:13:13 +0100
> 
> John Wiegley wrote:
> > Please let me know if you notice problems.
> 
> For completeness, I notice the following issue (at least on OSX, NS build)
> 
> Usually I do a NS build on OSX adding to 'configure' the option:
> 
>    --with-file-notification=gfile
> 
> 
> and it worked fine.
> 
> Now, 'configure' fails with this message:
> 
>    configure: error: File notification 'gfile' requested but 
> requirements not found

Please report this as a bug, and pleas include your config.log file
with the report.

Thanks.

Re: emacs-25-merge has been merged to master

[Eli Zaretskii]

> From: Michael Albinus <michael.albinus@gmx.de>
> Date: Sun, 03 Jan 2016 11:42:17 +0100
> Cc: Emacs developers <emacs-devel@gnu.org>
> 
> > Usually I do a NS build on OSX adding to 'configure' the option:
> >
> >   --with-file-notification=gfile
> >
> > and it worked fine.
> 
> No, it didn't work. See Bug#20280. Therefore, gfile-based file
> notification has been disabled for OS X.

OK, so Angelo, please don't bother reporting this or sending
config.log.  Sorry for any confusion I could have caused.

Michael, can we make the error message more self-explanatory?

Thanks.

Re: emacs-25-merge has been merged to master

[Michael Albinus]

Eli Zaretskii <eliz@gnu.org> writes:

>> No, it didn't work. See Bug#20280. Therefore, gfile-based file
>> notification has been disabled for OS X.
>
> OK, so Angelo, please don't bother reporting this or sending
> config.log.  Sorry for any confusion I could have caused.
>
> Michael, can we make the error message more self-explanatory?

I've added a specific error mesage to configure.ac.

> Thanks.

Best regards, Michael.