* press enter moved to errore.msg

compiler/errore.msg

@@ -1711,7 +1711,7 @@ unit_w_cant_compile_unit_with_changed_incfile=10040_W_Can't recompile unit $1, b
 #
 #  Options
 #
-# 11025 is the last used one
+# 11029 is the last used one
 #
 option_usage=11000_$1 [options] <inputfile> [options]
 # BeginOfTeX
@@ -1788,6 +1788,7 @@ option_using_env=11027_T_Reading options from environment $1
 % Options are also read from this environment string
 option_handling_option=11028_D_Handling option "$1"
 % Debug info that an option is found and will be handled
+option_help_press_enter=11029__*** press enter ***
 %\end{description}
 # EndOfTeX
 

compiler/msgidx.inc

@@ -581,13 +581,14 @@ const
   option_using_file=11026;
   option_using_env=11027;
   option_handling_option=11028;
+  option_help_press_enter=11029;
   option_logo=11023;
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 32666;
+  MsgTxtSize = 32693;
 
   MsgIdxMax : array[1..20] of longint=(
     17,59,174,37,41,41,98,14,35,41,
-    29,1,1,1,1,1,1,1,1,1
+    30,1,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -632,36 +632,38 @@ const msgtxt : array[0..000136,1..240] of char=(
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
-  '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
-  'Copyright (c) 199','3-2000 by Florian Klaempfl'#000+
+  '11029__*** press enter ***'#000+
+  '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $','FPCTARGET'+
+  #010+
+  'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
   'Compiler Target: $FPCTARGET'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
-  'For more information read COPYING.FPC'#010+
+  'For more information read COPYI','NG.FPC'#010+
   #010+
-  'Report bugs,suggest','ions etc to:'#010+
+  'Report bugs,suggestions etc to:'#010+
   '                 [email protected]'#000+
   '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
-  '**2al_list sourcecode lines in assembler file'#010+
-  '**2','ar_list register allocation/release info in assembler file'#010+
+  '**2al_list sourcecode ','lines in assembler file'#010+
+  '**2ar_list register allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
-  '**1C<x>_code generation options:'#010+
-  '**2CD_c','reate also dynamic library (not supported)'#010+
+  '**1C<x>_code ','generation options:'#010+
+  '**2CD_create also dynamic library (not supported)'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
-  '**2Cs<n>_set stack size to <n>'#010+
-  '**2Ct_s','tack checking'#010+
+  '**2Cs<n>_se','t stack size to <n>'#010+
+  '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
@@ -669,128 +671,128 @@ const msgtxt : array[0..000136,1..240] of char=(
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
-  '**1F<x>_set file names and path','s:'#010+
+  '**1F','<x>_set file names and paths:'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
-  '**2Fl<x>_adds <x> to library path'#010+
-  '*L2FL<x>_uses <x> as dy','namic linker'#010+
+  '**2Fl<x>_adds <x> to library p','ath'#010+
+  '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
-  '*g2gg_use gsym'#010+
+  '*g2gg_use g','sym'#010+
   '*g2gd_use dbx'#010+
-  '*g2gh_use',' heap trace unit (for memory leak debugging)'#010+
+  '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
-  '**2iSO_return compiler OS'#010+
-  '**','2iSP_return compiler processor'#010+
+  '*','*2iSO_return compiler OS'#010+
+  '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1n_don'#039't read the default config file'#010+
-  '**1o<x>_change the name of the exe','cutable produced to <x>'#010+
+  '**1o<x>','_change the name of the executable produced to <x>'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '*L1P_use pipes instead of creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_switch some Delphi 2 extensions on'#010+
-  '**2Sc_supports operators like ','C (*=,+=,/= and -=)'#010+
+  '**2','Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_tries to be Delphi compatible'#010+
   '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
-  '**2Si_support C++ styled INLINE'#010+
-  '**2Sm_support',' macros like C (global)'#010+
+  '**2Si_support C++ ','styled INLINE'#010+
+  '**2Sm_support macros like C (global)'#010+
   '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
-  '**1s_don'#039't call assembler and linker (only w','ith -a)'#010+
+  '**1s_don'#039't call a','ssembler and linker (only with -a)'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
   '**2Us_compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2*_e : Show errors (default)       d : Show debug i','nfo'#010+
+  '**2*_e : Show errors (defa','ult)       d : Show debug info'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  m : Show defined macros'#010+
-  '**2*_i : Show general info           p : Show compiled p','rocedures'#010+
+  '**2*_i : Show general info   ','        p : Show compiled procedures'#010+
   '**2*_l : Show linenumbers            c : Show conditionals'#010+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
-  '**2*_    declarations if an err','or    x : Executable info (Win32 only'+
+  '**2*','_    declarations if an error    x : Executable info (Win32 only'+
   ')'#010+
   '**2*_    occurs'#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
-  '**2XS_try to link static (de','fault) (defines FPC_LINK_STATIC)'#010+
+  '*','*2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
-  '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
-  '3*2Anasmcof','f_coff (Go32v2) file using Nasm'#010+
+  '3*2Aasaout_assemble using GNU AS fo','r aout (Go32v1)'#010+
+  '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
-  '3*2Acoff_coff (Go32v2) using internal writer'#010+
-  '3*2Apecof','f_pecoff (Win32) using internal writer'#010+
+  '3*2Acoff_coff (Go32v2) usin','g internal writer'#010+
+  '3*2Apecoff_pecoff (Win32) using internal writer'#010+
   '3*1R<x>_assembler reading style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
   '3*2Rdirect_copy assembler text directly to assembler file'#010+
-  '3*1O<x>_optimizations:'#010+
-  '3*2Og_generate s','maller code'#010+
+  '3*1O<x>_opti','mizations:'#010+
+  '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
   '3*2Or_keep certain variables in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
-  '3*2O2_level 2 optimizations (-O1 + slower optimizat','ions)'#010+
+  '3*2O2_level 2 optimizati','ons (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
-  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
-  '3','*1T<x>_Target operating system:'#010+
+  '3*3Op3_set target processor ','to PPro/PII/c6x86/K6 (tm)'#010+
+  '3*1T<x>_Target operating system:'#010+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
   '3*2TLINUX_Linux'#010+
   '3*2Tnetware_Novell Netware Module (experimental)'#010+
   '3*2TOS2_OS/2 2.x'#010+
-  '3*2TSUNOS_SunOS/Solaris'#010+
-  '3*2TWi','n32_Windows 32 Bit'#010+
+  '3*2','TSUNOS_SunOS/Solaris'#010+
+  '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF_Specify full-screen type application (OS/2 onl','y)'#010+
+  '3*2WF_Specify full-screen',' type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Agas_GNU Motorola assembler'#010+
-  '6*2Amit_MIT Syntax',' (old GAS)'#010+
+  '6*2Agas_GNU Motorola a','ssembler'#010+
+  '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
-  '6*2O2_set target processor to a MC68020+',#010+
+  '6*2O2_set tar','get processor to a MC68020+'#010+
   '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
@@ -799,6 +801,6 @@ const msgtxt : array[0..000136,1..240] of char=(
   '6*2TMACOS_Macintosh m68k'#010+
   '6*2TLINUX_Linux-68k'#010+
   '**1*_'#010+
-  '**1?_shows this help'#010+
-  '**1h_shows ','this help without waiting'#000
+  '**1?_','shows this help'#010+
+  '**1h_shows this help without waiting'#000
 );

compiler/options.pas

@@ -291,11 +291,11 @@ begin
            inc(Lines);
          end;
       { page full ? }
-        if (lines>=page_size) then
+        if (lines >= page_size - 1) then
          begin
            if not NoPressEnter then
             begin
-              write('*** press enter ***');
+              Message(option_help_press_enter);
               readln(input);
               if upper(input)='Q' then
                StopOptions;
@@ -1572,7 +1572,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.33  2001-03-03 12:41:22  jonas
+  Revision 1.34  2001-03-05 21:50:29  peter
+    * press enter moved to errore.msg
+
+  Revision 1.33  2001/03/03 12:41:22  jonas
     * simplified and optimized range checking code, FPC_BOUNDCHECK is no longer necessary
 
   Revision 1.32  2001/02/26 19:44:53  peter