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

This commit is contained in:
Jonas Bernoulli 2020-08-08 13:50:06 +02:00 committed by David Bremner
parent 08b26f449d
commit 96baa22318
2 changed files with 0 additions and 31 deletions

View file

@ -425,20 +425,6 @@ the From: header is already filled in by notmuch."
(defvar notmuch-mua-sender-history 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 () (defun notmuch-mua-prompt-for-sender ()
"Prompt for a sender from the user's configured identities." "Prompt for a sender from the user's configured identities."
(if notmuch-identities (if notmuch-identities

View file

@ -34,23 +34,6 @@
;; `read' call. ;; `read' call.
(setq read-file-name-function (lambda (&rest _) (read))) (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 () (defun notmuch-test-wait ()
"Wait for process completion." "Wait for process completion."
(while (get-buffer-process (current-buffer)) (while (get-buffer-process (current-buffer))