mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Merge from savannah/emacs-30

Browse source 
d6726e6dfc Further fix of reading and writing profiler data
30b2fae77b * Makefile.in (PREFERRED_BRANCH): Update to emacs-30.
5397808e5b ; Eliminate more C++ comments
1463434907 ; Eliminate C++ comments and typo
This commit is contained in:
Po Lu 2024-08-20 21:57:25 +08:00
commit 4361649901
6 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -1319,7 +1319,7 @@ ChangeLog:
./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
# Check that we are in a good state for changing history. # Check that we are in a good state for changing history.
PREFERRED_BRANCH = emacs-28 PREFERRED_BRANCH = emacs-30
preferred-branch-is-current: preferred-branch-is-current:
git branch | grep -q '^\* $(PREFERRED_BRANCH)$$' git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
unchanged-history-files: unchanged-history-files:

4
lib-src/etags.c
View file

@ -5148,10 +5148,10 @@ Rust_entries (FILE *inf)
cp = skip_spaces(cp); cp = skip_spaces(cp);
name = cp; name = cp;
// Skip 'pub' keyworld /* Skip 'pub' keyword. */
(void)LOOKING_AT (cp, "pub"); (void)LOOKING_AT (cp, "pub");
// Look for define /* Look for define. */
if ((is_func = LOOKING_AT (cp, "fn")) if ((is_func = LOOKING_AT (cp, "fn"))
|| LOOKING_AT (cp, "enum") || LOOKING_AT (cp, "enum")
|| LOOKING_AT (cp, "struct") || LOOKING_AT (cp, "struct")

2
lib-src/movemail.c
View file

@ -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, [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 since it was based on a misunderstanding of how locking calls are
implemented and used on Unix. */ implemented and used on Unix. */
//#define DISABLE_DIRECT_ACCESS /* #define DISABLE_DIRECT_ACCESS */
#include <fcntl.h> #include <fcntl.h>
#endif /* WINDOWSNT */ #endif /* WINDOWSNT */

5
lisp/profiler.el
View file

@ -452,6 +452,11 @@ Do not touch this variable directly.")
(let ((string (cond (let ((string (cond
((eq entry t) ((eq entry t)
"Others") "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) (t (propertize (help-fns-function-name entry)
;; Override the `button-map' which ;; Override the `button-map' which
;; otherwise adds RET, mouse-1, and TAB ;; otherwise adds RET, mouse-1, and TAB

8
nt/preprep.c
View file

@ -804,14 +804,14 @@ main (int argc, char **argv)
nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew); nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew);
nt_header->OptionalHeader.CheckSum = 0; nt_header->OptionalHeader.CheckSum = 0;
// nt_header->FileHeader.TimeDateStamp = time (NULL); /* nt_header->FileHeader.TimeDateStamp = time (NULL); */
// dos_header->e_cp = size / 512; /* dos_header->e_cp = size / 512; */
// nt_header->OptionalHeader.SizeOfImage = size; /* nt_header->OptionalHeader.SizeOfImage = size; */
pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile"); pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile");
if (pfnCheckSumMappedFile) if (pfnCheckSumMappedFile)
{ {
// nt_header->FileHeader.TimeDateStamp = time (NULL); /* nt_header->FileHeader.TimeDateStamp = time (NULL); */
pfnCheckSumMappedFile (out_file.file_base, pfnCheckSumMappedFile (out_file.file_base,
out_file.size, out_file.size,
&headersum, &headersum,

8
src/unexw32.c
View file

@ -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 = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew);
nt_header->OptionalHeader.CheckSum = 0; nt_header->OptionalHeader.CheckSum = 0;
// nt_header->FileHeader.TimeDateStamp = time (NULL); /* nt_header->FileHeader.TimeDateStamp = time (NULL); */
// dos_header->e_cp = size / 512; /* dos_header->e_cp = size / 512; */
// nt_header->OptionalHeader.SizeOfImage = size; /* nt_header->OptionalHeader.SizeOfImage = size; */
pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile"); pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile");
if (pfnCheckSumMappedFile) if (pfnCheckSumMappedFile)
{ {
// nt_header->FileHeader.TimeDateStamp = time (NULL); /* nt_header->FileHeader.TimeDateStamp = time (NULL); */
pfnCheckSumMappedFile (out_file.file_base, pfnCheckSumMappedFile (out_file.file_base,
out_file.size, out_file.size,
&headersum, &headersum,