adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1547: Wayland: missing ifdef

Browse Source 
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>
This commit is contained in:
Foxe Chen
2025-07-15 21:06:37 +02:00
committed by Christian Brabandt
parent 5d552d652b
commit 690a42d54e
3 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
src/po/vim.pot
View File

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

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1547,
/**/ /**/
1546, 1546,
/**/ /**/

2
src/wayland.c
View File

@ -603,7 +603,9 @@ vwl_log_handler(const char *fmt, va_list args)
// Remove newline that libwayland puts // Remove newline that libwayland puts
buf[STRLEN(buf) - 1] = NUL; buf[STRLEN(buf) - 1] = NUL;
#ifdef FEAT_EVAL
ch_log(NULL, "%s", buf); ch_log(NULL, "%s", buf);
#endif
emsg(buf); emsg(buf);
vim_free(buf); vim_free(buf);