diff options
| author | Peter Oliver | 2024-07-14 21:50:33 +0100 |
|---|---|---|
| committer | Eli Zaretskii | 2024-08-17 11:04:43 +0300 |
| commit | 8a072d1f05befb302a2107c44b935af7a69ad0d3 (patch) | |
| tree | 917acbb02b1ed9beb969106eb3fef1a53b84d167 /src | |
| parent | 5c9de704cc8cff861a37158229e0b393598798a4 (diff) | |
| download | emacs-8a072d1f05befb302a2107c44b935af7a69ad0d3.tar.gz emacs-8a072d1f05befb302a2107c44b935af7a69ad0d3.zip | |
Apply --display kluge for PGTK too
* src/emacs.c (main): The --display option needs the same handling
with the PGTK backend as it does with the X11 backends. (Bug#72118)
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 4 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c index 3017063bec4..82f8fa8d9f7 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -194,7 +194,7 @@ bool inhibit_window_system; | |||
| 194 | data on the first attempt to change it inside asynchronous code. */ | 194 | data on the first attempt to change it inside asynchronous code. */ |
| 195 | bool running_asynch_code; | 195 | bool running_asynch_code; |
| 196 | 196 | ||
| 197 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) | 197 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS) |
| 198 | /* If true, -d was specified, meaning we're using some window system. */ | 198 | /* If true, -d was specified, meaning we're using some window system. */ |
| 199 | bool display_arg; | 199 | bool display_arg; |
| 200 | #endif | 200 | #endif |
| @@ -2085,7 +2085,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 2085 | { | 2085 | { |
| 2086 | int count_before = skip_args; | 2086 | int count_before = skip_args; |
| 2087 | 2087 | ||
| 2088 | #ifdef HAVE_X_WINDOWS | 2088 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) |
| 2089 | char *displayname = 0; | 2089 | char *displayname = 0; |
| 2090 | 2090 | ||
| 2091 | /* Skip any number of -d options, but only use the last one. */ | 2091 | /* Skip any number of -d options, but only use the last one. */ |
diff --git a/src/lisp.h b/src/lisp.h index 59d8e497f13..5d04b57549d 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -5181,7 +5181,7 @@ extern void syms_of_frame (void); | |||
| 5181 | extern char **initial_argv; | 5181 | extern char **initial_argv; |
| 5182 | extern int initial_argc; | 5182 | extern int initial_argc; |
| 5183 | extern char const *emacs_wd; | 5183 | extern char const *emacs_wd; |
| 5184 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) | 5184 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS) |
| 5185 | extern bool display_arg; | 5185 | extern bool display_arg; |
| 5186 | #endif | 5186 | #endif |
| 5187 | extern Lisp_Object decode_env_path (const char *, const char *, bool); | 5187 | extern Lisp_Object decode_env_path (const char *, const char *, bool); |