diff options
author | Rasmus <rasmus@gmx.us> | 2018-03-27 23:34:41 +0200 |
---|---|---|
committer | Rasmus <rasmus@gmx.us> | 2018-03-27 23:34:41 +0200 |
commit | 613c9a5c1f3237fbdc3a3db2341c7c59353d2aa2 (patch) | |
tree | 7651699ebeb2a2a2d8d1081707d091fbc424e8fb /lisp/org/org-compat.el | |
parent | 1b075a9e38ca6812417f95ed2272e61d875d9e86 (diff) | |
download | emacs-613c9a5c1f3237fbdc3a3db2341c7c59353d2aa2.tar.gz emacs-613c9a5c1f3237fbdc3a3db2341c7c59353d2aa2.tar.bz2 emacs-613c9a5c1f3237fbdc3a3db2341c7c59353d2aa2.zip |
Update Org to v9.1.9
Please note this is a bugfix release. See etc/ORG-NEWS for details.
Diffstat (limited to 'lisp/org/org-compat.el')
-rw-r--r-- | lisp/org/org-compat.el | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index f32fcd1783e..1fd408de9e5 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -4,7 +4,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp -;; Homepage: http://orgmode.org +;; Homepage: https://orgmode.org ;; ;; This file is part of GNU Emacs. ;; @@ -61,12 +61,6 @@ (defalias 'format-message 'format) (defalias 'gui-get-selection 'x-get-selection)) -(defun org-decode-time (&optional time zone) - "Backward-compatible function for `decode-time'." - (if (< emacs-major-version 25) - (decode-time time) - (decode-time time zone))) - (unless (fboundp 'directory-name-p) (defun directory-name-p (name) "Return non-nil if NAME ends with a directory separator character." @@ -78,37 +72,6 @@ (and (memq system-type '(windows-nt ms-dos)) (= lastc ?\\)))))) -(unless (fboundp 'directory-files-recursively) - (defun directory-files-recursively (dir regexp &optional include-directories) - "Return list of all files under DIR that have file names matching REGEXP. -This function works recursively. Files are returned in \"depth first\" -order, and files from each directory are sorted in alphabetical order. -Each file name appears in the returned list in its absolute form. -Optional argument INCLUDE-DIRECTORIES non-nil means also include in the -output directories whose names match REGEXP." - (let ((result nil) - (files nil) - ;; When DIR is "/", remote file names like "/method:" could - ;; also be offered. We shall suppress them. - (tramp-mode (and tramp-mode (file-remote-p (expand-file-name dir))))) - (dolist (file (sort (file-name-all-completions "" dir) - 'string<)) - (unless (member file '("./" "../")) - (if (directory-name-p file) - (let* ((leaf (substring file 0 (1- (length file)))) - (full-file (expand-file-name leaf dir))) - ;; Don't follow symlinks to other directories. - (unless (file-symlink-p full-file) - (setq result - (nconc result (directory-files-recursively - full-file regexp include-directories)))) - (when (and include-directories - (string-match regexp leaf)) - (setq result (nconc result (list full-file))))) - (when (string-match regexp file) - (push (expand-file-name file dir) files))))) - (nconc result (nreverse files))))) - ;;; Obsolete aliases (remove them after the next major release). |