diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-09-10 13:12:38 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-09-10 13:12:38 -0700 |
| commit | 0407733ef3d4e8e133e91917097dbc9bcc688b47 (patch) | |
| tree | 9223757d1d54460b3ca0e7867636072a51cd55f2 /lisp/cus-start.el | |
| parent | 6e050694f247671e67c1eabace36cf9792ab4451 (diff) | |
| parent | 7efcdf7b3e70f0334caa328cbb5b05a4e30099bd (diff) | |
| download | emacs-0407733ef3d4e8e133e91917097dbc9bcc688b47.tar.gz | |
Merge from origin/emacs-26
7efcdf7 (origin/emacs-26) Clarify completion text in the ELisp manual
30b0b0e Fix handling of abbreviated control command in gdb-mi.el
5cf282d Clarify documentation of functions reading character events
96281c5 Record :version for built-in variables while dumping
82160cf * src/process.c (connect_network_socket): Fix memory leak. (...
6c616e4 * Makefile.in (appdatadir): Use the non-obsolete location "me...
9618e16 Better fix for bug#32550
30d94e4 Fix Bug#32550
57bcdc7 Don't call XGetGeometry for frames without outer X window (Bu...
82fc6b6 * lisp/calculator.el: Fix doc typo.
ddc7c64 Standardize calc bug reporting instructions
Conflicts:
lisp/cus-start.el
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 1a5b3caea23..88a61753f25 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -711,6 +711,8 @@ since it could result in memory overflow and make Emacs crash." (put symbol 'risky-local-variable (cadr prop))) (if (setq prop (memq :set rest)) (put symbol 'custom-set (cadr prop))) + ;; This is used by describe-variable. + (if version (put symbol 'custom-version version)) ;; Don't re-add to custom-delayed-init-variables post-startup. (unless after-init-time ;; Note this is the _only_ initialize property we handle. @@ -731,7 +733,6 @@ since it could result in memory overflow and make Emacs crash." (custom-add-to-group group symbol 'custom-variable)) ;; Set the type. (put symbol 'custom-type type) - (if version (put symbol 'custom-version version)) (while rest (setq prop (car rest) propval (cadr rest) |