diff options
| author | Paul Eggert | 2016-02-09 14:23:09 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-02-09 14:23:09 -0800 |
| commit | fdc2da4ef44b32e2dd360defc9bd64d644ed1783 (patch) | |
| tree | 0c4c996897292cec2115b21f40db68836af0190e /lisp/erc | |
| parent | f414fe61dd5e9f54c562adc65739305198173001 (diff) | |
| parent | 2c117fc7e283ad20f404c392be433c74f5cf8a4e (diff) | |
| download | emacs-fdc2da4ef44b32e2dd360defc9bd64d644ed1783.tar.gz emacs-fdc2da4ef44b32e2dd360defc9bd64d644ed1783.zip | |
Merge from origin/emacs-25
2c117fc * etc/NEWS: Document new mpc.el features
71a0496 * lisp/custom.el (defface): Revert indentation change. (Bug#22524)
9dfece1 Correctly fontify C++ initializations which "look like" functions.
4485222 Improve newsticker-treeview-selection-face
4236944 Minor fix in tagging Ruby accessors by etags
35fc77d Spelling fixes
3dda110 Remove 'def X' from the example
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 98ea594e164..d52a83b1029 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el | |||
| @@ -3997,7 +3997,7 @@ Prompt for one if called interactively." | |||
| 3997 | (format "MODE %s -k" tgt))))) | 3997 | (format "MODE %s -k" tgt))))) |
| 3998 | 3998 | ||
| 3999 | (defun erc-completion-at-point () | 3999 | (defun erc-completion-at-point () |
| 4000 | "Perform complection on the text around point case-insentitively. | 4000 | "Perform completion on the text around point case-insensitively. |
| 4001 | See `completion-at-point'." | 4001 | See `completion-at-point'." |
| 4002 | (interactive) | 4002 | (interactive) |
| 4003 | (let ((completion-ignore-case t)) | 4003 | (let ((completion-ignore-case t)) |