procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply --display kluge for PGTK too

Browse source 
* src/emacs.c (main): The --display option needs the same handling
with the PGTK backend as it does with the X11 backends.  (Bug#72118)
This commit is contained in:
Peter Oliver 2024-07-14 21:50:33 +01:00 • committed by Eli Zaretskii
parent 5c9de704cc
commit 8a072d1f05
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/emacs.c
View file

@ -194,7 +194,7 @@ bool inhibit_window_system;
data on the first attempt to change it inside asynchronous code. */
bool running_asynch_code;
#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS)
/* If true, -d was specified, meaning we're using some window system. */
bool display_arg;
#endif
@ -2085,7 +2085,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
{
int count_before = skip_args;
#ifdef HAVE_X_WINDOWS
#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK)
char *displayname = 0;
/* Skip any number of -d options, but only use the last one. */

2
src/lisp.h
View file

@ -5181,7 +5181,7 @@ extern void syms_of_frame (void);
extern char **initial_argv;
extern int initial_argc;
extern char const *emacs_wd;
#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS)
extern bool display_arg;
#endif
extern Lisp_Object decode_env_path (const char *, const char *, bool);