diff options
| author | Marco Wahl <marcowahlsoft@gmail.com> | 2020-01-27 23:46:10 +0100 |
|---|---|---|
| committer | Marco Wahl <marcowahlsoft@gmail.com> | 2020-01-27 23:46:10 +0100 |
| commit | b3d1e548778cdc4fe555b5b17021c2595c6764d3 (patch) | |
| tree | 01b004cc12f352786a8de414f59581ed2df29e83 | |
| parent | 1e55b1819852e4a627c3054b274b06e85c4ca095 (diff) | |
| parent | 5c1b3e648c4042a193bec629bb9f5c6664c95fa3 (diff) | |
| download | org-mode-b3d1e548778cdc4fe555b5b17021c2595c6764d3.tar.gz | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | lisp/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/org.el | 3 | ||||
| -rw-r--r-- | testing/lisp/test-org-agenda.el | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ef83a97..ac785c3 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2197,8 +2197,10 @@ The following commands are available: \\{org-agenda-mode-map}" (interactive) + (ignore-errors (require 'face-remap)) (let ((agenda-local-vars-to-keep '(text-scale-mode-amount + text-scale-mode text-scale-mode-lighter face-remapping-alist)) (save (buffer-local-variables))) diff --git a/lisp/org.el b/lisp/org.el index 376785b..3fc3dad 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8735,8 +8735,7 @@ a link." ((memq type '(headline inlinetask)) (org-match-line org-complex-heading-regexp) (let ((tags-beg (match-beginning 5)) - (tags-end (match-end 5)) - (tags-str (match-string 5))) + (tags-end (match-end 5))) (if (and tags-beg (>= (point) tags-beg) (< (point) tags-end)) ;; On tags. (org-tags-view diff --git a/testing/lisp/test-org-agenda.el b/testing/lisp/test-org-agenda.el index 95a8074..1782227 100644 --- a/testing/lisp/test-org-agenda.el +++ b/testing/lisp/test-org-agenda.el @@ -157,6 +157,7 @@ (text-scale-set 11) (cl-assert (and (boundp text-scale-mode) text-scale-mode)) (org-agenda-redo) + (should text-scale-mode) (should (= 11 text-scale-mode-amount))) (org-test-agenda--kill-all-agendas))) |