# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1272555683 14400
# Node ID 444a324af979a0f17c7650d1677f71b5a65cb717
# Parent  b72ac8ae6ad318a4b75204b237c6dc93f38f363f
* ido.el (ido-minibuffer-setup): Don't set cua-inhibit-cua-keys (Bug#5765).

diff -r b72ac8ae6ad3 -r 444a324af979 etc/NEWS
--- a/etc/NEWS	Thu Apr 29 11:38:08 2010 -0400
+++ b/etc/NEWS	Thu Apr 29 11:41:23 2010 -0400
@@ -114,6 +114,9 @@
 
 ** 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)).
diff -r b72ac8ae6ad3 -r 444a324af979 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 29 11:38:08 2010 -0400
+++ b/lisp/ChangeLog	Thu Apr 29 11:41:23 2010 -0400
@@ -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>
 
diff -r b72ac8ae6ad3 -r 444a324af979 lisp/ido.el
--- a/lisp/ido.el	Thu Apr 29 11:38:08 2010 -0400
+++ b/lisp/ido.el	Thu Apr 29 11:41:23 2010 -0400
@@ -322,7 +322,6 @@
 
 ;;; Code:
 
-(defvar cua-inhibit-cua-keys)
 (defvar recentf-list)
 
 ;;; User Variables
@@ -4608,7 +4607,6 @@
   (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)))