diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2019-12-05 23:00:03 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2019-12-05 23:00:03 -0500 |
| commit | 2eee3ca190520b516b86881dbf3dc4679b86f7fa (patch) | |
| tree | 367a210f519653c1c2cbbe1e1d7ce8ea81c04dfa | |
| parent | bb61b37ee223fd89cf951a5fbf62e35e606a4646 (diff) | |
| parent | 2ab4540b981ae23a63170826a5278e8f37ac9518 (diff) | |
| download | org-mode-2eee3ca190520b516b86881dbf3dc4679b86f7fa.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/org.el | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 41254bf..bcccf51 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7670,7 +7670,7 @@ the variable `org-agenda-auto-exclude-function'." (if negate "Negative filter" "Filter") " [+cat-tag<0:10-/regexp/]: ") 'org-agenda-filter-completion-function)) - (keep (or (if (string-match "^+[-+]" f-string) + (keep (or (if (string-match "^\\+[+-]" f-string) (progn (setq f-string (substring f-string 1)) t)) (equal strip-or-accumulate '(16)))) (fc (if keep org-agenda-category-filter)) diff --git a/lisp/org.el b/lisp/org.el index 6a24777..9b84592 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4974,7 +4974,8 @@ The following commands are available: ("8.3" . "26.1") ("9.0" . "26.1") ("9.1" . "26.1") - ("9.2" . "27.1"))) + ("9.2" . "27.1") + ("9.3" . "27.1"))) (defvar org-mode-transpose-word-syntax-table (let ((st (make-syntax-table text-mode-syntax-table))) @@ -7845,7 +7846,7 @@ with the original repeater." ""))) ;No time shift (doshift (and (org-string-nw-p shift) - (or (string-match "\\`[ \t]*\\([\\+\\-]?[0-9]+\\)\\([dwmy]\\)[ \t]*\\'" + (or (string-match "\\`[ \t]*\\([+-]?[0-9]+\\)\\([dwmy]\\)[ \t]*\\'" shift) (user-error "Invalid shift specification %s" shift))))) (goto-char end-of-tree) |