diff options
| author | Glenn Morris | 2018-04-10 07:50:48 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-04-10 07:50:48 -0700 |
| commit | 587f12281aeac6847fff55243572bad5b3828873 (patch) | |
| tree | 3843374bdc712251171797bfe3f22e6459d7b54c /src | |
| parent | fbe04ad8462ca2eccc58e7a325f6aa42e44a8c6f (diff) | |
| parent | c267421647510319d2a70554e42f0d1c394dba0a (diff) | |
| download | emacs-587f12281aeac6847fff55243572bad5b3828873.tar.gz emacs-587f12281aeac6847fff55243572bad5b3828873.zip | |
Merge from origin/emacs-26
c267421 (tag: emacs-26.1-rc1, origin/emacs-26) ; * ChangeLog.3: Update.
aa77415 * etc/AUTHORS: Regenerate.
c8ffca5 * lisp/files.el (kept-new-versions): Improve documentation st...
3a798f6 Fix a minor mistake in the ELisp manual
6afa868 ; * src/dispextern.h (struct it): Fix a typo in a comment.
5659b2f * lisp/files.el (find-file-literally): Doc fix.
9b24a79 Fix typos in doc strings
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 25d51cdd638..bc2a76f1e02 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -2420,7 +2420,7 @@ struct it | |||
| 2420 | /* Face to use. */ | 2420 | /* Face to use. */ |
| 2421 | int face_id; | 2421 | int face_id; |
| 2422 | 2422 | ||
| 2423 | /* Setting of buffer-local variable selective-display-ellipsis. */ | 2423 | /* Setting of buffer-local variable selective-display-ellipses. */ |
| 2424 | bool_bf selective_display_ellipsis_p : 1; | 2424 | bool_bf selective_display_ellipsis_p : 1; |
| 2425 | 2425 | ||
| 2426 | /* True means control characters are translated into the form `^C' | 2426 | /* True means control characters are translated into the form `^C' |