From c93ed7feb646867f9ff9822248091498649f3ed3 Mon Sep 17 00:00:00 2001
From: Bastien <bzg@gnu.org>
Date: Wed, 12 Feb 2020 17:41:29 +0100
Subject: [PATCH 1/3] doc/doc-setup.org: Update maintainer

---
 doc/doc-setup.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/doc-setup.org b/doc/doc-setup.org
index b0eef09bf..b83d16e7e 100644
--- a/doc/doc-setup.org
+++ b/doc/doc-setup.org
@@ -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

From c39c5c65594f2af4c04b9ea6f66abf77c5d09187 Mon Sep 17 00:00:00 2001
From: Bastien <bzg@gnu.org>
Date: Wed, 12 Feb 2020 17:41:51 +0100
Subject: [PATCH 2/3] Fix info dircategory

Thanks to Drew Adams and Steve Berman for reporting this.
---
 doc/org-guide.org  | 2 +-
 doc/org-manual.org | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/org-guide.org b/doc/org-guide.org
index 762137ae0..d114b063d 100644
--- a/doc/org-guide.org
+++ b/doc/org-guide.org
@@ -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
 
diff --git a/doc/org-manual.org b/doc/org-manual.org
index fd532941a..a06a7109c 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -21060,7 +21060,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
 

From fa24cd541d51f386fe89c8bb47b41273b19abf9a Mon Sep 17 00:00:00 2001
From: Bastien <bzg@gnu.org>
Date: Wed, 12 Feb 2020 17:43:02 +0100
Subject: [PATCH 3/3] org.el (org-babel-load-file): Don't get fooled by
 symlinks

* lisp/org.el (org-babel-load-file): Don't get fooled by symlinks.
---
 lisp/org.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 60dd869cf..dc75b2e5b 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -216,7 +216,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