diff options
author | Kyle Meyer <kyle@kyleam.com> | 2017-01-25 22:00:57 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-01-25 22:00:57 -0500 |
commit | 63aaffdc117c22439a86f05217d886d2ebd92cef (patch) | |
tree | 5a910db5df3e97df805352d25a4ba2bccd80043d | |
parent | ff212d85286a44a0b5cc69a3fb90ee120f047b33 (diff) | |
parent | ffa4502771ff98765b688a398e5872ddba3ac013 (diff) | |
download | org-mode-63aaffdc117c22439a86f05217d886d2ebd92cef.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ob-core.el | 4 | ||||
-rw-r--r-- | lisp/org-agenda.el | 4 | ||||
-rw-r--r-- | lisp/org-clock.el | 3 | ||||
-rw-r--r-- | lisp/org-compat.el | 8 |
4 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 663fe18..8d08784 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2905,10 +2905,6 @@ can be specified as the REGEXP argument." (setq string (substring string 0 -1))) string)) -(defun org-babel-local-file-name (file) - "Return the local name component of FILE." - (or (file-remote-p file 'localname) file)) - (defun org-babel-process-file-name (name &optional no-quote-p) "Prepare NAME to be used in an external process. If NAME specifies a remote location, the remote portion of the diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 6118c88..70b91ad 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -469,8 +469,8 @@ match What to search for: settings A list of option settings, similar to that in a let form, so like this: ((opt1 val1) (opt2 val2) ...). The values will be evaluated at the moment of execution, so quote them when needed. -files A list of files file to write the produced agenda buffer to - with the command `org-store-agenda-views'. +files A list of files to write the produced agenda buffer to with + the command `org-store-agenda-views'. If a file name ends in \".html\", an HTML version of the buffer is written out. If it ends in \".ps\", a postscript version is produced. Otherwise, only the plain text is written to the file. diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 58eb0c9..94fc680 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2918,7 +2918,8 @@ The details of what will be saved are regulated by the variable org-clock-has-been-used (not (file-exists-p org-clock-persist-file)))) (with-temp-file org-clock-persist-file - (insert (format ";; org-persist.el - %s at %s\n" + (insert (format ";; %s - %s at %s\n" + (file-name-nondirectory org-clock-persist-file) (system-name) (format-time-string (org-time-stamp-format t)))) ;; Store clock to be resumed. diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 152c6e7..597cb74 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -482,6 +482,14 @@ Pass COLUMN and FORCE to `move-to-column'." (lambda (&optional _beg _end) (with-no-warnings (font-lock-fontify-buffer))))) +;; `file-local-name' was added in Emacs 26.1. +(defalias 'org-babel-local-file-name + (if (fboundp 'file-local-name) + 'file-local-name + (lambda (file) + "Return the local name component of FILE." + (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 |