[Emacs-diffs] /srv/bzr/emacs/trunk r100085: * ido.el (ido-minibuffer-setup): Don't set cua-inhibit-cua-keys (Bug#5765).

[Chong Yidong]

------------------------------------------------------------
revno: 100085
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-29 11:41:23 -0400
message:
  * ido.el (ido-minibuffer-setup): Don't set cua-inhibit-cua-keys (Bug#5765).
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-04-28 22:27:54 +0000
+++ b/etc/NEWS  2010-04-29 15:41:23 +0000
@@ -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)).

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-29 15:38:08 +0000
+++ b/lisp/ChangeLog    2010-04-29 15:41:23 +0000
@@ -1,6 +1,7 @@
 2010-04-29  Chong Yidong  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2010-04-29 15:38:08 +0000
+++ b/lisp/ido.el       2010-04-29 15:41:23 +0000
@@ -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)))