summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keymap.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3bc2cbefc9f..765c9eb3757 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-08 Sam Steingold <sds@gnu.org>
+
+ * keymap.c (current-active-maps): Quote newlines (compilation error).
+
2001-10-08 Eli Zaretskii <eliz@is.elta.co.il>
* Makefile.in (lisp, shortlisp): Replace bindings.el with
diff --git a/src/keymap.c b/src/keymap.c
index d4f23bb3dab..e41af212eb0 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1254,8 +1254,8 @@ current_minor_maps (modeptr, mapptr)
DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps,
0, 1, 0,
- "Return a list of the currently active keymaps.
-OLP if non-nil indicates that we should obey `overriding-local-map' and
+ "Return a list of the currently active keymaps.\n\
+OLP if non-nil indicates that we should obey `overriding-local-map' and\n\
`overriding-terminal-local-map'.")
(olp)
Lisp_Object olp;