Mercurial > vim

comparison src/scriptfile.c @ 32246:6e96bd314ffe v9.0.1454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1454: code indenting is confused by macros Commit: https://github.com/vim/vim/commit/7e5fe38efc105721400048a2ffdeddbe1b9c0650 Author: ichizok <gclient.gaap@gmail.com> Date: Sat Apr 15 13:17:50 2023 +0100 patch 9.0.1454: code indenting is confused by macros Problem: Code indenting is confused by macros. Solution: Put semicolon after the macros instead of inside. (Ozaki Kiichi, closes #12257)
author Bram Moolenaar <Bram@vim.org>
date Sat, 15 Apr 2023 14:30:05 +0200
parents 5372bf23bf72
children b8e9ea3c1ed0
comparison
equal deleted inserted replaced
32245:821b3f72bfc7 32246:6e96bd314ffe
1448 char_u *fname_not_fixed = NULL; 1448 char_u *fname_not_fixed = NULL;
1449 char_u *fname_exp = NULL; 1449 char_u *fname_exp = NULL;
1450 char_u *firstline = NULL; 1450 char_u *firstline = NULL;
1451 int retval = FAIL; 1451 int retval = FAIL;
1452 sctx_T save_current_sctx; 1452 sctx_T save_current_sctx;
1453 #ifdef STARTUPTIME
1454 struct timeval tv_rel;
1455 struct timeval tv_start;
1456 #endif
1457 #ifdef FEAT_PROFILE
1458 proftime_T wait_start;
1459 #endif
1460 int save_sticky_cmdmod_flags = sticky_cmdmod_flags;
1461 int trigger_source_post = FALSE;
1453 #ifdef FEAT_EVAL 1462 #ifdef FEAT_EVAL
1454 funccal_entry_T funccalp_entry; 1463 funccal_entry_T funccalp_entry;
1455 int save_debug_break_level = debug_break_level; 1464 int save_debug_break_level = debug_break_level;
1456 int sid = -1; 1465 int sid = -1;
1457 scriptitem_T *si = NULL; 1466 scriptitem_T *si = NULL;
1458 int save_estack_compiling = estack_compiling; 1467 int save_estack_compiling = estack_compiling;
1459 ESTACK_CHECK_DECLARATION 1468 ESTACK_CHECK_DECLARATION;
1460 #endif 1469 #endif
1461 #ifdef STARTUPTIME
1462 struct timeval tv_rel;
1463 struct timeval tv_start;
1464 #endif
1465 #ifdef FEAT_PROFILE
1466 proftime_T wait_start;
1467 #endif
1468 int save_sticky_cmdmod_flags = sticky_cmdmod_flags;
1469 int trigger_source_post = FALSE;
1470 1470
1471 CLEAR_FIELD(cookie); 1471 CLEAR_FIELD(cookie);
1472 if (fname == NULL) 1472 if (fname == NULL)
1473 { 1473 {
1474 // sourcing lines from a buffer 1474 // sourcing lines from a buffer
1709 si->sn_is_vimrc = is_vimrc; 1709 si->sn_is_vimrc = is_vimrc;
1710 } 1710 }
1711 1711
1712 // Keep the sourcing name/lnum, for recursive calls. 1712 // Keep the sourcing name/lnum, for recursive calls.
1713 estack_push(ETYPE_SCRIPT, si->sn_name, 0); 1713 estack_push(ETYPE_SCRIPT, si->sn_name, 0);
1714 ESTACK_CHECK_SETUP 1714 ESTACK_CHECK_SETUP;
1715 1715
1716 # ifdef FEAT_PROFILE 1716 # ifdef FEAT_PROFILE
1717 if (do_profiling == PROF_YES) 1717 if (do_profiling == PROF_YES)
1718 { 1718 {
1719 int forceit; 1719 int forceit;
1778 #endif 1778 #endif
1779 1779
1780 if (got_int) 1780 if (got_int)
1781 emsg(_(e_interrupted)); 1781 emsg(_(e_interrupted));
1782 #ifdef FEAT_EVAL 1782 #ifdef FEAT_EVAL
1783 ESTACK_CHECK_NOW 1783 ESTACK_CHECK_NOW;
1784 #endif 1784 #endif
1785 estack_pop(); 1785 estack_pop();
1786 if (p_verbose > 1) 1786 if (p_verbose > 1)
1787 { 1787 {
1788 verbose_enter(); 1788 verbose_enter();