6 files changed, 18 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 4129e2c27e8..f3cbebdf456 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-18  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctangleboot.cin: Reshuffle a few variables (upstream).
+
 2021-02-16  Andreas Scherer  <https://ascherer.github.io>
 
 	* Makefile.in,
diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin
index f462faf59d9..ab4c1663511 100644
--- a/Build/source/texk/web2c/ctangleboot.cin
+++ b/Build/source/texk/web2c/ctangleboot.cin
@@ -317,8 +317,8 @@ text_pointer last_unnamed;
 output_state cur_state;
 
 output_state stack[stack_size+1];
-stack_pointer stack_ptr;
 stack_pointer stack_end= stack+stack_size;
+stack_pointer stack_ptr;
 
 /*:32*//*37:*/
 #line 362 "cwebdir/ctangle.w"
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index 1861d8f01a6..2c1d828d892 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,5 +1,11 @@
 2021-02-18  Andreas Scherer  <https://ascherer.github.io>
 
+	* ctangle.c,
+	* ctangle.w,
+	* cweave.w: Reshuffle a few variables (upstream).
+
+2021-02-18  Andreas Scherer  <https://ascherer.github.io>
+
 	* cweave.w: Fix an 'aspell'ing error and one old macro call.
 
 2021-02-17  Andreas Scherer  <https://ascherer.github.io>
diff --git a/Build/source/texk/web2c/cwebdir/ctangle.c b/Build/source/texk/web2c/cwebdir/ctangle.c
index a9870369d1f..f77ce669f57 100644
--- a/Build/source/texk/web2c/cwebdir/ctangle.c
+++ b/Build/source/texk/web2c/cwebdir/ctangle.c
@@ -293,8 +293,8 @@ text_pointer last_unnamed;
 output_state cur_state;
 
 output_state stack[stack_size+1];
-stack_pointer stack_ptr;
 stack_pointer stack_end= stack+stack_size;
+stack_pointer stack_ptr;
 
 /*:32*//*37:*/
 #line 362 "ctangle.w"
diff --git a/Build/source/texk/web2c/cwebdir/ctangle.w b/Build/source/texk/web2c/cwebdir/ctangle.w
index dd76890046a..5978fc8bf34 100644
--- a/Build/source/texk/web2c/cwebdir/ctangle.w
+++ b/Build/source/texk/web2c/cwebdir/ctangle.w
@@ -287,8 +287,8 @@ typedef output_state *stack_pointer;
 output_state cur_state; /* |cur_end|, |cur_byte|, |cur_name|, |cur_repl|,
   and |cur_section| */
 output_state stack[stack_size+1]; /* info for non-current levels */
-stack_pointer stack_ptr; /* first unused location in the output state stack */
 stack_pointer stack_end=stack+stack_size; /* end of |stack| */
+stack_pointer stack_ptr; /* first unused location in the output state stack */
 
 @ To get the output process started, we will perform the following
 initialization steps. We may assume that |text_info->text_link| is nonzero,
diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w
index 868c525c3fd..15ddeb32bea 100644
--- a/Build/source/texk/web2c/cwebdir/cweave.w
+++ b/Build/source/texk/web2c/cwebdir/cweave.w
@@ -335,11 +335,11 @@ Thus, we usually have |*text_ptr==tok_ptr|.
 @<Global...@>=
 token tok_mem[max_toks]; /* tokens */
 token_pointer tok_mem_end = tok_mem+max_toks-1; /* end of |tok_mem| */
-token_pointer tok_start[max_texts]; /* directory into |tok_mem| */
 token_pointer tok_ptr; /* first unused position in |tok_mem| */
-text_pointer text_ptr; /* first unused position in |tok_start| */
-text_pointer tok_start_end = tok_start+max_texts-1; /* end of |tok_start| */
 token_pointer max_tok_ptr; /* largest value of |tok_ptr| */
+token_pointer tok_start[max_texts]; /* directory into |tok_mem| */
+text_pointer tok_start_end = tok_start+max_texts-1; /* end of |tok_start| */
+text_pointer text_ptr; /* first unused position in |tok_start| */
 text_pointer max_text_ptr; /* largest value of |text_ptr| */
 
 @ @<Set init...@>=
@@ -2418,7 +2418,7 @@ of identifiers in case labels.
 If the first identifier is the keyword `\&{operator}', we give up;
 users who want to index definitions of overloaded \CPLUSPLUS/ operators
 should say, for example, `\.{@@!@@\^\\\&\{operator\} \$+\{=\}\$@@>}' (or,
-more properly alphabetized,
+more properly alpha\-betized,
 `\.{@@!@@:operator+=\}\{\\\&\{operator\} \$+\{=\}\$@@>}').
 
 @d no_ident_found (token_pointer)0 /* distinct from any identifier token */
@@ -3608,8 +3608,8 @@ typedef output_state *stack_pointer;
 @<Global...@>=
 output_state cur_state; /* |cur_end|, |cur_tok|, |cur_mode| */
 output_state stack[stack_size]; /* info for non-current levels */
-stack_pointer stack_ptr; /* first unused location in the output state stack */
 stack_pointer stack_end=stack+stack_size-1; /* end of |stack| */
+stack_pointer stack_ptr; /* first unused location in the output state stack */
 stack_pointer max_stack_ptr; /* largest value assumed by |stack_ptr| */
 
 @ @<Set init...@>=