To: vim-dev@vim.org Subject: Patch 6.1.323 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.323 Problem: ":registers" doesn't stop listing for a "q" at the more prompt. (Hari Krishna Dara) Solution: Check for interrupt and got_int. Files: src/ops.c, src/proto/ops.pro *** ../vim61.322/src/ops.c Sat Dec 28 17:33:31 2002 --- src/ops.c Fri Feb 14 10:31:27 2003 *************** *** 105,110 **** --- 105,111 ---- #ifdef FEAT_CLIPBOARD static void copy_yank_reg __ARGS((struct yankreg *reg)); #endif + static void dis_msg __ARGS((char_u *p, int skip_esc)); #ifdef FEAT_VISUAL static void block_prep __ARGS((oparg_T *oap, struct block_def *, linenr_T, int)); #endif *************** *** 3635,3641 **** /* Highlight title */ MSG_PUTS_TITLE(_("\n--- Registers ---")); ! for (i = -1; i < NUM_REGISTERS; ++i) { if (i == -1) { --- 3636,3642 ---- /* Highlight title */ MSG_PUTS_TITLE(_("\n--- Registers ---")); ! for (i = -1; i < NUM_REGISTERS && !got_int; ++i) { if (i == -1) { *************** *** 3676,3688 **** MSG_PUTS_ATTR("^J", attr); out_flush(); /* show one line at a time */ } } /* * display last inserted text */ if ((p = get_last_insert()) != NULL ! && (arg == NULL || vim_strchr(arg, '.') != NULL)) { MSG_PUTS("\n\". "); dis_msg(p, TRUE); --- 3677,3690 ---- MSG_PUTS_ATTR("^J", attr); out_flush(); /* show one line at a time */ } + ui_breakcheck(); } /* * display last inserted text */ if ((p = get_last_insert()) != NULL ! && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) { MSG_PUTS("\n\". "); dis_msg(p, TRUE); *************** *** 3691,3697 **** /* * display last command line */ ! if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL)) { MSG_PUTS("\n\": "); dis_msg(last_cmdline, FALSE); --- 3693,3700 ---- /* * display last command line */ ! if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) ! && !got_int) { MSG_PUTS("\n\": "); dis_msg(last_cmdline, FALSE); *************** *** 3701,3707 **** * display current file name */ if (curbuf->b_fname != NULL ! && (arg == NULL || vim_strchr(arg, '%') != NULL)) { MSG_PUTS("\n\"% "); dis_msg(curbuf->b_fname, FALSE); --- 3704,3710 ---- * display current file name */ if (curbuf->b_fname != NULL ! && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) { MSG_PUTS("\n\"% "); dis_msg(curbuf->b_fname, FALSE); *************** *** 3710,3716 **** /* * display alternate file name */ ! if (arg == NULL || vim_strchr(arg, '%') != NULL) { char_u *fname; linenr_T dummy; --- 3713,3719 ---- /* * display alternate file name */ ! if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) { char_u *fname; linenr_T dummy; *************** *** 3726,3732 **** * display last search pattern */ if (last_search_pat() != NULL ! && (arg == NULL || vim_strchr(arg, '/') != NULL)) { MSG_PUTS("\n\"/ "); dis_msg(last_search_pat(), FALSE); --- 3729,3735 ---- * display last search pattern */ if (last_search_pat() != NULL ! && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) { MSG_PUTS("\n\"/ "); dis_msg(last_search_pat(), FALSE); *************** *** 3736,3742 **** /* * display last used expression */ ! if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL)) { MSG_PUTS("\n\"= "); dis_msg(expr_line, FALSE); --- 3739,3746 ---- /* * display last used expression */ ! if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) ! && !got_int) { MSG_PUTS("\n\"= "); dis_msg(expr_line, FALSE); *************** *** 3748,3754 **** * display a string for do_dis() * truncate at end of screen line */ ! void dis_msg(p, skip_esc) char_u *p; int skip_esc; /* if TRUE, ignore trailing ESC */ --- 3752,3758 ---- * display a string for do_dis() * truncate at end of screen line */ ! static void dis_msg(p, skip_esc) char_u *p; int skip_esc; /* if TRUE, ignore trailing ESC */ *************** *** 3773,3778 **** --- 3777,3783 ---- #endif msg_outtrans_len(p++, 1); } + ui_breakcheck(); } /* *** ../vim61.322/src/proto/ops.pro Sun Oct 27 20:32:20 2002 --- src/proto/ops.pro Fri Feb 14 10:29:14 2003 *************** *** 29,35 **** int preprocs_left __ARGS((void)); int get_register_name __ARGS((int num)); void ex_display __ARGS((exarg_T *eap)); - void dis_msg __ARGS((char_u *p, int skip_esc)); void do_do_join __ARGS((long count, int insert_space)); int do_join __ARGS((int insert_space)); void op_format __ARGS((oparg_T *oap)); --- 29,34 ---- *** ../vim61.322/src/version.c Sun Feb 16 20:08:10 2003 --- src/version.c Sun Feb 16 20:11:17 2003 *************** *** 607,608 **** --- 612,615 ---- { /* Add new patch number below this line */ + /**/ + 323, /**/ -- hundred-and-one symptoms of being an internet addict: 261. You find diskettes in your pockets when doing laundry. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///