mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Avoid using --display in emacsclient to reuse frames on PGTK

Browse source 
Using hard-coded display values can cause PGTK graphical frames to
open using the wrong backend or not open at all.
* Makefile.in (install-etc): Use --reuse-frame instead of
--display=$DISPLAY.  (Bug#65509)
This commit is contained in:
Davide Masserut 2023-08-24 18:33:39 +02:00 • committed by Eli Zaretskii
parent 2fc7463c0e
commit 6fe11b88ed
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile.in
View file

@ -830,6 +830,9 @@ EMACS_ICON=emacs
ifeq (${USE_STARTUP_NOTIFICATION},no) ifeq (${USE_STARTUP_NOTIFICATION},no)
USE_STARTUP_NOTIFICATION_SED_CMD=-e "/^StartupNotify=true$$/d" USE_STARTUP_NOTIFICATION_SED_CMD=-e "/^StartupNotify=true$$/d"
endif endif
ifeq ($(HAVE_PGTK),yes)
USE_WAYLAND_DISPLAY_SED_CMD=-e "s/display=[^ ]*/reuse-frame/"
endif
install-etc: install-etc:
umask 022; ${MKDIR_P} "$(DESTDIR)${desktopdir}" umask 022; ${MKDIR_P} "$(DESTDIR)${desktopdir}"
tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \ tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
@ -844,6 +847,7 @@ install-etc:
sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \ sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \
-e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \ -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
$(USE_STARTUP_NOTIFICATION_SED_CMD) \ $(USE_STARTUP_NOTIFICATION_SED_CMD) \
$(USE_WAYLAND_DISPLAY_SED_CMD) \
${srcdir}/etc/emacsclient.desktop > $${tmp}; \ ${srcdir}/etc/emacsclient.desktop > $${tmp}; \
${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \
rm -f $${tmp} rm -f $${tmp}
@ -857,6 +861,7 @@ install-etc:
client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \ client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \
sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \ sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \
-e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \ -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
$(USE_WAYLAND_DISPLAY_SED_CMD) \
${srcdir}/etc/emacsclient-mail.desktop > $${tmp}; \ ${srcdir}/etc/emacsclient-mail.desktop > $${tmp}; \
${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}-mail.desktop"; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}-mail.desktop"; \
rm -f $${tmp} rm -f $${tmp}