From: Stephen Gildea Date: Sat, 25 Sep 2021 14:18:50 +0000 (-0700) Subject: ; * lisp/mh-e/mh-scan.el: re-order variables to be actually alphabetical X-Git-Tag: emacs-28.0.90~646 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2148f67d0ef815d4ceead33dcdba193fa496c2a9;p=emacs.git ; * lisp/mh-e/mh-scan.el: re-order variables to be actually alphabetical --- diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el index bad20852466..5aa599942e3 100644 --- a/lisp/mh-e/mh-scan.el +++ b/lisp/mh-e/mh-scan.el @@ -103,15 +103,21 @@ non-empty Newsgroups: field is present." ;; Alphabetical. -(defvar mh-scan-body-regexp "\\(<<\\([^\n]+\\)?\\)" - "This regular expression matches the message body fragment. +(defvar mh-scan-allowlisted-msg-regexp "^\\( *[0-9]+\\)A" + "This regular expression matches allowlisted (non-spam) messages. -Note that the default setting of `mh-folder-font-lock-keywords' -expects this expression to contain at least one parenthesized -expression which matches the body text as in the default of -\"\\\\(<<\\\\([^\\n]+\\\\)?\\\\)\". If this regular expression is -not correct, the body fragment will not be highlighted with the -face `mh-folder-body'.") +It must match from the beginning of the line. Note that the +default setting of `mh-folder-font-lock-keywords' expects this +expression to contain at least one parenthesized expression which +matches the message number as in the default of + + \"^\\\\( *[0-9]+\\\\)A\". + +This expression includes the leading space within parenthesis +since it looks better to highlight it as well. The highlighting +is done with the face `mh-folder-allowlisted'. This regular +expression should be correct as it is needed by non-fontification +functions. See also `mh-note-allowlisted'.") (defvar mh-scan-blocklisted-msg-regexp "^\\( *[0-9]+\\)B" "This regular expression matches blocklisted (spam) messages. @@ -129,6 +135,16 @@ is done with the face `mh-folder-blocklisted'. This regular expression should be correct as it is needed by non-fontification functions. See also `mh-note-blocklisted'.") +(defvar mh-scan-body-regexp "\\(<<\\([^\n]+\\)?\\)" + "This regular expression matches the message body fragment. + +Note that the default setting of `mh-folder-font-lock-keywords' +expects this expression to contain at least one parenthesized +expression which matches the body text as in the default of +\"\\\\(<<\\\\([^\\n]+\\\\)?\\\\)\". If this regular expression is +not correct, the body fragment will not be highlighted with the +face `mh-folder-body'.") + (defvar mh-scan-cur-msg-number-regexp "^\\( *[0-9]+\\+\\).*" "This regular expression matches the current message. @@ -295,22 +311,6 @@ non-fontification functions.") This is used to eliminate error messages that are occasionally produced by \"inc\".") -(defvar mh-scan-allowlisted-msg-regexp "^\\( *[0-9]+\\)A" - "This regular expression matches allowlisted (non-spam) messages. - -It must match from the beginning of the line. Note that the -default setting of `mh-folder-font-lock-keywords' expects this -expression to contain at least one parenthesized expression which -matches the message number as in the default of - - \"^\\\\( *[0-9]+\\\\)A\". - -This expression includes the leading space within parenthesis -since it looks better to highlight it as well. The highlighting -is done with the face `mh-folder-allowlisted'. This regular -expression should be correct as it is needed by non-fontification -functions. See also `mh-note-allowlisted'.") - ;;; Widths, Offsets and Columns @@ -399,17 +399,21 @@ This column will only ever have spaces in it.") ;; Alphabetical. +(defvar mh-note-allowlisted ?A + "Messages that have been allowlisted are marked by this character. +See also `mh-scan-allowlisted-msg-regexp'.") + (defvar mh-note-blocklisted ?B "Messages that have been blocklisted are marked by this character. See also `mh-scan-blocklisted-msg-regexp'.") +(defvar mh-note-copied ?C + "Messages that have been copied are marked by this character.") + (defvar mh-note-cur ?+ "The current message (in MH, not in MH-E) is marked by this character. See also `mh-scan-cur-msg-number-regexp'.") -(defvar mh-note-copied ?C - "Messages that have been copied are marked by this character.") - (defvar mh-note-deleted ?D "Messages that have been deleted are marked by this character. See also `mh-scan-deleted-msg-regexp'.") @@ -436,10 +440,6 @@ See also `mh-scan-refiled-msg-regexp'.") Messages in the \"search\" sequence are marked by this character as well.") -(defvar mh-note-allowlisted ?A - "Messages that have been allowlisted are marked by this character. -See also `mh-scan-allowlisted-msg-regexp'.") - ;;; Utilities