6 files changed, 23 insertions, 20 deletions
diff --git a/Build/source/texk/web2c/alephdir/com16bit-rc2.ch b/Build/source/texk/web2c/alephdir/com16bit-rc2.ch
index 453da458352..aa7e8f7f310 100644
--- a/Build/source/texk/web2c/alephdir/com16bit-rc2.ch
+++ b/Build/source/texk/web2c/alephdir/com16bit-rc2.ch
@@ -1423,7 +1423,7 @@ loop@+  begin begin_file_reading; {set up |cur_file| and new level of input}
     if a_open_in(cur_file) then goto done;
     end;
 @y
-var temp_str: str_number; k: integer;
+var temp_str: str_number;
 begin scan_file_name; {set |cur_name| to desired file name}
 pack_cur_name;
 loop@+  begin begin_file_reading; {set up |cur_file| and new level of input}
@@ -1910,7 +1910,7 @@ flushable_string:=str_ptr-1;
 @y
 @z
 
-% If you don't want to remove code with the following change,
+% If you don't want to remove code with the following two changes,
 % please replace the former change by
 %
 % @x
diff --git a/Build/source/texk/web2c/alephdir/comsrcspec.ch b/Build/source/texk/web2c/alephdir/comsrcspec.ch
index 46ee017ee95..1a4999b3878 100644
--- a/Build/source/texk/web2c/alephdir/comsrcspec.ch
+++ b/Build/source/texk/web2c/alephdir/comsrcspec.ch
@@ -327,7 +327,7 @@ begin
 end;
 
 procedure append_src_special;
-var p, q : pointer;
+var q : pointer;
 begin
   if (source_filename_stack[in_open] > 0 and is_new_source (source_filename_stack[in_open], line)) then begin
     new_whatsit (special_node, write_node_size);
@@ -343,4 +343,3 @@ end;
 
 @* \[55] Index.
 @z
-
diff --git a/Build/source/texk/web2c/mf.web b/Build/source/texk/web2c/mf.web
index 81b5302536f..3854d7c2638 100644
--- a/Build/source/texk/web2c/mf.web
+++ b/Build/source/texk/web2c/mf.web
@@ -23,7 +23,7 @@
 % Version 2.71 fixed bug in draw, allowed unprintable filenames (March 1992).
 % Version 2.718 fixed bug in <Choose a dependent...> (March 1995).
 % Version 2.7182 fixed bugs related to "<unprintable char>" (August 1996).
-% Version 2.71828 suppressed autorounding in dangerous cases (December 2002).
+% Version 2.71828 suppressed autorounding in dangerous cases (June 2003).
 
 % A reward of $327.68 will be paid to the first finder of any remaining bug.
 
@@ -8662,7 +8662,7 @@ except when |t| is too large to be stored in a quarterword.
   else if chopped=0 then chopped:=-1
 
 @<Truncate the values of all coordinates that exceed...@>=
-p:=cur_spec; k:=1; chopped:=0; dmax:=max_allowed/2;
+p:=cur_spec; k:=1; chopped:=0; dmax:=half(max_allowed);
 repeat procrustes(left_x(p)); procrustes(left_y(p));
 procrustes(x_coord(p)); procrustes(y_coord(p));
 procrustes(right_x(p)); procrustes(right_y(p));@/
diff --git a/Build/source/texk/web2c/omegadir/com16bit.ch b/Build/source/texk/web2c/omegadir/com16bit.ch
index 7fb3802d882..98da09fb4ae 100644
--- a/Build/source/texk/web2c/omegadir/com16bit.ch
+++ b/Build/source/texk/web2c/omegadir/com16bit.ch
@@ -1422,7 +1422,7 @@ loop@+  begin begin_file_reading; {set up |cur_file| and new level of input}
     if a_open_in(cur_file) then goto done;
     end;
 @y
-var temp_str: str_number; k: integer;
+var temp_str: str_number;
 begin scan_file_name; {set |cur_name| to desired file name}
 pack_cur_name;
 loop@+begin
@@ -1910,7 +1910,7 @@ flushable_string:=str_ptr-1;
 @y
 @z
 
-% If you don't want to remove code with the following change,
+% If you don't want to remove code with the following two changes,
 % please replace the former change by
 %
 % @x
diff --git a/Build/source/texk/web2c/omegadir/comsrcspec.ch b/Build/source/texk/web2c/omegadir/comsrcspec.ch
index d8e73ad4c7c..17c15263e2c 100644
--- a/Build/source/texk/web2c/omegadir/comsrcspec.ch
+++ b/Build/source/texk/web2c/omegadir/comsrcspec.ch
@@ -327,7 +327,7 @@ begin
 end;
 
 procedure append_src_special;
-var p, q : pointer;
+var q : pointer;
 begin
   if (source_filename_stack[in_open] > 0 and is_new_source (source_filename_stack[in_open], line)) then begin
     new_whatsit (special_node, write_node_size);
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index 451ae836e7c..071d47c93ac 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -2336,7 +2336,7 @@ loop@+  begin begin_file_reading; {set up |cur_file| and new level of input}
     if a_open_in(cur_file) then goto done;
     end;
 @y
-var temp_str: str_number; k: integer;
+var temp_str: str_number;
 begin scan_file_name; {set |cur_name| to desired file name}
 pack_cur_name;
 loop@+begin
@@ -3086,6 +3086,13 @@ done:
 @z
 
 %%%%%%%% dynamic hyph_size
+@x 18245 m.934 
+@!s,@!t:str_number; {strings being compared or stored}
+@y
+@!s:str_number; {strings being compared or stored}
+@z
+
+%%%%%%%% dynamic hyph_size
 @x 18274 m.939
   begin h:=(h+h+hc[j]) mod hyph_size;
 @y  18274
@@ -3760,12 +3767,16 @@ def_code: if chr_code=xord_code_base then print_esc("xordcode")
 %   a) the string is already replaced in |scan_file_name| and therefore
 %   b) the wrong string will get flushed!!!
 %
+@x [49.1257] l.23318 unused variable
+@!flushable_string:str_number; {string not yet referenced}
+@y
+@z
 @x [49.1260] l.23331 new_font: string recycling -- already done
 flushable_string:=str_ptr-1;
 @y
 @z
 
-% If you don't want to remove code with the following change,
+% If you don't want to remove code with the following two changes,
 % please replace the former change by
 %
 % @x
@@ -3797,13 +3808,6 @@ then kpse_make_tex_discard_errors := 1
 else kpse_make_tex_discard_errors := 0;
 @z
 
-@x [49.1275] l.23434 - Index variable for next fragment of code.
-@!n:0..15; {stream number}
-@y
-@!n:0..15; {stream number}
-@!k:integer;
-@z
-
 @x [49.1275] l.23441 - Same stuff as for \input, this time for \openin.
   if cur_ext="" then cur_ext:=".tex";
   pack_cur_name;
@@ -5046,7 +5050,7 @@ that's a convenient module in which to put it.)
 
 @<Basic printing procedures@> =
 procedure print_csnames (hstart:integer; hfinish:integer);
-var c,h,where:integer;
+var c,h:integer;
 begin
   write_ln(stderr, 'fmtdebug:csnames from ', hstart, ' to ', hfinish, ':');
   for h := hstart to hfinish do begin
@@ -5782,7 +5786,7 @@ begin
 end;
 
 procedure append_src_special;
-var p, q : pointer;
+var q : pointer;
 begin
   if (source_filename_stack[in_open] > 0 and is_new_source (source_filename_stack[in_open]
 , line)) then begin