diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /src/keymap.c | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index b568f47cba7..db9aa7cbf38 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1292,7 +1292,7 @@ silly_event_symbol_error (Lisp_Object c) | |||
| 1292 | base = XCAR (parsed); | 1292 | base = XCAR (parsed); |
| 1293 | name = Fsymbol_name (base); | 1293 | name = Fsymbol_name (base); |
| 1294 | /* This alist includes elements such as ("RET" . "\\r"). */ | 1294 | /* This alist includes elements such as ("RET" . "\\r"). */ |
| 1295 | assoc = Fassoc (name, exclude_keys); | 1295 | assoc = Fassoc (name, exclude_keys, Qnil); |
| 1296 | 1296 | ||
| 1297 | if (! NILP (assoc)) | 1297 | if (! NILP (assoc)) |
| 1298 | { | 1298 | { |