Merge branch 'maint'

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)))

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