X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=dcddca76794f8e03f6a8f3665e13baf61a9859f4;hb=ee26cae09345df9534b2fe36f10ff8aed57f2422;hp=2910a63e571830c6adbe8a1ac9cb1c7ca31b0b3f;hpb=e1a700067a22214f54064c281219fbbbef87de06;p=notmuch

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 2910a63e..dcddca76 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -337,7 +337,7 @@ Typically this is added to `notmuch-mua-send-hook'."
 
 (defun notmuch-mua-pop-to-buffer (name switch-function)
   "Pop to buffer NAME, and warn if it already exists and is
-modified. This function is notmuch addaptation of
+modified. This function is notmuch adaptation of
 `message-pop-to-buffer'."
   (let ((buffer (get-buffer name)))
     (if (and buffer
@@ -425,20 +425,6 @@ the From: header is already filled in by notmuch."
 
 (defvar notmuch-mua-sender-history nil)
 
-;; Workaround: Running `ido-completing-read' in emacs 23.1, 23.2 and 23.3
-;; without some explicit initialization fill freeze the operation.
-;; Hence, we advice `ido-completing-read' to ensure required initialization
-;; is done.
-(when (and (= emacs-major-version 23)
-	   (< emacs-minor-version 4))
-  (defadvice ido-completing-read (before notmuch-ido-mode-init activate)
-    (ido-init-completion-maps)
-    (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup)
-    (add-hook 'choose-completion-string-functions
-	      'ido-choose-completion-string)
-    (ad-disable-advice 'ido-completing-read 'before 'notmuch-ido-mode-init)
-    (ad-activate 'ido-completing-read)))
-
 (defun notmuch-mua-prompt-for-sender ()
   "Prompt for a sender from the user's configured identities."
   (if notmuch-identities