From 1463434907eeccd077f5d3c00309d1e75c7d63f4 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 17 Aug 2024 22:01:03 +0800 Subject: [PATCH 1/4] ; Eliminate C++ comments and typo * lib-src/etags.c (Rust_entries): Eliminate C++ comments and typo. --- lib-src/etags.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-src/etags.c b/lib-src/etags.c index 03bc55de03d..cbd5fed5e24 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -5144,10 +5144,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") From 5397808e5bc314ca7ff6a707c153e59cf141008b Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 17 Aug 2024 22:03:55 +0800 Subject: [PATCH 2/4] ; Eliminate more C++ comments * lib-src/movemail.c: * nt/preprep.c (main): * src/unexw32.c (unexec): Convert C++-style comments to C. --- lib-src/movemail.c | 2 +- nt/preprep.c | 8 ++++---- src/unexw32.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) 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 . */ [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 #endif /* WINDOWSNT */ 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, From 30b2fae77b7c9e03b64ea36ee327d380f94123b3 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sat, 17 Aug 2024 18:25:46 +0200 Subject: [PATCH 3/4] * Makefile.in (PREFERRED_BRANCH): Update to emacs-30. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 20394cb333d..1964fbbf8a9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1313,7 +1313,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: From d6726e6dfc7f0a5133a0489bcdc21f10844692f2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 17 Aug 2024 13:35:07 -0400 Subject: [PATCH 4/4] Further fix of reading and writing profiler data * lisp/profiler.el (profiler-report-make-entry-part): Print strings as-is. (Bug#72559) --- lisp/profiler.el | 5 +++++ 1 file changed, 5 insertions(+) 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