aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-04 17:51:53 +1100
committerLars Ingebrigtsen2016-02-04 17:51:53 +1100
commitb99141da55d130cdf6d50b9247a6c10d925a7238 (patch)
treeb6394db67bd35e5aa6b1656239103313f9bf1381
parent66c462005cc873d8e9dee684d525daa036d4f757 (diff)
downloademacs-b99141da55d130cdf6d50b9247a6c10d925a7238.tar.gz
emacs-b99141da55d130cdf6d50b9247a6c10d925a7238.zip
Make erc completion case-insensitive again
* lisp/erc/erc.el (erc-completion-at-point): Make erc completion case-insensitive again (bug#11360).
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/erc/erc.el9
2 files changed, 12 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index a3d9e84cc6e..d4691b908e8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -428,6 +428,10 @@ specified message types for the respective specified targets.
428--- 428---
429*** Reconnection is now asynchronous. 429*** Reconnection is now asynchronous.
430 430
431---
432*** Nick completion is now case-insentive again after inadvertently
433being made case-sensitive in Emacs 24.2.
434
431** Midnight-mode 435** Midnight-mode
432 436
433--- 437---
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 51ab20e330a..7b734460a3c 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1141,7 +1141,7 @@ which the local user typed."
1141 (define-key map "\C-c\C-u" 'erc-kill-input) 1141 (define-key map "\C-c\C-u" 'erc-kill-input)
1142 (define-key map "\C-c\C-x" 'erc-quit-server) 1142 (define-key map "\C-c\C-x" 'erc-quit-server)
1143 (define-key map "\M-\t" 'ispell-complete-word) 1143 (define-key map "\M-\t" 'ispell-complete-word)
1144 (define-key map "\t" 'completion-at-point) 1144 (define-key map "\t" 'erc-completion-at-point)
1145 1145
1146 ;; Suppress `font-lock-fontify-block' key binding since it 1146 ;; Suppress `font-lock-fontify-block' key binding since it
1147 ;; destroys face properties. 1147 ;; destroys face properties.
@@ -3991,6 +3991,13 @@ Prompt for one if called interactively."
3991 (format "MODE %s +k %s" tgt key) 3991 (format "MODE %s +k %s" tgt key)
3992 (format "MODE %s -k" tgt))))) 3992 (format "MODE %s -k" tgt)))))
3993 3993
3994(defun erc-completion-at-point ()
3995 "Perform complection on the text around point case-insentitively.
3996See `completion-at-point'."
3997 (interactive)
3998 (let ((completion-ignore-case t))
3999 (completion-at-point)))
4000
3994(defun erc-quit-server (reason) 4001(defun erc-quit-server (reason)
3995 "Disconnect from current server after prompting for REASON. 4002 "Disconnect from current server after prompting for REASON.
3996`erc-quit-reason' works with this just like with `erc-cmd-QUIT'." 4003`erc-quit-reason' works with this just like with `erc-cmd-QUIT'."