To: vim_dev@googlegroups.com Subject: Patch 8.2.0720 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0720 Problem: Occasional exit when encountering an X error. (Manfred Lotz) Solution: On an X error do not exit, do preserve files. Files: src/os_unix.c *** ../vim-8.2.0719/src/os_unix.c 2020-04-28 21:58:25.174049447 +0200 --- src/os_unix.c 2020-05-09 16:08:34.461198762 +0200 *************** *** 1544,1553 **** XGetErrorText(dpy, error_event->error_code, (char *)IObuff, IOSIZE); STRCAT(IObuff, _("\nVim: Got X error\n")); ! // We cannot print a message and continue, because no X calls are allowed ! // here (causes my system to hang). Silently continuing might be an ! // alternative... ! preserve_exit(); // preserve files and exit return 0; // NOTREACHED } --- 1544,1558 ---- XGetErrorText(dpy, error_event->error_code, (char *)IObuff, IOSIZE); STRCAT(IObuff, _("\nVim: Got X error\n")); ! // In the GUI we cannot print a message and continue, because no X calls ! // are allowed here (causes my system to hang). Silently continuing seems ! // like the best alternative. Do preserve files, in case we crash. ! ml_sync_all(FALSE, FALSE); ! ! #ifdef FEAT_GUI ! if (!gui.in_use) ! #endif ! msg((char *)IObuff); return 0; // NOTREACHED } *** ../vim-8.2.0719/src/version.c 2020-05-09 15:43:58.322878209 +0200 --- src/version.c 2020-05-09 16:03:01.670618000 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 720, /**/ -- hundred-and-one symptoms of being an internet addict: 76. Your ISP regards you as a business partner rather than as a customer. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///