masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 02:43:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

4
lib-src/etags.c
View file

@ -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")

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,
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 */