Remove `org-maybe-intangible'

* lisp/org-macs.el (org-maybe-intangible): Remove macro.
* lisp/org.el (org-activate-bracket-links):
(org-hide-wide-columns): Apply removal.

lisp/org-macs.el

@@ -108,19 +108,6 @@ Otherwise return nil."
 	 (partial-completion-mode 1))
      ,@body))
 
-;; FIXME: Slated for removal.  Current Org mode does not support Emacs < 22
-(defmacro org-maybe-intangible (props)
-  "Add \\='(intangible t) to PROPS if Emacs version is earlier than Emacs 22.
-In Emacs 21, invisible text is not avoided by the command loop, so the
-intangible property is needed to make sure point skips this text.
-In Emacs 22, this is not necessary.  The intangible text property has
-led to problems with flyspell.  These problems are fixed in flyspell.el,
-but we still avoid setting the property in Emacs 22 and later.
-We use a macro so that the test can happen at compilation time."
-  (if (< emacs-major-version 22)
-      `(append '(intangible t) ,props)
-    props))
-
 (defmacro org-with-point-at (pom &rest body)
   "Move to buffer and point of point-or-marker POM for the duration of BODY."
   (declare (debug (form body)) (indent 1))

lisp/org.el

@@ -6085,11 +6085,10 @@ by a #."
 	     (not (org-in-src-block-p)))
     (let* ((hl (match-string-no-properties 1))
 	   (help (concat "LINK: " (save-match-data (org-link-unescape hl))))
-	   (ip (org-maybe-intangible
-		(list 'invisible 'org-link
-		      'keymap org-mouse-map 'mouse-face 'highlight
-		      'font-lock-multiline t 'help-echo help
-		      'htmlize-link `(:uri ,hl))))
+	   (ip (list 'invisible 'org-link
+		     'keymap org-mouse-map 'mouse-face 'highlight
+		     'font-lock-multiline t 'help-echo help
+		     'htmlize-link `(:uri ,hl)))
 	   (vp (list 'keymap org-mouse-map 'mouse-face 'highlight
 		     'font-lock-multiline t 'help-echo help
 		     'htmlize-link `(:uri ,hl))))
@@ -6214,7 +6213,7 @@ Also refresh fontification if needed."
 			       'org-cwidth t))
     (when s
       (setq e (next-single-property-change s 'org-cwidth))
-      (add-text-properties s e (org-maybe-intangible '(invisible org-cwidth)))
+      (add-text-properties s e '(invisible org-cwidth))
       (goto-char e)
       t)))