diff options
| author | Glenn Morris | 2018-02-17 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-17 07:50:28 -0800 |
| commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
| tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /src/keymap.c | |
| parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
| parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
| download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip | |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
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 80a899b5755..c8cc933e782 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1278,7 +1278,7 @@ append_key (Lisp_Object key_sequence, Lisp_Object key) | |||
| 1278 | return CALLN (Fvconcat, key_sequence, key_list); | 1278 | return CALLN (Fvconcat, key_sequence, key_list); |
| 1279 | } | 1279 | } |
| 1280 | 1280 | ||
| 1281 | /* Given a event type C which is a symbol, | 1281 | /* Given an event type C which is a symbol, |
| 1282 | signal an error if is a mistake such as RET or M-RET or C-DEL, etc. */ | 1282 | signal an error if is a mistake such as RET or M-RET or C-DEL, etc. */ |
| 1283 | 1283 | ||
| 1284 | static void | 1284 | static void |