summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2024-08-20 21:57:25 +0800
committerPo Lu <luangruo@yahoo.com>2024-08-20 21:57:25 +0800
commit4361649901667b4efe89e560c36f3047634de8ec (patch)
tree587f9716c2141d3bffeca2487157e9efb8a01971 /lib-src
parent5e940a353e37a4867758d13a32928ed18fc437dc (diff)
parentd6726e6dfc7f0a5133a0489bcdc21f10844692f2 (diff)
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
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/etags.c4
-rw-r--r--lib-src/movemail.c2
2 files changed, 3 insertions, 3 deletions
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 */