comparison src/structs.h @ 22699:e82579016863 v8.2.1898

patch 8.2.1898: command modifier parsing always uses global cmdmod Commit: https://github.com/vim/vim/commit/e10044015841711b989f9a898d427bcc1fdb4c32 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 24 20:49:43 2020 +0200 patch 8.2.1898: command modifier parsing always uses global cmdmod Problem: Command modifier parsing always uses global cmdmod. Solution: Pass in cmdmod_T to use. Rename struct fields consistently.
author Bram Moolenaar <Bram@vim.org>
date Sat, 24 Oct 2020 21:00:05 +0200
parents c996700d569f
children 92a100fc5e17
comparison
equal deleted inserted replaced
22698:28523bc9ee71 22699:e82579016863
623 * This needs to be saved for recursive commands, put them in a structure for 623 * This needs to be saved for recursive commands, put them in a structure for
624 * easy manipulation. 624 * easy manipulation.
625 */ 625 */
626 typedef struct 626 typedef struct
627 { 627 {
628 int cmod_flags; // CMOD_ flags, see below 628 int cmod_flags; // CMOD_ flags
629 int hide; // TRUE when ":hide" was used 629 #define CMOD_SANDBOX 0x0001 // ":sandbox"
630 # ifdef FEAT_BROWSE_CMD 630 #define CMOD_SILENT 0x0002 // ":silent"
631 int browse; // TRUE to invoke file dialog 631 #define CMOD_ERRSILENT 0x0004 // ":silent!"
632 # endif 632 #define CMOD_UNSILENT 0x0008 // ":unsilent"
633 int split; // flags for win_split() 633 #define CMOD_NOAUTOCMD 0x0010 // ":noautocmd"
634 int tab; // > 0 when ":tab" was used 634 #define CMOD_HIDE 0x0020 // ":hide"
635 # if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) 635 #define CMOD_BROWSE 0x0040 // ":browse" - invoke file dialog
636 int confirm; // TRUE to invoke yes/no dialog 636 #define CMOD_CONFIRM 0x0080 // ":confirm" - invoke yes/no dialog
637 # endif 637 #define CMOD_KEEPALT 0x0100 // ":keepalt"
638 int keepalt; // TRUE when ":keepalt" was used 638 #define CMOD_KEEPMARKS 0x0200 // ":keepmarks"
639 int keepmarks; // TRUE when ":keepmarks" was used 639 #define CMOD_KEEPJUMPS 0x0400 // ":keepjumps"
640 int keepjumps; // TRUE when ":keepjumps" was used 640 #define CMOD_LOCKMARKS 0x0800 // ":lockmarks"
641 int lockmarks; // TRUE when ":lockmarks" was used 641 #define CMOD_KEEPPATTERNS 0x1000 // ":keeppatterns"
642 int keeppatterns; // TRUE when ":keeppatterns" was used 642 #define CMOD_NOSWAPFILE 0x2000 // ":noswapfile"
643 int noswapfile; // TRUE when ":noswapfile" was used 643
644 regmatch_T filter_regmatch; // set by :filter /pat/ 644 int cmod_split; // flags for win_split()
645 int filter_force; // set for :filter! 645 int cmod_tab; // > 0 when ":tab" was used
646 regmatch_T cmod_filter_regmatch; // set by :filter /pat/
647 int cmod_filter_force; // set for :filter!
646 648
647 int cmod_verbose; // non-zero to set 'verbose' 649 int cmod_verbose; // non-zero to set 'verbose'
648 650
649 // values for undo_cmdmod() 651 // values for undo_cmdmod()
650 char_u *cmod_save_ei; // saved value of 'eventignore' 652 char_u *cmod_save_ei; // saved value of 'eventignore'
653 #endif 655 #endif
654 long cmod_verbose_save; // if 'verbose' was set: value of 656 long cmod_verbose_save; // if 'verbose' was set: value of
655 // p_verbose plus one 657 // p_verbose plus one
656 int cmod_save_msg_silent; // if non-zero: saved value of 658 int cmod_save_msg_silent; // if non-zero: saved value of
657 // msg_silent + 1 659 // msg_silent + 1
660 int cmod_save_msg_scroll; // for restoring msg_scroll
658 int cmod_did_esilent; // incremented when emsg_silent is 661 int cmod_did_esilent; // incremented when emsg_silent is
659 } cmdmod_T; 662 } cmdmod_T;
660
661 #define CMOD_SANDBOX 0x01
662 #define CMOD_SILENT 0x02
663 #define CMOD_ERRSILENT 0x04
664 #define CMOD_UNSILENT 0x08
665 #define CMOD_NOAUTOCMD 0x10
666 663
667 #define MF_SEED_LEN 8 664 #define MF_SEED_LEN 8
668 665
669 struct memfile 666 struct memfile
670 { 667 {