;; `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.
-(if (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.
-(if (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))
(let (str)
(while (< start end)
(let ((next-pos (next-char-property-change start end)))
- (when (not (invisible-p start))
+ (unless (invisible-p start)
(setq str (concat str (buffer-substring-no-properties
start next-pos))))
(setq start next-pos)))
(defun orphan-watchdog-check (pid)
"Periodically check that the process with id PID is still
running, quit if it terminated."
- (if (not (test-process-running pid))
- (kill-emacs)))
+ (unless (test-process-running pid)
+ (kill-emacs)))
(defun orphan-watchdog (pid)
"Initiate orphan watchdog check."
(add-hook 'notmuch-hello-refresh-hook
(lambda () (cl-incf notmuch-hello-refresh-hook-counter)))
-(defadvice notmuch-search-process-filter (around pessimal activate disable)
- "Feed notmuch-search-process-filter one character at a time."
- (let ((string (ad-get-arg 1)))
- (cl-loop for char across string
- do (progn
- (ad-set-arg 1 (char-to-string char))
- ad-do-it))))
-
(defun notmuch-test-mark-links ()
"Enclose links in the current buffer with << and >>."
;; Links are often created by jit-lock functions
"Output:\t" (prin1-to-string output) "\n"))
(defun notmuch-test-expect-equal (output expected)
- "Compare OUTPUT with EXPECTED. Report any discrepencies."
- (if (equal output expected)
- t
- (cond
- ((and (listp output)
- (listp expected))
- ;; Reporting the difference between two lists is done by
- ;; reporting differing elements of OUTPUT and EXPECTED
- ;; pairwise. This is expected to make analysis of failures
- ;; simpler.
- (apply #'concat (cl-loop for o in output
- for e in expected
- if (not (equal o e))
- collect (notmuch-test-report-unexpected o e))))
-
- (t
- (notmuch-test-report-unexpected output expected)))))
+ "Compare OUTPUT with EXPECTED. Report any discrepancies."
+ (cond
+ ((equal output expected)
+ t)
+ ((and (listp output)
+ (listp expected))
+ ;; Reporting the difference between two lists is done by
+ ;; reporting differing elements of OUTPUT and EXPECTED
+ ;; pairwise. This is expected to make analysis of failures
+ ;; simpler.
+ (apply #'concat (cl-loop for o in output
+ for e in expected
+ if (not (equal o e))
+ collect (notmuch-test-report-unexpected o e))))
+ (t
+ (notmuch-test-report-unexpected output expected))))
(defun notmuch-post-command ()
(run-hooks 'post-command-hook))