mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-02-12 17:56:43 +01:00
parent bfe2f919fa fa24cd541d
commit 73445c0fab
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/doc-setup.org
View File

@ -12,9 +12,9 @@
# Contact Info
#+texinfo_header: @set MAINTAINERSITE @uref{https://orgmode.org,maintainers webpage}
#+texinfo_header: @set MAINTAINER Carsten Dominik
#+texinfo_header: @set MAINTAINEREMAIL @email{carsten at orgmode dot org}
#+texinfo_header: @set MAINTAINERCONTACT @uref{mailto:carsten at orgmode dot org,contact the maintainer}
#+texinfo_header: @set MAINTAINER Bastien Guerry
#+texinfo_header: @set MAINTAINEREMAIL @email{bzg@gnu.org}
#+texinfo_header: @set MAINTAINERCONTACT @uref{mailto:bzg@gnu.org,contact the maintainer}
#+options: H:4 num:t toc:t author:t \n:nil ::t |:t ^:nil -:t f:t *:t <:t e:t ':t
#+options: d:nil todo:nil pri:nil tags:not-in-toc stat:nil broken-links:mark

2
doc/org-guide.org
View File

@ -2616,7 +2616,7 @@ support in a file, use
#+export_file_name: orgguide.texi
#+texinfo_dir_category: Emacs
#+texinfo_dir_category: Emacs editing modes
#+texinfo_dir_title: Org Guide: (orgguide)
#+texinfo_dir_desc: Abbreviated Org mode manual

2
doc/org-manual.org
View File

@ -21175,7 +21175,7 @@ modify this GNU manual."
#+export_file_name: org.texi
#+texinfo_dir_category: Emacs
#+texinfo_dir_category: Emacs editing modes
#+texinfo_dir_title: Org Mode: (org)
#+texinfo_dir_desc: Outline-based notes management and organizer

3
lisp/org.el
View File

@ -218,7 +218,8 @@ and then loads the resulting file using `load-file'. With
optional prefix argument COMPILE, the tangled Emacs Lisp file is
byte-compiled before it is loaded."
(interactive "fFile to load: \nP")
(let* ((tangled-file (concat (file-name-sans-extension file) ".el")))
(let* ((file (file-truename file))
(tangled-file (concat (file-name-sans-extension file) ".el")))
;; Tangle only if the Org file is newer than the Elisp file.
(unless (org-file-newer-than-p
tangled-file