diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-29 11:53:37 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-29 11:54:40 +0200 |
commit | a2994cb005c9265c27f2787be34cb26fb8b16bdf (patch) | |
tree | be89f6cc00ab6957cdc9e29db294ee46014bb8e1 | |
parent | 31afe4b718099f9c60885f106948c40c57d8a730 (diff) | |
download | org-mode-a2994cb005c9265c27f2787be34cb26fb8b16bdf.tar.gz |
Mark "org-version-check" obsolete
* lisp/org-compat.el (org-version-check): Mark as obsolete.
(org-no-popups):
* testing/examples/babel.org: Remove use of `org-version-check'.
-rw-r--r-- | lisp/org-compat.el | 47 | ||||
-rw-r--r-- | testing/examples/babel.org | 27 |
2 files changed, 24 insertions, 50 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el index cd4cff4..dd5c863 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -283,13 +283,13 @@ See `org-link-parameters' for documentation on the other parameters." ;; Not used since commit 6d1e3082, Feb 2010. (make-obsolete 'org-table-recognize-table.el - "please notify the Org mailing list if you use this function." + "please notify Org mailing list if you use this function." "Org 9.0") (defmacro org-preserve-lc (&rest body) (declare (debug (body)) - (obsolete "please notify the Org mailing list if you use this function." - "Org 9.0")) + (obsolete "please notify Org mailing list if you use this function." + "Org 9.2")) (org-with-gensyms (line col) `(let ((,line (org-current-line)) (,col (current-column))) @@ -298,6 +298,12 @@ See `org-link-parameters' for documentation on the other parameters." (org-goto-line ,line) (org-move-to-column ,col))))) +(defun org-version-check (version &rest _) + "Non-nil if VERSION is lower (older) than `emacs-version'." + (declare (obsolete "use `version<' or `fboundp' instead." + "Org 9.2")) + (version< version emacs-version)) + (defun org-remove-angle-brackets (s) (org-unbracket-string "<" ">" s)) (make-obsolete 'org-remove-angle-brackets 'org-unbracket-string "Org 9.0") @@ -441,30 +447,6 @@ use of this function is for the stuck project list." ;;; Miscellaneous functions -(defun org-version-check (version feature level) - (let* ((v1 (mapcar 'string-to-number (split-string version "[.]"))) - (v2 (mapcar 'string-to-number (split-string emacs-version "[.]"))) - (rmaj (or (nth 0 v1) 99)) - (rmin (or (nth 1 v1) 99)) - (rbld (or (nth 2 v1) 99)) - (maj (or (nth 0 v2) 0)) - (min (or (nth 1 v2) 0)) - (bld (or (nth 2 v2) 0))) - (if (or (< maj rmaj) - (and (= maj rmaj) - (< min rmin)) - (and (= maj rmaj) - (= min rmin) - (< bld rbld))) - (if (eq level :predicate) - ;; just return if we have the version - nil - (let ((msg (format "Emacs %s or greater is recommended for %s" - version feature))) - (display-warning 'org msg level) - t)) - t))) - (defun org-get-x-clipboard (value) "Get the value of the X or Windows clipboard." (cond ((and (eq window-system 'x) @@ -559,14 +541,9 @@ Pass COLUMN and FORCE to `move-to-column'." (or (file-remote-p file 'localname) file)))) (defmacro org-no-popups (&rest body) - "Suppress popup windows. -Let-bind some variables to nil around BODY to achieve the desired -effect, which variables to use depends on the Emacs version." - (if (org-version-check "24.2.50" "" :predicate) - `(let (pop-up-frames display-buffer-alist) - ,@body) - `(let (pop-up-frames special-display-buffer-names special-display-regexps special-display-function) - ,@body))) + "Suppress popup windows and evaluate BODY." + `(let (pop-up-frames display-buffer-alist) + ,@body)) ;;;###autoload (defmacro org-check-version () diff --git a/testing/examples/babel.org b/testing/examples/babel.org index 556e93e..81d90d6 100644 --- a/testing/examples/babel.org +++ b/testing/examples/babel.org @@ -112,21 +112,18 @@ #+name: pascals-triangle #+begin_src emacs-lisp :var n=5 :exports both - (require 'cl) - (defalias 'my-map (if (org-version-check "24.2.50" "cl" :predicate) - 'cl-map - 'map)) - (defun pascals-triangle (n) - (if (= n 0) - (list (list 1)) - (let* ((prev-triangle (pascals-triangle (- n 1))) - (prev-row (car (reverse prev-triangle)))) - (append prev-triangle - (list (my-map 'list #'+ - (append prev-row '(0)) - (append '(0) prev-row))))))) - - (pascals-triangle n) +(require 'cl) +(defun pascals-triangle (n) + (if (= n 0) + (list (list 1)) + (let* ((prev-triangle (pascals-triangle (- n 1))) + (prev-row (car (reverse prev-triangle)))) + (append prev-triangle + (list (cl-map 'list #'+ + (append prev-row '(0)) + (append '(0) prev-row))))))) + +(pascals-triangle n) #+end_src * calling code blocks from inside table |