diff options
| author | Glenn Morris | 2020-01-28 07:50:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-01-28 07:50:22 -0800 |
| commit | 60a3c5d56c5684913e1ae77464d7c9e71bc04560 (patch) | |
| tree | eff936192f906634481b5035a93cb138a2a4f005 /lisp/erc | |
| parent | 5ee3c37634f7f8651b2da1f4b611334a2b146928 (diff) | |
| parent | 1bcac29b2f9980bf47f64217a3b6be5979051fe6 (diff) | |
| download | emacs-60a3c5d56c5684913e1ae77464d7c9e71bc04560.tar.gz emacs-60a3c5d56c5684913e1ae77464d7c9e71bc04560.zip | |
Merge from origin/emacs-27
1bcac29b2f (origin/emacs-27) dns-mode-soa-auto-increment-serial: safe...
abf0f8666d * lisp/wdired.el: Clean out isearch-filter-predicate (bug#...
c31c31e57f ; Spelling and URL fixes
066aad7b9d Finish the documentation for c-noise-macro-{,with-parens-}...
c8fcabf245 Correct regexp for flags in `format' doc string
2e9a153b26 Moderate recommendation to escape '(' in doc strings
d7cd4ab7d9 Objective C Mode: Make c-forward-type work with "unsigned ...
1705e32ebc Fix help text about configure module support
baca81e641 * doc/lispref/streams.texi (Output Functions): Improve ind...
568a560fce Improve doc string of 'newline'
7f50698505 Improve doc of eq on bignums etc.
e5327a569c Do not refer to obsolete alias
fd09196781 ; Clarify what time-stamp-active enables
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc-pcomplete.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el index 457fd07ecc8..65b0f660275 100644 --- a/lisp/erc/erc-pcomplete.el +++ b/lisp/erc/erc-pcomplete.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Sacha Chua <sacha@free.net.ph> | 5 | ;; Author: Sacha Chua <sacha@free.net.ph> |
| 6 | ;; Maintainer: Amin Bandali <mab@gnu.org> | 6 | ;; Maintainer: Amin Bandali <mab@gnu.org> |
| 7 | ;; Keywords: comm, convenience | 7 | ;; Keywords: comm, convenience |
| 8 | ;; URL: http://wwws.emacswiki.org/emacs/ErcCompletion | 8 | ;; URL: https://www.emacswiki.org/emacs/ErcCompletion |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||