diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-30 13:58:25 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-30 13:58:25 +0200 |
| commit | 6d4e0b3dd18335e5de40b2e48ff42424ba8faff4 (patch) | |
| tree | 4858de2abaf3e5a938612ba4cf5bc771f58dfbb5 | |
| parent | 5c12c21a73947e51313a555dfd474af9b3d99e8d (diff) | |
| download | org-mode-6d4e0b3dd18335e5de40b2e48ff42424ba8faff4.tar.gz | |
Move `org-no-popups' to "org-macs.el"
* lisp/org-compat.el (org-no-popups): Move function...
* lisp/org-macs.el : ... here.
| -rw-r--r-- | lisp/org-compat.el | 5 | ||||
| -rw-r--r-- | lisp/org-macs.el | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 34a2bf1..dcdab7c 100644 --- a/lisp/org-compat.el +++ b/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." diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 8ec2498..bbf4039 100644 --- a/lisp/org-macs.el +++ b/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 |