Merge branch 'maint'

2 files changed, 8 insertions, 18 deletions

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index c49708c..81254a1 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2160,7 +2160,8 @@ The following commands are available:
 	  org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode
 	  org-agenda-clockreport-mode org-agenda-start-with-clockreport-mode
 	  org-agenda-show-log org-agenda-start-with-log-mode))
-
+  (add-to-invisibility-spec '(org-filtered))
+  (add-to-invisibility-spec '(org-link))
   (easy-menu-change
    '("Agenda") "Agenda Files"
    (append
@@ -7631,7 +7632,7 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags."
 	 (e (point-at-eol)))
     (let ((inhibit-read-only t))
       (add-text-properties
-       b e `(invisible t org-filtered t org-filter-type ,type)))))
+       b e `(invisible org-filtered org-filter-type ,type)))))
 
 (defun org-agenda-remove-filter (type)
   (interactive)
@@ -7643,7 +7644,7 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags."
 	(goto-char pos)
 	(remove-text-properties
 	 (point) (next-single-property-change (point) 'org-filter-type)
-	 `(invisible t org-filter-type ,type))))
+	 `(invisible org-filtered org-filter-type ,type))))
     (set (intern (format "org-agenda-%s-filter" (intern-soft type))) nil)
     (setq org-agenda-filter-form nil)
     (org-agenda-set-mode-name)
@@ -9142,7 +9143,7 @@ Called with a universal prefix arg, show the priority instead of setting it."
             (add-text-properties
 	     (1- (point)) (point-at-eol)
 	     (list 'display (org-add-props stamp nil
-			      'face 'secondary-selection))))
+			      'face '(secondary-selection default)))))
 	  (beginning-of-line 1))
 	(beginning-of-line 0)))))
 
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 70c41d5..90380a8 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -312,8 +312,7 @@ Works on both Emacs and XEmacs."
 (defun org-in-invisibility-spec-p (arg)
   "Is ARG a member of `buffer-invisibility-spec'?"
   (if (consp buffer-invisibility-spec)
-      (member arg buffer-invisibility-spec)
-    nil))
+      (member arg buffer-invisibility-spec)))
 
 (defmacro org-xemacs-without-invisibility (&rest body)
   "Turn off extents with invisibility while executing BODY."
@@ -347,18 +346,8 @@ Works on both Emacs and XEmacs."
   "Move to column COLUMN.
 Pass COLUMN and FORCE to `move-to-column'.
 Pass BUFFER to the XEmacs version of `move-to-column'."
-  (let* ((with-bracket-link
-	  (save-excursion
-	    (forward-line 0)
-	    (looking-at (concat "^.*" org-bracket-link-regexp))))
-	 (buffer-invisibility-spec
-	  (cond
-	   ((or (not (derived-mode-p 'org-mode))
-		(and with-bracket-link (org-invisible-p2)))
-	    (remove '(org-link) buffer-invisibility-spec))
-	   (with-bracket-link
-	    (remove t buffer-invisibility-spec))
-	   (t buffer-invisibility-spec))))
+  (let ((buffer-invisibility-spec
+	 (remove '(org-filtered) buffer-invisibility-spec)))
     (if (featurep 'xemacs)
 	(org-xemacs-without-invisibility
 	 (move-to-column column force buffer))