[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100250: * lisp/ido.el (ido-common-initilization): New function.

[Stefan Monnier]

------------------------------------------------------------
revno: 100250
author: Leo <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-12-01 17:34:09 -0500
message:
  * lisp/ido.el (ido-common-initilization): New function. 
  (ido-mode): Use it.
  (ido-completing-read): Call it.
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-27 19:41:49 +0000
+++ b/lisp/ChangeLog    2010-12-01 22:34:09 +0000
@@ -1,3 +1,9 @@
+2010-12-01  Leo  <address@hidden>
+
+       * ido.el (ido-common-initilization): New function.  (bug#3274)
+       (ido-mode): Use it.
+       (ido-completing-read): Call it.
+
 2010-11-27  Chong Yidong  <address@hidden>
 
        * log-edit.el (log-edit-font-lock-keywords): Don't try matching

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2010-08-21 13:35:27 +0000
+++ b/lisp/ido.el       2010-12-01 22:34:09 +0000
@@ -1439,6 +1439,11 @@
   ;; ido kill emacs hook
   (ido-save-history))
 
+(defun ido-common-initilization ()
+  (ido-init-completion-maps)
+  (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup)
+  (add-hook 'choose-completion-string-functions 'ido-choose-completion-string))
+
 (define-minor-mode ido-everywhere
   "Toggle using ido speed-ups everywhere file and directory names are read.
 With ARG, turn ido speed-up on if arg is positive, off otherwise."
@@ -1482,12 +1487,9 @@
         (t nil)))
 
   (ido-everywhere (if ido-everywhere 1 -1))
-  (when ido-mode
-    (ido-init-completion-maps))
 
   (when ido-mode
-    (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup)
-    (add-hook 'choose-completion-string-functions 
'ido-choose-completion-string)
+    (ido-common-initilization)
     (ido-load-history)
 
     (add-hook 'kill-emacs-hook 'ido-kill-emacs-hook)
@@ -4679,6 +4681,8 @@
        (ido-directory-too-big nil)
        (ido-context-switch-command 'ignore)
        (ido-choice-list choices))
+    ;; Initialize ido before invoking ido-read-internal
+    (ido-common-initilization)
     (ido-read-internal 'list prompt hist def require-match initial-input)))
 
 (defun ido-unload-function ()