Rename some obsolete functions to their newer names

* lisp/org-bibtex-extras.el (obe-meta-to-json):
* lisp/org-choose.el (org-choose-filter-tail):
* lisp/org-screenshot.el (org-screenshot-generate-file-name):
(org-screenshot-rotation-init):
(org-screenshot-take):
(org-screenshot-do-rotate):
* lisp/ox-taskjuggler.el (org-taskjuggler-format-dependencies): `incf'
-> `cl-incf'; `plusp' -> `cl-plusp'.

Reported in https://orgmode.org/list/875yn53r1j.fsf@gmail.com

4 files changed, 10 insertions, 10 deletions

diff --git a/lisp/org-bibtex-extras.el b/lisp/org-bibtex-extras.el
index 1374c99..cc53f8b 100644
--- a/lisp/org-bibtex-extras.el
+++ b/lisp/org-bibtex-extras.el
@@ -103,7 +103,7 @@ For example, to point to your `obe-bibtex-file' use the following.
 	   (col (k) (mapcar (lambda (r) (cdr (assoc k r))) meta))
 	   (add (lst)
 		(dolist (el lst) (push (cons el counter) nodes))
-		(incf counter)))
+		(cl-incf counter)))
       ;; build the nodes of the graph
       (add (col :title))
       (add (remove-if (lambda (author) (string-match "others" author))
diff --git a/lisp/org-choose.el b/lisp/org-choose.el
index ef5eca4..8491a57 100644
--- a/lisp/org-choose.el
+++ b/lisp/org-choose.el
@@ -201,7 +201,7 @@ interpretation."
 	  (setq top-upper-range index))
 	 ((eq type 'default-mark)
 	  (setq static-default index)))
-	(incf index)
+	(cl-incf index)
 	(push vanilla-text all-mark-texts)
 	(push vanilla-mark vanilla-list)))
 
diff --git a/lisp/org-screenshot.el b/lisp/org-screenshot.el
index 1e8e1e9..35b9dee 100644
--- a/lisp/org-screenshot.el
+++ b/lisp/org-screenshot.el
@@ -182,7 +182,7 @@ times. Returns just the file, without directory part"
           (case-fold-search nil))
       (while (and (< tries org-screenshot-max-tries)
                   (not name))
-        (incf tries)
+        (cl-incf tries)
         (let ((tmp org-screenshot-file-name-format)
               (seq-re "%[-0-9.]*d")
               (rand-re "%X+"))
@@ -282,7 +282,7 @@ screenshot is done, any more `C-u' after that increases delay by
               ((integerp delay) delay)
               ((and (consp delay)
                     (integerp (car delay))
-                    (plusp (car delay)))
+                    (cl-plusp (car delay)))
                (let ((num 1)
                      (limit (car delay))
                      (cnt 0))
@@ -307,11 +307,11 @@ screenshot is done, any more `C-u' after that increases delay by
            (apply 'start-process
                   (append
                    (list "scrot" "*scrot*" "scrot" "-s" path)
-                   (when (plusp delay)
+                   (when (cl-plusp delay)
                      (list "-d" (format "%d" delay)))))
            (error "Unable to start scrot process")))
     (when org-screenshot-process 
-      (if (plusp delay) 
+      (if (cl-plusp delay) 
           (message "Click on a window, or select a rectangle (delay is %d sec)..."
                    delay)
         (message "Click on a window, or select a rectangle..."))
@@ -351,7 +351,7 @@ by most recent first"
                        (> mtime1 mtime2)))))))
   (let ((n -1) (list org-screenshot-file-list))
     (while (and list (not (equal (pop list) lastfile)))
-      (incf n))
+      (cl-incf n))
     (setq org-screenshot-rotation-index n)))
 
 (defun org-screenshot-do-rotate (dir from-continue-rotating)
@@ -396,7 +396,7 @@ other direction"
       ;; advance one more time
       (when (equal oldfile newfile)
         (setq org-screenshot-rotation-index
-              (mod (+ org-screenshot-rotation-index (if (plusp dir) 1 -1))
+              (mod (+ org-screenshot-rotation-index (if (cl-plusp dir) 1 -1))
                    (length org-screenshot-file-list))
               newfile (nth org-screenshot-rotation-index
                            org-screenshot-file-list)))
diff --git a/lisp/ox-taskjuggler.el b/lisp/ox-taskjuggler.el
index 50014d8..47978a6 100644
--- a/lisp/ox-taskjuggler.el
+++ b/lisp/ox-taskjuggler.el
@@ -608,8 +608,8 @@ doesn't include leading \"depends\"."
 	      ;; Compute number of exclamation marks by looking for the
 	      ;; common ancestor between TASK and DEP.
 	      (while (not (org-element-map parent 'headline
-			    (lambda (hl) (eq hl dep))))
-		(incf exclamations)
+			  (lambda (hl) (eq hl dep))))
+		(cl-incf exclamations)
 		(setq parent (org-export-get-parent parent)))
 	      ;; Build path from DEP to PARENT.
 	      (while (not (eq parent dep))