From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id jihcHwCSLl//fwAA0tVLHw (envelope-from ) for ; Sat, 08 Aug 2020 11:52:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id UKzKGgCSLl84PAAAB5/wlQ (envelope-from ) for ; Sat, 08 Aug 2020 11:52:32 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0C6C4940903 for ; Sat, 8 Aug 2020 11:52:32 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 1AA9729B7A; Sat, 8 Aug 2020 07:51:33 -0400 (EDT) Received: from mail.hostpark.net (mail.hostpark.net [212.243.197.30]) by mail.notmuchmail.org (Postfix) with ESMTPS id 4399A29ACD for ; Sat, 8 Aug 2020 07:50:15 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id 8FFA016B6D for ; Sat, 8 Aug 2020 13:50:11 +0200 (CEST) X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail0.hostpark.net [127.0.0.1]) (amavisd-new, port 10124) with ESMTP id wwV2VBl4OMLs for ; Sat, 8 Aug 2020 13:50:11 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.hostpark.net (Postfix) with ESMTPSA id 6289C16A8A for ; Sat, 8 Aug 2020 13:50:11 +0200 (CEST) From: Jonas Bernoulli To: notmuch@notmuchmail.org Subject: [PATCH v3 31/34] emacs: Drop old advices that were only need for Emacs 23 Date: Sat, 8 Aug 2020 13:50:06 +0200 Message-Id: <20200808115009.24071-32-jonas@bernoul.li> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200808115009.24071-1-jonas@bernoul.li> References: <20200726165818.400-1-jonas@bernoul.li> <20200808115009.24071-1-jonas@bernoul.li> MIME-Version: 1.0 Message-ID-Hash: G4WTUKABCJ5GJGEYZBJ4PPIKB3OWO7QX X-Message-ID-Hash: G4WTUKABCJ5GJGEYZBJ4PPIKB3OWO7QX X-MailFrom: jonas@bernoul.li X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 0.03 X-TUID: DrvyVzHDATYP --- emacs/notmuch-mua.el | 14 -------------- test/test-lib.el | 17 ----------------- 2 files changed, 31 deletions(-) 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 @@ (defcustom notmuch-always-prompt-for-sender nil (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 @@ (require 'smtpmail) ;; `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)) -- 2.28.0