diff options
| author | Marcin Borkowski <mbork@mbork.pl> | 2017-12-07 14:24:57 +0100 |
|---|---|---|
| committer | Marcin Borkowski <mbork@mbork.pl> | 2017-12-07 14:24:57 +0100 |
| commit | 0e3c10ce34c84d24013a84a725c6275ad87b1530 (patch) | |
| tree | c37c89b1087a00e4d4799e6f4123c48ffca30270 /src/keymap.c | |
| parent | ab5fc7c8215e1066449da4eb0e027f8250cc9f49 (diff) | |
| parent | d4db37b283daffa0f8c942a5b526b6444edc34c5 (diff) | |
| download | emacs-0e3c10ce34c84d24013a84a725c6275ad87b1530.tar.gz | |
Merge branch 'master' into fix/bug-20871
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c index b568f47cba7..ccf8ce79175 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ +along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ /* Old BUGS: - [M-C-a] != [?\M-\C-a] @@ -1292,7 +1292,7 @@ silly_event_symbol_error (Lisp_Object c) base = XCAR (parsed); name = Fsymbol_name (base); /* This alist includes elements such as ("RET" . "\\r"). */ - assoc = Fassoc (name, exclude_keys); + assoc = Fassoc (name, exclude_keys, Qnil); if (! NILP (assoc)) { |