comparison src/ex_eval.c @ 293:f811be6fa9b5

updated for version 7.0077
author vimboss
date Tue, 31 May 2005 22:14:58 +0000
parents 2463194c8cdd
children 6c62b9b939bd
comparison
equal deleted inserted replaced
292:bf6ee000a80c 293:f811be6fa9b5
521 { 521 {
522 int save_msg_silent = msg_silent; 522 int save_msg_silent = msg_silent;
523 523
524 if (debug_break_level > 0) 524 if (debug_break_level > 0)
525 msg_silent = FALSE; /* display messages */ 525 msg_silent = FALSE; /* display messages */
526 else
527 verbose_enter();
526 ++no_wait_return; 528 ++no_wait_return;
527 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 529 if (debug_break_level > 0 || *p_vfile == NUL)
530 msg_scroll = TRUE; /* always scroll up, don't overwrite */
531
528 smsg((char_u *)_("Exception thrown: %s"), excp->value); 532 smsg((char_u *)_("Exception thrown: %s"), excp->value);
529 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 533 msg_puts((char_u *)"\n"); /* don't overwrite this either */
530 cmdline_row = msg_row; 534
535 if (debug_break_level > 0 || *p_vfile == NUL)
536 cmdline_row = msg_row;
531 --no_wait_return; 537 --no_wait_return;
532 if (debug_break_level > 0) 538 if (debug_break_level > 0)
533 msg_silent = save_msg_silent; 539 msg_silent = save_msg_silent;
540 else
541 verbose_leave();
534 } 542 }
535 543
536 current_exception = excp; 544 current_exception = excp;
537 return OK; 545 return OK;
538 546
567 int save_msg_silent = msg_silent; 575 int save_msg_silent = msg_silent;
568 576
569 saved_IObuff = vim_strsave(IObuff); 577 saved_IObuff = vim_strsave(IObuff);
570 if (debug_break_level > 0) 578 if (debug_break_level > 0)
571 msg_silent = FALSE; /* display messages */ 579 msg_silent = FALSE; /* display messages */
580 else
581 verbose_enter();
572 ++no_wait_return; 582 ++no_wait_return;
573 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 583 if (debug_break_level > 0 || *p_vfile == NUL)
584 msg_scroll = TRUE; /* always scroll up, don't overwrite */
574 smsg(was_finished 585 smsg(was_finished
575 ? (char_u *)_("Exception finished: %s") 586 ? (char_u *)_("Exception finished: %s")
576 : (char_u *)_("Exception discarded: %s"), 587 : (char_u *)_("Exception discarded: %s"),
577 excp->value); 588 excp->value);
578 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 589 msg_puts((char_u *)"\n"); /* don't overwrite this either */
579 cmdline_row = msg_row; 590 if (debug_break_level > 0 || *p_vfile == NUL)
591 cmdline_row = msg_row;
580 --no_wait_return; 592 --no_wait_return;
581 if (debug_break_level > 0) 593 if (debug_break_level > 0)
582 msg_silent = save_msg_silent; 594 msg_silent = save_msg_silent;
595 else
596 verbose_leave();
583 STRCPY(IObuff, saved_IObuff); 597 STRCPY(IObuff, saved_IObuff);
584 vim_free(saved_IObuff); 598 vim_free(saved_IObuff);
585 } 599 }
586 if (excp->type != ET_INTERRUPT) 600 if (excp->type != ET_INTERRUPT)
587 vim_free(excp->value); 601 vim_free(excp->value);
630 { 644 {
631 int save_msg_silent = msg_silent; 645 int save_msg_silent = msg_silent;
632 646
633 if (debug_break_level > 0) 647 if (debug_break_level > 0)
634 msg_silent = FALSE; /* display messages */ 648 msg_silent = FALSE; /* display messages */
649 else
650 verbose_enter();
635 ++no_wait_return; 651 ++no_wait_return;
636 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 652 if (debug_break_level > 0 || *p_vfile == NUL)
653 msg_scroll = TRUE; /* always scroll up, don't overwrite */
654
637 smsg((char_u *)_("Exception caught: %s"), excp->value); 655 smsg((char_u *)_("Exception caught: %s"), excp->value);
638 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 656 msg_puts((char_u *)"\n"); /* don't overwrite this either */
639 cmdline_row = msg_row; 657
658 if (debug_break_level > 0 || *p_vfile == NUL)
659 cmdline_row = msg_row;
640 --no_wait_return; 660 --no_wait_return;
641 if (debug_break_level > 0) 661 if (debug_break_level > 0)
642 msg_silent = save_msg_silent; 662 msg_silent = save_msg_silent;
663 else
664 verbose_leave();
643 } 665 }
644 } 666 }
645 667
646 /* 668 /*
647 * Remove an exception from the caught stack. 669 * Remove an exception from the caught stack.
783 report_make_pending(pending, value) 805 report_make_pending(pending, value)
784 int pending; 806 int pending;
785 void *value; 807 void *value;
786 { 808 {
787 if (p_verbose >= 14 || debug_break_level > 0) 809 if (p_verbose >= 14 || debug_break_level > 0)
810 {
811 if (debug_break_level <= 0)
812 verbose_enter();
788 report_pending(RP_MAKE, pending, value); 813 report_pending(RP_MAKE, pending, value);
814 if (debug_break_level <= 0)
815 verbose_leave();
816 }
789 } 817 }
790 818
791 /* 819 /*
792 * If something pending in a finally clause is resumed at the ":endtry", report 820 * If something pending in a finally clause is resumed at the ":endtry", report
793 * it if required by the 'verbose' option or when debugging. 821 * it if required by the 'verbose' option or when debugging.
796 report_resume_pending(pending, value) 824 report_resume_pending(pending, value)
797 int pending; 825 int pending;
798 void *value; 826 void *value;
799 { 827 {
800 if (p_verbose >= 14 || debug_break_level > 0) 828 if (p_verbose >= 14 || debug_break_level > 0)
829 {
830 if (debug_break_level <= 0)
831 verbose_enter();
801 report_pending(RP_RESUME, pending, value); 832 report_pending(RP_RESUME, pending, value);
833 if (debug_break_level <= 0)
834 verbose_leave();
835 }
802 } 836 }
803 837
804 /* 838 /*
805 * If something pending in a finally clause is discarded, report it if required 839 * If something pending in a finally clause is discarded, report it if required
806 * by the 'verbose' option or when debugging. 840 * by the 'verbose' option or when debugging.
809 report_discard_pending(pending, value) 843 report_discard_pending(pending, value)
810 int pending; 844 int pending;
811 void *value; 845 void *value;
812 { 846 {
813 if (p_verbose >= 14 || debug_break_level > 0) 847 if (p_verbose >= 14 || debug_break_level > 0)
848 {
849 if (debug_break_level <= 0)
850 verbose_enter();
814 report_pending(RP_DISCARD, pending, value); 851 report_pending(RP_DISCARD, pending, value);
852 if (debug_break_level <= 0)
853 verbose_leave();
854 }
815 } 855 }
816 856
817 857
818 /* 858 /*
819 * ":if". 859 * ":if".