Fix `org-no-properties' called with an optional argument

* lisp/org-macs.el (org-no-properties): Fix function so that optional
  argument `restricted' is not ignored.

lisp/org-macs.el

@@ -135,11 +135,8 @@ Otherwise return nil."
   "Remove all text properties from string S.
 When RESTRICTED is non-nil, only remove the properties listed
 in `org-rm-props'."
-  (if (fboundp 'set-text-properties)
-      (set-text-properties 0 (length s) nil s)
-    (if restricted
-	(remove-text-properties 0 (length s) org-rm-props s)
-      (set-text-properties 0 (length s) nil s)))
+  (if restricted (remove-text-properties 0 (length s) org-rm-props s)
+    (set-text-properties 0 (length s) nil s))
   s)
 
 (defsubst org-get-alist-option (option key)