Merge from origin/emacs-27

75723ec212 (origin/emacs-27) ; * lisp/emacs-lisp/benchmark.el (benchm...
53e2a612ad ; * lib-src/make-fingerprint.c: Update commentary.
286c632772 Reformat argument commentary in etags.c
4ec740866a Make the invocation of combine-change-calls in comment-reg...
66bcec8838 * lisp/progmodes/cc-langs.el (c-<>-notable-chars-re): Fix ...
03eeab469e ; Update the expected result files in test/manual/etags.
d875a22bc6 Update the various INSTALL files

# Conflicts:
#	INSTALL

2 files changed, 22 insertions, 23 deletions

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 146cf612505..4315771a496 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1974,14 +1974,13 @@ make_tag (const char *name, 	/* tag name, or NULL if unnamed */
 
 /* Record a tag. */
 static void
-pfnote (char *name, bool is_func, char *linestart, ptrdiff_t linelen,
-	intmax_t lno, intmax_t cno)
-                		/* tag name, or NULL if unnamed */
-                  		/* tag is a function */
-                     		/* start of the line where tag is */
-                 		/* length of the line where tag is */
-             			/* line number */
-              			/* character number */
+pfnote (char *name,		/* tag name, or NULL if unnamed */
+	bool is_func,		/* tag is a function */
+	char *linestart,	/* start of the line where tag is */
+	ptrdiff_t linelen,	/* length of the line where tag is */
+	intmax_t lno,		/* line number */
+	intmax_t cno)		/* character number */
+
 {
   register node *np;
 
@@ -2905,15 +2904,13 @@ static void make_C_tag (bool);
  */
 
 static bool
-consider_token (char *str, ptrdiff_t len, int c, int *c_extp,
-		ptrdiff_t bracelev, ptrdiff_t parlev, bool *is_func_or_var)
-                        	/* IN: token pointer */
-                      		/* IN: token length */
-                    		/* IN: first char after the token */
-                 		/* IN, OUT: C extensions mask */
-                  		/* IN: brace level */
-                		/* IN: parenthesis level */
-                          	/* OUT: function or variable found */
+consider_token (char *str,	      /* IN: token pointer */
+		ptrdiff_t len,	      /* IN: token length */
+		int c,		      /* IN: first char after the token */
+		int *c_extp,	      /* IN, OUT: C extensions mask */
+		ptrdiff_t bracelev,   /* IN: brace level */
+		ptrdiff_t parlev,     /* IN: parenthesis level */
+		bool *is_func_or_var) /* OUT: function or variable found */
 {
   /* When structdef is stagseen, scolonseen, or snone with bracelev > 0,
      structtype is the type of the preceding struct-like keyword, and
@@ -3312,9 +3309,8 @@ perhaps_more_input (FILE *inf)
  * 	C syntax and adds them to the list.
  */
 static void
-C_entries (int c_ext, FILE *inf)
-               			/* extension of C */
-               			/* input file */
+C_entries (int c_ext,		/* extension of C */
+	   FILE *inf)		/* input file */
 {
   char c;			/* latest char read; '\0' for end of line */
   char *lp;			/* pointer one beyond the character `c' */
diff --git a/lib-src/make-fingerprint.c b/lib-src/make-fingerprint.c
index c013d0aca3b..b72ee90bbca 100644
--- a/lib-src/make-fingerprint.c
+++ b/lib-src/make-fingerprint.c
@@ -19,9 +19,12 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
-/* The arguments given to this program are all the object files that
- go into building GNU Emacs.  There is no special search logic to find
- the files.  */
+/* The argument given to this program is the initial version of the
+ temacs executable file used when building GNU Emacs.  This program computes
+ a digest fingerprint for the executable, and modifies the binary in
+ place, replacing all instances of the existing fingerprint (normally
+ the default fingerprint from libgnu's lib/fingerprint.c) with the
+ new value.  With option -r, it just prints the digest.   */
 
 #include <config.h>