From 273a7775cd9a960ed54fa1b6b22e1f340ad212da Mon Sep 17 00:00:00 2001
From: Bastien <bzg@gnu.org>
Date: Tue, 18 Feb 2020 23:24:09 +0100
Subject: [PATCH] Various minor fixes

* mk/eldo.el: Update copyright year and fix formatting.

* lisp/ox-man.el: Don't set generated-autoload-file as a
buffer local variable.

* lisp/org-refile.el: Place ;;;###autoload correctly.

* lisp/ob-lilypond.el (org-babel-lilypond-switch-extension):
Formatting fix.
---
 lisp/ob-lilypond.el |  3 ++-
 lisp/org-refile.el  |  3 ++-
 lisp/ox-man.el      |  4 ----
 mk/eldo.el          | 11 +++++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index c221c41c6..af66cc8a0 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -391,7 +391,8 @@ If TEST is non-nil, the shell command is returned and is not run."
 (defun org-babel-lilypond-switch-extension (file-name ext)
   "Utility command to swap current FILE-NAME extension with EXT."
   (concat (file-name-sans-extension
-           file-name) ext))
+           file-name)
+	 ext))
 
 (defun org-babel-lilypond-get-header-args (mode)
   "Default arguments to use when evaluating a lilypond source block.
diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 70329fe30..61c415cc1 100644
--- a/lisp/org-refile.el
+++ b/lisp/org-refile.el
@@ -528,8 +528,9 @@ the *old* location.")
 (defvar org-refile-keep nil
   "Non-nil means `org-refile' will copy instead of refile.")
 
-;;;###autoload
 (define-obsolete-function-alias 'org-copy 'org-refile-copy)
+
+;;;###autoload
 (defun org-refile-copy ()
   "Like `org-refile', but preserve the refiled subtree."
   (interactive)
diff --git a/lisp/ox-man.el b/lisp/ox-man.el
index b6925c696..b8dc54b54 100644
--- a/lisp/ox-man.el
+++ b/lisp/ox-man.el
@@ -1143,8 +1143,4 @@ Return PDF file name or an error if it couldn't be produced."
 
 (provide 'ox-man)
 
-;; Local variables:
-;; generated-autoload-file: "org-loaddefs.el"
-;; End:
-
 ;;; ox-man.el ends here
diff --git a/mk/eldo.el b/mk/eldo.el
index ba8c46400..72d0421d6 100644
--- a/mk/eldo.el
+++ b/mk/eldo.el
@@ -1,6 +1,6 @@
 ;;; eldo.el --- Elisp Doc-to-Org converter
 
-;; Copyright (C) 2012--2019  Bastien Guerry
+;; Copyright (C) 2012--2020  Bastien Guerry
 ;;
 ;; Author: Bastien Guerry <bzg@gnu.org>
 ;; Keywords: elisp, documentation, org
@@ -94,7 +94,8 @@
 	 (if version (format "- *Since:* Emacs version %s\n" version) "")
 	 (format (concat "- *In file:* [[" eldo-git-raw-file "][%s]]\n") f f)
 	 (format (concat "- [[" eldo-git-search-string
-			 "][Find modifications in git logs]]\n\n") (symbol-name h)))
+			 "][Find modifications in git logs]]\n\n")
+		 (symbol-name h)))
 	(when (stringp d) (insert (eldo-make-verbatim d)))))
     (org-set-property "CUSTOM_ID" (symbol-name h))
     (goto-char (point-max))))
@@ -115,7 +116,8 @@
 	 (if (and key (not (string= key ""))) (format "\n- *Access:* ~%s~" key) "")
 	 (format (concat "\n- *In file:* [[" eldo-git-raw-file "][%s]]\n") f f)
 	 (format (concat "- [[" eldo-git-search-string
-			 "][Find modifications in git logs]]\n\n") (symbol-name c)))
+			 "][Find modifications in git logs]]\n\n")
+		 (symbol-name c)))
 	(when (stringp d) (insert (eldo-make-verbatim d))))
       (goto-char (point-max)))))
 
@@ -141,7 +143,8 @@
 	 (if version (format "- *Since:* Emacs version %s\n" version) "")
 	 (format (concat "- *In file:* [[" eldo-git-raw-file "][%s]]\n") f f)
 	 (format (concat "- [[" eldo-git-search-string
-			 "][Find modifications in git logs]]\n\n") (symbol-name o)))
+			 "][Find modifications in git logs]]\n\n")
+		 (symbol-name o)))
 	(when (stringp d) (insert (eldo-make-verbatim d)))))
     (org-set-property "CUSTOM_ID" (symbol-name o))
     (goto-char (point-max))))