diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-20 08:59:39 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-20 08:59:39 -0700 |
commit | a5f190dd658419e9328a846a1044b8294a7632d9 (patch) | |
tree | 551602b98e8d918935d9e36d5f03daafbc710305 /lisp/eshell/em-cmpl.el | |
parent | 97608c60b8e0d01d59d51e32a9fdbd2bb3e2da58 (diff) | |
parent | 23527013c79607ba19536ccce85725a91b0033a5 (diff) | |
download | emacs-a5f190dd658419e9328a846a1044b8294a7632d9.tar.gz |
Merge from origin/emacs-26
23527013c7 ; Rewrap doc string
4328d5f744 Correct Info link markup
2fb52abd9e Improve documentation of 'with-help-window'
ec08c62f03 Minor improvements in building.texi
663aafe1ff * lisp/textmodes/bibtex.el (bibtex-mark-entry): activate mark
05781b2e88 ; Spelling fix
aa40014ba3 * doc/emacs/building.texi (Starting GUD): Mention 'guiler'.
23072e468f Yet more proofreading of the Emacs manual
ba5a372540 * doc/emacs/rmail.texi: Fix broken link.
6b2210cc29 ; Spelling fix
067c8c4f5b Fix recently-added POP doc glitch
fb3dc0e8aa More proofreading of the Emacs manual
a776ce7be6 Fix typo in the Emacs manual's VC chapter
7f27d42f0b Pass json-readtable-error data as a list (bug#30489)
10bd3b3af8 Improve word motion docs (Bug#30815)
2b8507fbdc Replace "carriage-return" by "carriage return" in manuals
2616cd94f1 Minor copyedits in mule.texi
36a1d52814 Fix problems caused by fontconfig-2.13.0
Diffstat (limited to 'lisp/eshell/em-cmpl.el')
-rw-r--r-- | lisp/eshell/em-cmpl.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index a9b29aef4c0..e79b49095f2 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -167,7 +167,7 @@ to writing a completion function." (eshell-cmpl--custom-variable-docstring 'pcomplete-suffix-list) :type (get 'pcomplete-suffix-list 'custom-type) :group 'pcomplete) -;; Only labelled obsolete in 26.1, but all it does it set +;; Only labeled obsolete in 26.1, but all it does it set ;; pcomplete-suffix-list, which is itself obsolete since 24.1. (make-obsolete-variable 'eshell-cmpl-suffix-list nil "24.1") |