Compare commits

..

No commits in common. "5360344a92d6a42ddbe7bfc628f51e9a922c595b" and "263def911f41545b4b949c96fa7f2bd2b866a2a0" have entirely different histories.

2 changed files with 193 additions and 194 deletions

23
init.el
View File

@ -980,11 +980,12 @@ If DESCRIPTION, match it in the description. If TARGET, match it
in the target. If both DESCRIPTION and TARGET, match both, in the target. If both DESCRIPTION and TARGET, match both,
respectively." respectively."
(cl-labels (cl-labels
((no-desc (match) ((no-desc
(rx-to-string `(seq (or bol (1+ blank)) (match) (rx-to-string `(seq (or bol (1+ blank))
"[[" (0+ (not (any "]"))) (regexp ,match) (0+ (not (any "]"))) "[[" (0+ (not (any "]"))) (regexp ,match) (0+ (not (any "]")))
"]]"))) "]]")))
(match-both (description target) (match-both
(description target)
(rx-to-string `(seq (or bol (1+ blank)) (rx-to-string `(seq (or bol (1+ blank))
"[[" (0+ (not (any "]"))) (regexp ,target) (0+ (not (any "]"))) "[[" (0+ (not (any "]"))) (regexp ,target) (0+ (not (any "]")))
;; Added .* wildcards ;; Added .* wildcards
@ -992,14 +993,14 @@ respectively."
"]]"))) "]]")))
;; Note that these actually allow empty descriptions ;; Note that these actually allow empty descriptions
;; or targets, depending on what they are matching. ;; or targets, depending on what they are matching.
(match-desc (match) (match-desc
(rx-to-string `(seq (or bol (1+ blank)) (match) (rx-to-string `(seq (or bol (1+ blank))
"[[" (0+ (not (any "]"))) "[[" (0+ (not (any "]")))
;; Added .* wildcards ;; Added .* wildcards
"][" (regexp ".*") (regexp ,match) (regexp ".*") "][" (regexp ".*") (regexp ,match) (regexp ".*")
"]]"))) "]]")))
(match-target (match) (match-target
(rx-to-string `(seq (or bol (1+ blank)) (match) (rx-to-string `(seq (or bol (1+ blank))
"[[" (0+ (not (any "]"))) (regexp ,match) (0+ (not (any "]"))) "[[" (0+ (not (any "]"))) (regexp ,match) (0+ (not (any "]")))
;; Removed pattern for description ;; Removed pattern for description
"][" )))) "][" ))))
@ -1507,7 +1508,6 @@ respectively."
gnus-startup-file (expand-file-name "private/gnus-newsrc" emacs-d) gnus-startup-file (expand-file-name "private/gnus-newsrc" emacs-d)
gnus-cache-directory (expand-file-name "cache/" gnus-directory) gnus-cache-directory (expand-file-name "cache/" gnus-directory)
gnus-verbose 6 gnus-verbose 6
gnus-dbus-close-on-sleep t
message-directory (expand-file-name "mail/" gnus-directory) message-directory (expand-file-name "mail/" gnus-directory)
nnmail-message-id-cache-file (expand-file-name ".nnmail-cache" gnus-directory) nnmail-message-id-cache-file (expand-file-name ".nnmail-cache" gnus-directory)
@ -1768,9 +1768,8 @@ respectively."
;; Searching ;; Searching
(use-package gnus-search (setq gnus-search-default-engines '((nnimap . gnus-search-imap))
:init (setq gnus-search-default-engines '((nnimap . gnus-search-imap)) gnus-search-use-parsed-queries t)
gnus-search-use-parsed-queries t))
;; Agents ;; Agents
@ -2657,7 +2656,7 @@ With given ARG, display files in `db/important-document-path."
;; General Stuff first ;; General Stuff first
(use-package lisp-mode (use-package lisp-mode
:init (setq lisp-indent-function #'common-lisp-indent-function)) :init (setq lisp-indent-function #'lisp-indent-function))
(use-package lispy (use-package lispy
:ensure t :ensure t