From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 29 Apr 2010 15:41:23 +0000 (-0400)
Subject: * ido.el (ido-minibuffer-setup): Don't set cua-inhibit-cua-keys (Bug#5765).
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~339
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=27d3cd56caf8cfac459bd114cb184989d2c62423;p=emacs.git

* ido.el (ido-minibuffer-setup): Don't set cua-inhibit-cua-keys (Bug#5765).
---

diff --git a/etc/NEWS b/etc/NEWS
index 1f59ff29eda..e4288684818 100644
--- 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)).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e0f4cb554c..03a2376d3cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/ido.el b/lisp/ido.el
index 625baa8e682..f75f02969fd 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -322,7 +322,6 @@
 
 ;;; 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)))