From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Mon, 27 Jan 2014 20:23:37 +0000 (+0200)
Subject: emacs: initialize ido(-completing-read) in emacs 23.[123]
X-Git-Tag: 0.18_rc0~164
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=9c1bc977d79808fca5b4fd0c584570bd4da90bef

emacs: initialize ido(-completing-read) in emacs 23.[123]

Otherwise `ido-completing-read' will freeze after PROMPT is displayed.
---

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 00cd9808..481abd7c 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -287,6 +287,19 @@ 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.
+(if (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 ()
   (interactive)
   (let (name addresses one-name-only)