Yegappan wrote:
> On Tue, Mar 7, 2023 at 9:14 AM Bram Moolenaar <[email protected]> wrote: > > > > > > Patch 9.0.1390 > > Problem: FOR_ALL_ macros are defined in an unexpected file. > > Solution: Move FOR_ALL_ macros to macros.h. Add FOR_ALL_HASHTAB_ITEMS. > > (Yegappan Lakshmanan, closes #12109) > > > > > > *** ../vim-9.0.1389/src/os_unix.c 2023-03-04 13:23:22.969812280 +0000 > > --- src/os_unix.c 2023-03-07 17:10:22.929201385 +0000 > > *************** > > *** 2335,2344 **** > > { > > int do_push_pop = unix_did_set_title || did_set_icon; > > > > ! // only restore the title or icon when it has been set > > ! mch_settitle(((which & SAVE_RESTORE_TITLE) && unix_did_set_title) ? > > ! (oldtitle ? oldtitle : p_titleold) : NULL, > > ((which & SAVE_RESTORE_ICON) && did_set_icon) ? oldicon : > > NULL); > > > > if (do_push_pop) > > { > > --- 2335,2354 ---- > > { > > int do_push_pop = unix_did_set_title || did_set_icon; > > > > ! // Only restore the title or icon when it has been set. > > ! // When using "oldtitle" make a copy, it might be freed halfway. > > ! char_u *title = ((which & SAVE_RESTORE_TITLE) && unix_did_set_title) > > ! ? (oldtitle ? oldtitle : p_titleold) : NULL; > > ! char_u *tofree = NULL; > > ! if (title == oldtitle && oldtitle != NULL) > > ! { > > ! tofree = vim_strsave(title); > > ! if (tofree != NULL) > > ! title = tofree; > > ! } > > ! mch_settitle(title, > > ((which & SAVE_RESTORE_ICON) && did_set_icon) ? oldicon : > > NULL); > > + vim_free(tofree); > > > > if (do_push_pop) > > { > > > The above change was not part of my PR. Was this included by mistake? Sorry, that was a change I started a while ago but hadn't finished. It somehow got included in this patch. At least it's missing a test. Let me know if it causes any problems. -- hundred-and-one symptoms of being an internet addict: 244. You use more than 20 passwords. /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/20230308163954.71B7F1C1262%40moolenaar.net.
