Move `org-no-popups' to "org-macs.el"

* lisp/org-compat.el (org-no-popups): Move function...
* lisp/org-macs.el : ... here.

lisp/org-compat.el

@@ -549,11 +549,6 @@ Pass COLUMN and FORCE to `move-to-column'."
       "Return the local name component of FILE."
       (or (file-remote-p file 'localname) file))))
 
-(defmacro org-no-popups (&rest body)
-  "Suppress popup windows and evaluate BODY."
-  `(let (pop-up-frames display-buffer-alist)
-     ,@body))
-
 ;;;###autoload
 (defmacro org-check-version ()
   "Try very hard to provide sensible version strings."

lisp/org-macs.el

@@ -32,7 +32,7 @@
 ;;; Code:
 
 (declare-function format-spec "format-spec" (format specification))
-(declare-function org-string-collate-less-p "org-compat" (s1 s2 &rest _))
+(declare-function org-string-collate-lessp "org-compat" (s1 s2 &rest _))
 
 
 ;;; Macros
@@ -192,6 +192,11 @@ because otherwise all these markers will point to nowhere."
 	  (unless (bolp) (insert "\n"))
 	  (insert local-variables))))))
 
+(defmacro org-no-popups (&rest body)
+  "Suppress popup windows and evaluate BODY."
+  `(let (pop-up-frames display-buffer-alist)
+     ,@body))
+
 
 
 ;;; Buffer and windows