diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:43 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:43 -0700 |
| commit | 602866264917f0772ceab356e3206a139719d2c5 (patch) | |
| tree | b5ae4aa29442919364d93de63834997ce6696ec7 /lisp/files.el | |
| parent | 5fb3782e95d512ddb9a23e7d713de5980c7c4c2a (diff) | |
| parent | 008b263feeba8951a95bec93ec0a9e263cf230f7 (diff) | |
| download | emacs-602866264917f0772ceab356e3206a139719d2c5.tar.gz | |
Merge from origin/emacs-26
008b263 (origin/emacs-26, emacs-26) * lisp/gnus/gnus.el: Mark autoloa...
daf32f1 Speed up redisplay of HELLO
d8a6d82 Improve documentation of 'safe-local-variable' property
# Conflicts:
# etc/HELLO
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/files.el b/lisp/files.el index 287ad14aecf..5bac49a74e4 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3298,6 +3298,7 @@ asking you for confirmation." (fill-column . integerp) ;; C source code (indent-tabs-mode . booleanp) ;; C source code (left-margin . integerp) ;; C source code + (inhibit-compacting-font-caches . booleanp) ;; C source code (no-update-autoloads . booleanp) (lexical-binding . booleanp) ;; C source code (tab-width . integerp) ;; C source code |