From: Jonas Bernoulli Date: Sun, 10 Jan 2021 14:01:02 +0000 (+0100) Subject: emacs: remove variable notmuch-search-disjunctive-regexp X-Git-Tag: 0.32_rc0~137 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=b614ea756316a18d90f5acfa352e82f2ffec8a67 emacs: remove variable notmuch-search-disjunctive-regexp The value is the only possible value, it is only used in one place, and using a global variable serves no purpose but to make things more complicated. --- diff --git a/emacs/notmuch.el b/emacs/notmuch.el index f8c97c5d..ccece811 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -232,8 +232,6 @@ there will be called at other points of notmuch execution." (defvar notmuch-search-target-thread) (defvar notmuch-search-target-line) -(defvar notmuch-search-disjunctive-regexp "\\<[oO][rR]\\>") - ;;; Movement (defun notmuch-search-scroll-up () @@ -1079,10 +1077,8 @@ default sort order is defined by `notmuch-search-oldest-first'." (defun notmuch-group-disjunctive-query-string (query-string) "Group query if it contains a complex expression. - -Enclose QUERY-STRING in parentheses if it matches -`notmuch-search-disjunctive-regexp'." - (if (string-match-p notmuch-search-disjunctive-regexp query-string) +Enclose QUERY-STRING in parentheses if contains \"OR\" operators." + (if (string-match-p "\\<[oO][rR]\\>" query-string) (concat "( " query-string " )") query-string))