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

Merge remote-tracking branch 'origin/master' into feature/pgtk

Browse source
This commit is contained in:
Po Lu 2021-11-30 08:16:50 +08:00
commit 8f5d2a3181
350 changed files with 24824 additions and 3718 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib-src/emacsclient.c
View file

@ -603,6 +603,8 @@ decode_options (int argc, char **argv)
alt_display = "ns";
#elif defined (HAVE_NTGUI)
alt_display = "w32";
#elif defined (HAVE_HAIKU)
alt_display = "be";
#endif
#ifdef HAVE_PGTK