Merge from savannah/emacs-30

d6726e6dfc7 Further fix of reading and writing profiler data
30b2fae77b7 * Makefile.in (PREFERRED_BRANCH): Update to emacs-30.
5397808e5bc ; Eliminate more C++ comments
1463434907e ; Eliminate C++ comments and typo

6 files changed, 17 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index ade7d258a4c..93e8f1ae5cd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1319,7 +1319,7 @@ ChangeLog:
 	  ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
 
 # Check that we are in a good state for changing history.
-PREFERRED_BRANCH = emacs-28
+PREFERRED_BRANCH = emacs-30
 preferred-branch-is-current:
 	git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
 unchanged-history-files:
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 4684ca82935..556b7d701fc 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -5148,10 +5148,10 @@ Rust_entries (FILE *inf)
       cp = skip_spaces(cp);
       name = cp;
 
-      // Skip 'pub' keyworld
+      /* Skip 'pub' keyword.  */
       (void)LOOKING_AT (cp, "pub");
 
-      // Look for define
+      /* Look for define.  */
       if ((is_func = LOOKING_AT (cp, "fn"))
 	  || LOOKING_AT (cp, "enum")
 	  || LOOKING_AT (cp, "struct")
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 407f95e4541..49c4bcf72db 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -97,7 +97,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
    [18-Feb-97 andrewi] I now believe my comment above to be incorrect,
    since it was based on a misunderstanding of how locking calls are
    implemented and used on Unix.  */
-//#define DISABLE_DIRECT_ACCESS
+/* #define DISABLE_DIRECT_ACCESS */
 
 #include <fcntl.h>
 #endif /* WINDOWSNT */
diff --git a/lisp/profiler.el b/lisp/profiler.el
index a5d62e20e3a..34e4d7032df 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -452,6 +452,11 @@ Do not touch this variable directly.")
   (let ((string (cond
 		 ((eq entry t)
 		  "Others")
+		 ;; When we save profile data into a file, the function
+                 ;; objects are replaced with their "names".  When we see
+                 ;; a string here, that's presumably why, so just print
+                 ;; it as-is.
+		 ((stringp entry) entry)
 		 (t (propertize (help-fns-function-name entry)
 		                ;; Override the `button-map' which
 		                ;; otherwise adds RET, mouse-1, and TAB
diff --git a/nt/preprep.c b/nt/preprep.c
index d1c4f2136cc..4b6fc8112bb 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -804,14 +804,14 @@ main (int argc, char **argv)
     nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew);
 
     nt_header->OptionalHeader.CheckSum = 0;
-//    nt_header->FileHeader.TimeDateStamp = time (NULL);
-//    dos_header->e_cp = size / 512;
-//    nt_header->OptionalHeader.SizeOfImage = size;
+   /* nt_header->FileHeader.TimeDateStamp = time (NULL); */
+   /* dos_header->e_cp = size / 512; */
+   /* nt_header->OptionalHeader.SizeOfImage = size; */
 
     pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile");
     if (pfnCheckSumMappedFile)
       {
-//	nt_header->FileHeader.TimeDateStamp = time (NULL);
+	/* nt_header->FileHeader.TimeDateStamp = time (NULL); */
 	pfnCheckSumMappedFile (out_file.file_base,
 			       out_file.size,
 			       &headersum,
diff --git a/src/unexw32.c b/src/unexw32.c
index d8329be522d..f0a910781cc 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -660,14 +660,14 @@ unexec (const char *new_name, const char *old_name)
     nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew);
 
     nt_header->OptionalHeader.CheckSum = 0;
-//    nt_header->FileHeader.TimeDateStamp = time (NULL);
-//    dos_header->e_cp = size / 512;
-//    nt_header->OptionalHeader.SizeOfImage = size;
+   /* nt_header->FileHeader.TimeDateStamp = time (NULL); */
+   /* dos_header->e_cp = size / 512; */
+   /* nt_header->OptionalHeader.SizeOfImage = size; */
 
     pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile");
     if (pfnCheckSumMappedFile)
       {
-//	nt_header->FileHeader.TimeDateStamp = time (NULL);
+	/* nt_header->FileHeader.TimeDateStamp = time (NULL); */
 	pfnCheckSumMappedFile (out_file.file_base,
 			       out_file.size,
 			       &headersum,