diff options
| author | Glenn Morris | 2019-05-08 07:51:48 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-05-08 07:51:48 -0700 |
| commit | 8b789755b45e6e10ed2809d7a7b89146b28452fc (patch) | |
| tree | 044d0e819072fe86fddd064ce6b11a975072902b /src | |
| parent | 6734f2168c5f4f68a15325215c2054e7006f0e82 (diff) | |
| parent | 1c6484e975e8b0e50d22980d02a3be6c9bf93b49 (diff) | |
| download | emacs-8b789755b45e6e10ed2809d7a7b89146b28452fc.tar.gz emacs-8b789755b45e6e10ed2809d7a7b89146b28452fc.zip | |
Merge from origin/emacs-26
1c6484e (origin/emacs-26) Fix incorrect cloning of eieio-instance-inh...
37436fe Fix cloning of eieio-named objects (Bug#22840)
fb65a36 Fix ibuffer-unmark-backward synopsis (bug#35572)
f77bd2b ; * src/lisp.h (DEFSYM): Fix inaccurate comment.
3b86e0b Clarify handling of long options (Bug#24949)
04340a8 Improve documentation of the daemon and emacsclient
3e29de2 * etc/NEWS.24: Belatedly announce delete-consecutive-dups.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lisp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index 61cc20e9d42..77f23be66b5 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2236,7 +2236,7 @@ INLINE int | |||
| 2236 | } | 2236 | } |
| 2237 | 2237 | ||
| 2238 | /* Placeholder for make-docfile to process. The actual symbol | 2238 | /* Placeholder for make-docfile to process. The actual symbol |
| 2239 | definition is done by lread.c's defsym. */ | 2239 | definition is done by lread.c's define_symbol. */ |
| 2240 | #define DEFSYM(sym, name) /* empty */ | 2240 | #define DEFSYM(sym, name) /* empty */ |
| 2241 | 2241 | ||
| 2242 | 2242 | ||