From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sat, 8 Aug 2020 11:50:06 +0000 (+0200)
Subject: emacs: Drop old advices that were only need for Emacs 23
X-Git-Tag: 0.31_rc0~14
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=96baa2231882e9a9025797b1f9945ba6b2751dd4

emacs: Drop old advices that were only need for Emacs 23
---

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index f321e0c6..dcddca76 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -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
diff --git a/test/test-lib.el b/test/test-lib.el
index 2def7ffe..044c2da4 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -34,23 +34,6 @@
 ;; `read' call.
 (setq read-file-name-function (lambda (&rest _) (read)))
 
-;; Work around a bug in emacs 23.1 and emacs 23.2 which prevents
-;; noninteractive (kill-emacs) from emacsclient.
-(when (and (= emacs-major-version 23) (< emacs-minor-version 3))
-  (defadvice kill-emacs (before disable-yes-or-no-p activate)
-    "Disable yes-or-no-p before executing kill-emacs"
-    (defun yes-or-no-p (prompt) t)))
-
-;; Emacs bug #2930:
-;;	23.0.92; `accept-process-output' and `sleep-for' do not run sentinels
-;; seems to be present in Emacs 23.1.
-;; Running `list-processes' after `accept-process-output' seems to work
-;; around this problem.
-(when (and (= emacs-major-version 23) (= emacs-minor-version 1))
-  (defadvice accept-process-output (after run-list-processes activate)
-    "run list-processes after executing accept-process-output"
-    (list-processes)))
-
 (defun notmuch-test-wait ()
   "Wait for process completion."
   (while (get-buffer-process (current-buffer))