diff options
| author | Chong Yidong | 2010-04-29 11:38:08 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-04-29 11:38:08 -0400 |
| commit | 09d0284d726bbc5b3ceabdad6131c9d1e902a712 (patch) | |
| tree | 50d5896fa827e30ebfd04216b21de89dd9720cab | |
| parent | 3a07ffce2fe88d64f98deb072c3d35b61bb0a81a (diff) | |
| download | emacs-09d0284d726bbc5b3ceabdad6131c9d1e902a712.tar.gz emacs-09d0284d726bbc5b3ceabdad6131c9d1e902a712.zip | |
* ido.el (ido-init-completion-maps): Remove C-v binding (Bug#5765).
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ido.el | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e04ebf63812..1e0f4cb554c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2010-04-29 Chong Yidong <cyd@stupidchicken.com> | 1 | 2010-04-29 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * ido.el (ido-init-completion-maps): Remove C-v binding (Bug#5765). | ||
| 4 | |||
| 5 | 2010-04-29 Chong Yidong <cyd@stupidchicken.com> | ||
| 6 | |||
| 3 | * minibuffer.el (tags-completion-at-point-function): New function. | 7 | * minibuffer.el (tags-completion-at-point-function): New function. |
| 4 | (completion-at-point-functions): Use it. | 8 | (completion-at-point-functions): Use it. |
| 5 | 9 | ||
diff --git a/lisp/ido.el b/lisp/ido.el index 101ef0438ea..625baa8e682 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -1624,7 +1624,6 @@ This function also adds a hook to the minibuffer." | |||
| 1624 | (define-key map "\C-o" 'ido-copy-current-word) | 1624 | (define-key map "\C-o" 'ido-copy-current-word) |
| 1625 | (define-key map "\C-w" 'ido-copy-current-file-name) | 1625 | (define-key map "\C-w" 'ido-copy-current-file-name) |
| 1626 | (define-key map [(meta ?l)] 'ido-toggle-literal) | 1626 | (define-key map [(meta ?l)] 'ido-toggle-literal) |
| 1627 | (define-key map "\C-v" 'ido-toggle-vc) | ||
| 1628 | (set-keymap-parent map ido-file-dir-completion-map) | 1627 | (set-keymap-parent map ido-file-dir-completion-map) |
| 1629 | (setq ido-file-completion-map map)) | 1628 | (setq ido-file-completion-map map)) |
| 1630 | 1629 | ||