From d7e76a89295826932706081531dde1ab43110329 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Sat, 16 Feb 2013 00:49:29 +0530 Subject: [PATCH] Fix bug#13708 * lisp/icomplete.el (icomplete-minibuffer-map): Unbind `C-s' and `C-r'. Bind `C-.' and `C-,' to `icomplete-forward-completions' and `icomplete-backward-completions'. * lisp/ido.el (ido-init-completion-maps): Bind `C-.' and `C-,' to `ido-next-match' and `ido-prev-match' resply. * lisp/iswitchb.el (iswitchb-read-buffer): Bind `C-.' and `C-,' to `iswitchb-next-match' and `iswitchb-prev-match' resply. --- lisp/ChangeLog | 12 ++++++++++++ lisp/icomplete.el | 4 ++-- lisp/ido.el | 2 ++ lisp/iswitchb.el | 2 ++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9cc086ffe6e..920c953abce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2013-02-15 Jambunathan K + + * iswitchb.el (iswitchb-read-buffer): Bind `C-.' and `C-,' to + `iswitchb-next-match' and `iswitchb-prev-match' resply. + + * ido.el (ido-init-completion-maps): Bind `C-.' and `C-,' to + `ido-next-match' and `ido-prev-match' resply. + + * icomplete.el (icomplete-minibuffer-map): Unbind `C-s' and `C-r'. + Bind `C-.' and `C-,' to `icomplete-forward-completions' and + `icomplete-backward-completions' (Bug#13708). + 2013-02-15 Michael Albinus * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 1f9b4a3afe6..73049df097d 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -168,8 +168,8 @@ except those on this list.") (let ((map (make-sparse-keymap))) (define-key map [?\M-\t] 'minibuffer-force-complete) (define-key map [?\C-j] 'minibuffer-force-complete-and-exit) - (define-key map [?\C-s] 'icomplete-forward-completions) - (define-key map [?\C-r] 'icomplete-backward-completions) + (define-key map [?\C-.] 'icomplete-forward-completions) + (define-key map [?\C-,] 'icomplete-backward-completions) map)) (defun icomplete-forward-completions () diff --git a/lisp/ido.el b/lisp/ido.el index 008561aa268..066d8276af5 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1585,6 +1585,8 @@ This function also adds a hook to the minibuffer." (define-key map "\C-p" 'ido-toggle-prefix) (define-key map "\C-r" 'ido-prev-match) (define-key map "\C-s" 'ido-next-match) + (define-key map [?\C-.] 'ido-next-match) + (define-key map [?\C-,] 'ido-prev-match) (define-key map "\C-t" 'ido-toggle-regexp) (define-key map "\C-z" 'ido-undo-merge-work-directory) (define-key map [(control ?\s)] 'ido-restrict-to-matches) diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index 93d589c7706..68749f1b012 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -471,6 +471,8 @@ interfere with other minibuffer usage.") (define-key map "?" 'iswitchb-completion-help) (define-key map "\C-s" 'iswitchb-next-match) (define-key map "\C-r" 'iswitchb-prev-match) + (define-key map [?\C-.] 'iswitchb-next-match) + (define-key map [?\C-,] 'iswitchb-prev-match) (define-key map "\t" 'iswitchb-complete) (define-key map "\C-j" 'iswitchb-select-buffer-text) (define-key map "\C-t" 'iswitchb-toggle-regexp)