patch 9.1.1547: Wayland: missing ifdef

Problem:  Wayland: missing ifdef
Solution: Add #ifdef around ch_log() call
          (Foxe Chen)

closes: #17763

Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/po/vim.pot b/src/po/vim.pot
index 76d86f50a09aef6cbfe68b705af094999324beb8..b4144521933fa435298afc7e411f7563f28263e4 100644 (file)
--- a/src/po/vim.pot
+++ b/src/po/vim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-15 20:41+0200\n"
+"POT-Creation-Date: 2025-07-15 21:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4257,327 +4257,327 @@ msgstr ""
 msgid "%s (%s, compiled %s)"
 msgstr ""
 
-#: ../version.c:4026
+#: ../version.c:4028
 msgid ""
 "\n"
 "MS-Windows ARM64 GUI/console version"
 msgstr ""
 
-#: ../version.c:4028
+#: ../version.c:4030
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI/console version"
 msgstr ""
 
-#: ../version.c:4031
+#: ../version.c:4033
 msgid ""
 "\n"
 "MS-Windows 32-bit GUI/console version"
 msgstr ""
 
-#: ../version.c:4036
+#: ../version.c:4038
 msgid ""
 "\n"
 "MS-Windows ARM64 GUI version"
 msgstr ""
 
-#: ../version.c:4038
+#: ../version.c:4040
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 
-#: ../version.c:4041
+#: ../version.c:4043
 msgid ""
 "\n"
 "MS-Windows 32-bit GUI version"
 msgstr ""
 
-#: ../version.c:4045
+#: ../version.c:4047
 msgid " with OLE support"
 msgstr ""
 
-#: ../version.c:4050
+#: ../version.c:4052
 msgid ""
 "\n"
 "MS-Windows ARM64 console version"
 msgstr ""
 
-#: ../version.c:4052
+#: ../version.c:4054
 msgid ""
 "\n"
 "MS-Windows 64-bit console version"
 msgstr ""
 
-#: ../version.c:4055
+#: ../version.c:4057
 msgid ""
 "\n"
 "MS-Windows 32-bit console version"
 msgstr ""
 
-#: ../version.c:4061
+#: ../version.c:4063
 msgid ""
 "\n"
 "macOS version"
 msgstr ""
 
-#: ../version.c:4063
+#: ../version.c:4065
 msgid ""
 "\n"
 "macOS version w/o darwin feat."
 msgstr ""
 
-#: ../version.c:4073
+#: ../version.c:4075
 msgid ""
 "\n"
 "OpenVMS version"
 msgstr ""
 
-#: ../version.c:4088
+#: ../version.c:4090
 msgid ""
 "\n"
 "Included patches: "
 msgstr ""
 
-#: ../version.c:4113
+#: ../version.c:4115
 msgid ""
 "\n"
 "Extra patches: "
 msgstr ""
 
-#: ../version.c:4125 ../version.c:4436
+#: ../version.c:4127 ../version.c:4438
 msgid "Modified by "
 msgstr ""
 
-#: ../version.c:4132
+#: ../version.c:4134
 msgid ""
 "\n"
 "Compiled "
 msgstr ""
 
-#: ../version.c:4135
+#: ../version.c:4137
 msgid "by "
 msgstr ""
 
-#: ../version.c:4147
+#: ../version.c:4149
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 
-#: ../version.c:4149
+#: ../version.c:4151
 msgid ""
 "\n"
 "Normal version "
 msgstr ""
 
-#: ../version.c:4151
+#: ../version.c:4153
 msgid ""
 "\n"
 "Tiny version "
 msgstr ""
 
-#: ../version.c:4154
+#: ../version.c:4156
 msgid "without GUI."
 msgstr ""
 
-#: ../version.c:4157
+#: ../version.c:4159
 msgid "with GTK3 GUI."
 msgstr ""
 
-#: ../version.c:4159
+#: ../version.c:4161
 msgid "with GTK2-GNOME GUI."
 msgstr ""
 
-#: ../version.c:4161
+#: ../version.c:4163
 msgid "with GTK2 GUI."
 msgstr ""
 
-#: ../version.c:4164
+#: ../version.c:4166
 msgid "with X11-Motif GUI."
 msgstr ""
 
-#: ../version.c:4166
+#: ../version.c:4168
 msgid "with Haiku GUI."
 msgstr ""
 
-#: ../version.c:4168
+#: ../version.c:4170
 msgid "with Photon GUI."
 msgstr ""
 
-#: ../version.c:4170
+#: ../version.c:4172
 msgid "with GUI."
 msgstr ""
 
-#: ../version.c:4172
+#: ../version.c:4174
 msgid "  Features included (+) or not (-):\n"
 msgstr ""
 
-#: ../version.c:4179
+#: ../version.c:4181
 msgid "   system vimrc file: \""
 msgstr ""
 
-#: ../version.c:4184
+#: ../version.c:4186
 msgid "     user vimrc file: \""
 msgstr ""
 
-#: ../version.c:4189
+#: ../version.c:4191
 msgid " 2nd user vimrc file: \""
 msgstr ""
 
-#: ../version.c:4194 ../version.c:4201 ../version.c:4205
+#: ../version.c:4196 ../version.c:4203 ../version.c:4207
 msgid " 3rd user vimrc file: \""
 msgstr ""
 
-#: ../version.c:4197
+#: ../version.c:4199
 msgid " 4th user vimrc file: \""
 msgstr ""
 
-#: ../version.c:4210
+#: ../version.c:4212
 msgid "      user exrc file: \""
 msgstr ""
 
-#: ../version.c:4215
+#: ../version.c:4217
 msgid "  2nd user exrc file: \""
 msgstr ""
 
-#: ../version.c:4221
+#: ../version.c:4223
 msgid "  system gvimrc file: \""
 msgstr ""
 
-#: ../version.c:4225
+#: ../version.c:4227
 msgid "    user gvimrc file: \""
 msgstr ""
 
-#: ../version.c:4229
+#: ../version.c:4231
 msgid "2nd user gvimrc file: \""
 msgstr ""
 
-#: ../version.c:4234
+#: ../version.c:4236
 msgid "3rd user gvimrc file: \""
 msgstr ""
 
-#: ../version.c:4239
+#: ../version.c:4241
 msgid "       defaults file: \""
 msgstr ""
 
-#: ../version.c:4244
+#: ../version.c:4246
 msgid "    system menu file: \""
 msgstr ""
 
-#: ../version.c:4252
+#: ../version.c:4254
 msgid "  fall-back for $VIM: \""
 msgstr ""
 
-#: ../version.c:4258
+#: ../version.c:4260
 msgid " f-b for $VIMRUNTIME: \""
 msgstr ""
 
-#: ../version.c:4262
+#: ../version.c:4264
 msgid "Compilation: "
 msgstr ""
 
-#: ../version.c:4268
+#: ../version.c:4270
 msgid "Compiler: "
 msgstr ""
 
-#: ../version.c:4273
+#: ../version.c:4275
 msgid "Linking: "
 msgstr ""
 
-#: ../version.c:4278
+#: ../version.c:4280
 msgid "  DEBUG BUILD"
 msgstr ""
 
-#: ../version.c:4314
+#: ../version.c:4316
 msgid "VIM - Vi IMproved"
 msgstr ""
 
-#: ../version.c:4316
+#: ../version.c:4318
 msgid "version "
 msgstr ""
 
-#: ../version.c:4317
+#: ../version.c:4319
 msgid "by Bram Moolenaar et al."
 msgstr ""
 
-#: ../version.c:4321
+#: ../version.c:4323
 msgid "Vim is open source and freely distributable"
 msgstr ""
 
-#: ../version.c:4323
+#: ../version.c:4325
 msgid "Help poor children in Uganda!"
 msgstr ""
 
-#: ../version.c:4324
+#: ../version.c:4326
 msgid "type  :help iccf<Enter>       for information "
 msgstr ""
 
-#: ../version.c:4326
+#: ../version.c:4328
 msgid "type  :q<Enter>               to exit         "
 msgstr ""
 
-#: ../version.c:4327
+#: ../version.c:4329
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr ""
 
-#: ../version.c:4328
+#: ../version.c:4330
 msgid "type  :help version9<Enter>   for version info"
 msgstr ""
 
-#: ../version.c:4331
+#: ../version.c:4333
 msgid "Running in Vi compatible mode"
 msgstr ""
 
-#: ../version.c:4332
+#: ../version.c:4334
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr ""
 
-#: ../version.c:4333
+#: ../version.c:4335
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr ""
 
-#: ../version.c:4348
+#: ../version.c:4350
 msgid "menu  Help->Orphans           for information    "
 msgstr ""
 
-#: ../version.c:4350
+#: ../version.c:4352
 msgid "Running modeless, typed text is inserted"
 msgstr ""
 
-#: ../version.c:4351
+#: ../version.c:4353
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr ""
 
-#: ../version.c:4352
+#: ../version.c:4354
 msgid "                              for two modes      "
 msgstr ""
 
-#: ../version.c:4356
+#: ../version.c:4358
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr ""
 
-#: ../version.c:4357
+#: ../version.c:4359
 msgid "                              for Vim defaults   "
 msgstr ""
 
-#: ../version.c:4398
+#: ../version.c:4400
 msgid "Sponsor Vim development!"
 msgstr ""
 
-#: ../version.c:4399
+#: ../version.c:4401
 msgid "Become a registered Vim user!"
 msgstr ""
 
-#: ../version.c:4402
+#: ../version.c:4404
 msgid "type  :help sponsor<Enter>    for information "
 msgstr ""
 
-#: ../version.c:4403
+#: ../version.c:4405
 msgid "type  :help register<Enter>   for information "
 msgstr ""
 
-#: ../version.c:4405
+#: ../version.c:4407
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr ""
 
@@ -4741,12 +4741,12 @@ msgstr ""
 msgid "wayland protocol error -> "
 msgstr ""
 
-#: ../wayland.c:2461
+#: ../wayland.c:2463
 #, c-format
 msgid "restoring Wayland display %s"
 msgstr ""
 
-#: ../wayland.c:2468
+#: ../wayland.c:2470
 msgid "failed restoring, lost connection to Wayland display"
 msgstr ""
 

diff --git a/src/version.c b/src/version.c
index 16b71bb687495a96a9dea9069bc4347b1caf6a1d..52e4d939022005b57f610d31c19ff9ced298d80d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1547,
 /**/
     1546,
 /**/

diff --git a/src/wayland.c b/src/wayland.c
index f9af42d71c5cbdd25226001326a8eb9814964349..bf09443757f99b2c674396e7a22ae22bc7a3f1ce 100644 (file)
--- a/src/wayland.c
+++ b/src/wayland.c
@@ -603,7 +603,9 @@ vwl_log_handler(const char *fmt, va_list args)
     // Remove newline that libwayland puts
     buf[STRLEN(buf) - 1] = NUL;
 
+#ifdef FEAT_EVAL
     ch_log(NULL, "%s", buf);
+#endif
     emsg(buf);
 
     vim_free(buf);