Browse Source

Deprecate `org-format-seconds' in favor of `format-seconds'

* lisp/org-macs.el (org-format-seconds): Remove function.
* lisp/org-compat.el (org-format-seconds): Mark function as an obsolete
  alias.
* lisp/org-table.el (org-table-time-seconds-to-string):
* lisp/ox.el (org-export-stack-refresh): Apply removal.
Nicolas Goaziou 4 years ago
parent
commit
aae0b22a0c
4 changed files with 4 additions and 10 deletions
  1. 1 0
      lisp/org-compat.el
  2. 0 6
      lisp/org-macs.el
  3. 1 1
      lisp/org-table.el
  4. 2 3
      lisp/ox.el

+ 1 - 0
lisp/org-compat.el

@@ -94,6 +94,7 @@
 (define-obsolete-function-alias 'org-called-interactively-p 'called-interactively-p "Org 9.0")
 (define-obsolete-function-alias 'org-char-to-string 'char-to-string "Org 9.0")
 (define-obsolete-function-alias 'org-delete-directory 'delete-directory "Org 9.0")
+(define-obsolete-function-alias 'org-format-seconds 'format-seconds "Org 9.0")
 (define-obsolete-function-alias 'org-no-warnings 'with-no-warnings "Org 9.0")
 (define-obsolete-function-alias 'org-number-sequence 'number-sequence "Org 9.0")
 (define-obsolete-function-alias 'org-pop-to-buffer-same-window 'pop-to-buffer-same-window "Org 9.0")

+ 0 - 6
lisp/org-macs.el

@@ -284,12 +284,6 @@ The number of levels is controlled by `org-inlinetask-min-level'"
 			  limit-level)))
 	   (format "\\*\\{1,%d\\} " nstars)))))
 
-(defun org-format-seconds (string seconds)
-  "Compatibility function replacing format-seconds."
-  (if (fboundp 'format-seconds)
-      (format-seconds string seconds)
-    (format-time-string string (seconds-to-time seconds))))
-
 (defmacro org-eval-in-environment (environment form)
   (declare (debug (form form)) (indent 1))
   `(eval (list 'let ,environment ',form)))

+ 1 - 1
lisp/org-table.el

@@ -3728,7 +3728,7 @@ minutes or seconds."
 		 (format "%.1f" (/ (float secs0) 60)))
 		((eq output-format 'seconds)
 		 (format "%d" secs0))
-		(t (org-format-seconds "%.2h:%.2m:%.2s" secs0)))))
+		(t (format-seconds "%.2h:%.2m:%.2s" secs0)))))
     (if (< secs 0) (concat "-" res) res)))
 
 (defun org-table-fedit-convert-buffer (function)

+ 2 - 3
lisp/ox.el

@@ -6137,9 +6137,8 @@ stack."
 		    (let ((data (nth 2 entry)))
 		      (if proc-p (format " %6s  " (process-status data))
 			;; Compute age of the results.
-			(org-format-seconds
-			 "%4h:%.2m  "
-			 (float-time (time-since data)))))
+			(format-seconds "%4h:%.2m  "
+					(float-time (time-since data)))))
 		    ;; Source.
 		    (format " %s"
 			    (let ((source (car entry)))