X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-compat.el;h=2cedd39d5eb8e98604b4497ea70bf7106ab1a4c2;hp=fafc64f3338849db3026114294c337613e8f9c65;hb=HEAD;hpb=2156517d902e6013463a5f5f79225741e7f54307

diff --git a/emacs/notmuch-compat.el b/emacs/notmuch-compat.el
index fafc64f3..179bf59c 100644
--- a/emacs/notmuch-compat.el
+++ b/emacs/notmuch-compat.el
@@ -1,4 +1,4 @@
-;;; notmuch-compat.el --- compatibility functions for earlier versions of emacs
+;;; notmuch-compat.el --- compatibility functions for earlier versions of emacs  -*- lexical-binding: t -*-
 ;;
 ;; The functions in this file are copied from more modern versions of
 ;; emacs and are Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2017
@@ -21,10 +21,11 @@
 
 ;;; Code:
 
-;; emacs master has a bugfix for folding long headers when sending
-;; messages. Include the fix for earlier versions of emacs. To avoid
-;; interfering with gnus we only run the hook when called from
-;; notmuch-message-mode.
+;; Before Emacs 26.1 lines that are longer than 998 octets were not.
+;; folded. Commit 77bbca8c82f6e553c42abbfafca28f55fc995d00 fixed
+;; that. Until we drop support for Emacs 25 we have to backport that
+;; fix. To avoid interfering with Gnus we only run the hook when
+;; called from notmuch-message-mode.
 
 (declare-function mail-header-fold-field "mail-parse" nil)
 
@@ -40,63 +41,17 @@
 (unless (fboundp 'message--fold-long-headers)
   (add-hook 'message-header-hook 'notmuch-message--fold-long-headers))
 
-(if (fboundp 'read-char-choice)
-    (defalias 'notmuch-read-char-choice 'read-char-choice)
-  (defun notmuch-read-char-choice (prompt chars &optional inhibit-keyboard-quit)
-    "Read and return one of CHARS, prompting for PROMPT.
-Any input that is not one of CHARS is ignored.
-
-If optional argument INHIBIT-KEYBOARD-QUIT is non-nil, ignore
-keyboard-quit events while waiting for a valid input.
-
-This is an exact copy of this function from emacs 24 for use on
-emacs 23, except with the one emacs 24 only function it calls
-inlined."
-    (unless (consp chars)
-      (error "Called `read-char-choice' without valid char choices"))
-    (let (char done show-help (helpbuf " *Char Help*"))
-      (let ((cursor-in-echo-area t)
-	    (executing-kbd-macro executing-kbd-macro)
-	    (esc-flag nil))
-	(save-window-excursion	      ; in case we call help-form-show
-	  (while (not done)
-	    (unless (get-text-property 0 'face prompt)
-	      (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
-	    (setq char (let ((inhibit-quit inhibit-keyboard-quit))
-			 (read-key prompt)))
-	    (and show-help (buffer-live-p (get-buffer helpbuf))
-		 (kill-buffer helpbuf))
-	    (cond
-	     ((not (numberp char)))
-	     ;; If caller has set help-form, that's enough.
-	     ;; They don't explicitly have to add help-char to chars.
-	     ((and help-form
-		   (eq char help-char)
-		   (setq show-help t)
-		   ;; This is an inlined copy of help-form-show as that
-		   ;; was introduced in emacs 24 too.
-		   (let ((msg (eval help-form)))
-		     (when (stringp msg)
-		       (with-output-to-temp-buffer " *Char Help*"
-			 (princ msg))))))
-	     ((memq char chars)
-	      (setq done t))
-	     ((and executing-kbd-macro (= char -1))
-	      ;; read-event returns -1 if we are in a kbd macro and
-	      ;; there are no more events in the macro.  Attempt to
-	      ;; get an event interactively.
-	      (setq executing-kbd-macro nil))
-	     ((not inhibit-keyboard-quit)
-	      (cond
-	       ((and (null esc-flag) (eq char ?\e))
-		(setq esc-flag t))
-	       ((memq char '(?\C-g ?\e))
-		(keyboard-quit))))))))
-      ;; Display the question with the answer.  But without cursor-in-echo-area.
-      (message "%s%s" prompt (char-to-string char))
-      char)))
-
-;; End of compatibility functions
+;; `dlet' isn't available until Emacs 28.1.  Below is a copy, with the
+;; addition of `with-no-warnings'.
+(defmacro notmuch-dlet (binders &rest body)
+  "Like `let*' but using dynamic scoping."
+  (declare (indent 1) (debug let))
+  `(let (_)
+     (with-no-warnings  ; Quiet "lacks a prefix" warning.
+       ,@(mapcar (lambda (binder)
+		   `(defvar ,(if (consp binder) (car binder) binder)))
+		 binders))
+     (let* ,binders ,@body)))
 
 (provide 'notmuch-compat)