diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-13 18:13:26 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-13 18:13:26 -0700 |
| commit | e0f18aa07fb900c1bb0fe25386336fd6a73c9b0d (patch) | |
| tree | 893b95bcdf8d4a0b1e105c45b1aaf1d7b5e31a32 /lisp/allout.el | |
| parent | ae80854e9a9f8f6733870b5b5a88467867dceb6c (diff) | |
| parent | 675edecf6102a20b3482544315c654fde4b6236e (diff) | |
| download | emacs-e0f18aa07fb900c1bb0fe25386336fd6a73c9b0d.tar.gz | |
Merge from origin/emacs-26
675edec (origin/emacs-26) Fix some allout.el aliases
b2c069a * lisp/progmodes/ada-mode.el (ada-clean-buffer-before-saving)...
2f5420c Doc fixes re obsolete items
9edf82a Replace an obsolete alias in tpu-mapper
a643792 Doc fixes re obsolete items
3060fb8 Minor changes in mule.texi
3e39897 Avoid assertion violation under visual-order-cursor-movement
e4b73ab Stop mentioning options.el in doc
05669f0 ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last...
758597f * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation.
62f0a2b * lisp/minibuffer.el (completion-cycle-threshold): Doc fix.
761845c Fix last change in Xref documentation
5186675 More changes in the Emacs manual
b1aaa72 Improve documentation of Xref
Conflicts:
lisp/w32-fns.el
Diffstat (limited to 'lisp/allout.el')
| -rw-r--r-- | lisp/allout.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/allout.el b/lisp/allout.el index a0456d5bd26..af71ea75ce0 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1522,7 +1522,7 @@ the Emacs buffer state, if file variable adjustments are enabled. See `allout-enable-file-variable-adjustment' for details about that.") (make-variable-buffer-local 'allout-passphrase-verifier-string) (make-obsolete-variable 'allout-passphrase-verifier-string - 'allout-passphrase-verifier-string "23.3") + "it is no longer used." "23.3") ;;;###autoload (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp) ;;;_ = allout-passphrase-hint-string @@ -1538,7 +1538,7 @@ state, if file variable adjustments are enabled. See (make-variable-buffer-local 'allout-passphrase-hint-string) (setq-default allout-passphrase-hint-string "") (make-obsolete-variable 'allout-passphrase-hint-string - 'allout-passphrase-hint-string "23.3") + "it is no longer used." "23.3") ;;;###autoload (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp) ;;;_ = allout-after-save-decrypt |