]> git.eshelyaron.com Git - emacs.git/commitdiff
* ido.el (ido-minibuffer-setup): Don't set cua-inhibit-cua-keys (Bug#5765).
authorChong Yidong <cyd@stupidchicken.com>
Thu, 29 Apr 2010 15:41:23 +0000 (11:41 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Thu, 29 Apr 2010 15:41:23 +0000 (11:41 -0400)
etc/NEWS
lisp/ChangeLog
lisp/ido.el

index 1f59ff29edac6f45ddea839402e6cd37ceda5917..e4288684818bccffb45c631a3b67c171a78f7158 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -114,6 +114,9 @@ define it as a scroll command affected by `scroll-preserve-screen-position.
 
 ** Archive Mode has basic support to browse 7z archives.
 
+** In ido-mode, C-v is no longer bound to ido-toggle-vc.
+The reason is that this interferes with cua-mode.
+
 ** partial-completion-mode is now obsolete.
 You can get the same behavior with
 (setq completion-styles '(partial-completion initials)).
index 1e0f4cb554c28cee2e400c6f4a301b47e316a5d1..03a2376d3cdd87f07d2bdbc2d5857f0bbb42bbfd 100644 (file)
@@ -1,6 +1,7 @@
 2010-04-29  Chong Yidong  <cyd@stupidchicken.com>
 
-       * ido.el (ido-init-completion-maps): Remove C-v binding (Bug#5765).
+       * ido.el (ido-init-completion-maps): Remove C-v binding.
+       (ido-minibuffer-setup): Don't set cua-inhibit-cua-keys (Bug#5765).
 
 2010-04-29  Chong Yidong  <cyd@stupidchicken.com>
 
index 625baa8e682ea8a6b5b8d96f480a7c21e7392f88..f75f02969fdb084bea8fa4c8afded9e0a50c6e32 100644 (file)
 
 ;;; Code:
 
-(defvar cua-inhibit-cua-keys)
 (defvar recentf-list)
 
 ;;; User Variables
@@ -4608,7 +4607,6 @@ For details of keybindings, see `ido-find-file'."
   (when (ido-active)
     (add-hook 'pre-command-hook 'ido-tidy nil t)
     (add-hook 'post-command-hook 'ido-exhibit nil t)
-    (setq cua-inhibit-cua-keys t)
     (when (featurep 'xemacs)
       (ido-exhibit)
       (goto-char (point-min)))