diff options
| author | Sam Steingold | 2001-10-08 13:33:20 +0000 |
|---|---|---|
| committer | Sam Steingold | 2001-10-08 13:33:20 +0000 |
| commit | 0c4d9527dd66841f3c42f0405dc0f70415618e19 (patch) | |
| tree | 4dac62a00147f811c22af11e4854540879866d95 /src | |
| parent | 9985827feca70e0ba3f370603763c144f79b1f41 (diff) | |
| download | emacs-0c4d9527dd66841f3c42f0405dc0f70415618e19.tar.gz emacs-0c4d9527dd66841f3c42f0405dc0f70415618e19.zip | |
current-active-maps: quote newlines
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keymap.c | 4 |
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 @@ | |||
| 1 | 2001-10-08 Sam Steingold <sds@gnu.org> | ||
| 2 | |||
| 3 | * keymap.c (current-active-maps): Quote newlines (compilation error). | ||
| 4 | |||
| 1 | 2001-10-08 Eli Zaretskii <eliz@is.elta.co.il> | 5 | 2001-10-08 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 6 | ||
| 3 | * Makefile.in (lisp, shortlisp): Replace bindings.el with | 7 | * 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) | |||
| 1254 | 1254 | ||
| 1255 | DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, | 1255 | DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, |
| 1256 | 0, 1, 0, | 1256 | 0, 1, 0, |
| 1257 | "Return a list of the currently active keymaps. | 1257 | "Return a list of the currently active keymaps.\n\ |
| 1258 | OLP if non-nil indicates that we should obey `overriding-local-map' and | 1258 | OLP if non-nil indicates that we should obey `overriding-local-map' and\n\ |
| 1259 | `overriding-terminal-local-map'.") | 1259 | `overriding-terminal-local-map'.") |
| 1260 | (olp) | 1260 | (olp) |
| 1261 | Lisp_Object olp; | 1261 | Lisp_Object olp; |