* Issue in src/xfns.c
@ 2016-06-14 18:02 Christian Lynbech
2016-06-15 4:16 ` Ken Raeburn
0 siblings, 1 reply; 4+ messages in thread
From: Christian Lynbech @ 2016-06-14 18:02 UTC (permalink / raw)
To: emacs-devel
I am not entirely sure what the intention was, but I think there is a
small issue in xfns.c in relation to the RANDR13_LIBRARY macro.
It is used in two places, one where it uses #if and another that uses
#ifdef, the latter of which I think should have been a #if. At least it
failed to compile for me on a rather old linux system with a setup I
know onbly a little about. The define that introduces RANDR13_LIBRARY is
a boolean expression so RANDR13_LIBRARY is always defined.
As far as I can see this is still present in the git repository on the
master branch. An attempt of a patch is given below.
Index: xfns.c
===================================================================
--- xfns.c (revision 7708)
+++ xfns.c (working copy)
@@ -4286,7 +4286,7 @@
n_monitors = resources->noutput;
monitors = xzalloc (n_monitors * sizeof *monitors);
-#ifdef RANDR13_LIBRARY
+#if RANDR13_LIBRARY
if (randr13_avail)
pxid = XRRGetOutputPrimary (dpy, dpyinfo->root_window);
#endif
------------------------+-----------------------------------------------------
Christian Lynbech | christian #\@ defun #\. dk
------------------------+-----------------------------------------------------
Hit the philistines three times over the head with the Elisp reference manual.
- petonic@hal.com (Michael A. Petonic)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Issue in src/xfns.c
2016-06-14 18:02 Issue in src/xfns.c Christian Lynbech
@ 2016-06-15 4:16 ` Ken Raeburn
2016-06-15 4:56 ` John Wiegley
0 siblings, 1 reply; 4+ messages in thread
From: Ken Raeburn @ 2016-06-15 4:16 UTC (permalink / raw)
To: Christian Lynbech, John Wiegley; +Cc: Emacs development discussions
> On Jun 14, 2016, at 14:02, Christian Lynbech <christian@defun.dk> wrote:
>
>
> I am not entirely sure what the intention was, but I think there is a
> small issue in xfns.c in relation to the RANDR13_LIBRARY macro.
>
> It is used in two places, one where it uses #if and another that uses
> #ifdef, the latter of which I think should have been a #if. At least it
> failed to compile for me on a rather old linux system with a setup I
> know onbly a little about. The define that introduces RANDR13_LIBRARY is
> a boolean expression so RANDR13_LIBRARY is always defined.
>
> As far as I can see this is still present in the git repository on the
> master branch. An attempt of a patch is given below.
Yes, this is a silly bug in my patch from March, present in both master and emacs-25. Unfortunately the user’s environment that I made the patch for had older xrandr support in the server but newer libraries (on different machines, if I recall correctly), so it slipped through testing. :-(
Christian’s patch is straightforward and looks correct to me. It should take a system with an older (pre-1.3) xrandr library to cause compilation to fail, and I don’t have such a system to test on.
John, you’re steering the ship again now, right? (I hope you had a great vacation!) Most modern X installations shouldn’t be affected by this, but as Christian shows, there’ll probably be a few outdated ones that’ll be affected. Okay to commit this fix for emacs-25?
Ken
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Issue in src/xfns.c
2016-06-15 4:16 ` Ken Raeburn
@ 2016-06-15 4:56 ` John Wiegley
2016-06-15 5:41 ` Paul Eggert
0 siblings, 1 reply; 4+ messages in thread
From: John Wiegley @ 2016-06-15 4:56 UTC (permalink / raw)
To: Ken Raeburn; +Cc: Christian Lynbech, Emacs development discussions
[-- Attachment #1: Type: text/plain, Size: 666 bytes --]
>>>>> Ken Raeburn <raeburn@raeburn.org> writes:
> John, you’re steering the ship again now, right? (I hope you had a great
> vacation!) Most modern X installations shouldn’t be affected by this, but as
> Christian shows, there’ll probably be a few outdated ones that’ll be
> affected. Okay to commit this fix for emacs-25?
If most modern X installations aren't affected, then it can wait until 25.2.
We are in the final stretch for 25.1, so unless it's worth blocking the
release, it waits.
--
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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Issue in src/xfns.c
2016-06-15 4:56 ` John Wiegley
@ 2016-06-15 5:41 ` Paul Eggert
0 siblings, 0 replies; 4+ messages in thread
From: Paul Eggert @ 2016-06-15 5:41 UTC (permalink / raw)
To: Ken Raeburn, Christian Lynbech, Emacs development discussions
John Wiegley wrote:
> If most modern X installations aren't affected, then it can wait until 25.2.
OK, I installed it in master.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-15 5:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-14 18:02 Issue in src/xfns.c Christian Lynbech
2016-06-15 4:16 ` Ken Raeburn
2016-06-15 4:56 ` John Wiegley
2016-06-15 5:41 ` Paul Eggert
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).