Keep byte compiler happy

lisp/org-agenda.el

@@ -2256,7 +2256,7 @@ This will add a maximum of `org-agenda-add-entry-text-maxlines' lines of the
 entry text following headings shown in the agenda.
 Drawers will be excluded, also the line with scheduling/deadline info."
   (when (> org-agenda-add-entry-text-maxlines 0)
-    (let (m txt drawer-re kwd-time-re ind)
+    (let (m txt)
       (goto-char (point-min))
       (while (not (eobp))
 	(if (not (setq m (get-text-property (point) 'org-hd-marker)))
@@ -2269,7 +2269,7 @@ Drawers will be excluded, also the line with scheduling/deadline info."
 (defun org-agenda-get-some-entry-text (marker n-lines)
   "Extract entry text from MARKER, at most N-LINES lines.
 This will ignore drawers etc, just get the text."
-  (let (txt)
+  (let (txt drawer-re kwd-time-re ind)
     (save-excursion
       (with-current-buffer (marker-buffer marker)
 	(if (not (org-mode-p))

lisp/org-exp.el

@@ -1876,7 +1876,7 @@ When it is nil, all comments will be removed."
        (let* ((s (concat (match-string 1)
 			 "[[" (match-string 2) ":" (match-string 3)
 			 "][" (match-string 2) ":" (org-export-protect-sub-super
-						    )(match-string 3)
+						    (match-string 3))
 			 "]]")))
 	 (put-text-property 0 (length s) 'face 'org-link s)
 	 (replace-match s t t))))

lisp/org-footnote.el

@@ -38,6 +38,7 @@
 (require 'org-macs)
 (require 'org-compat)
 
+(declare-function org-in-commented-line "org" ())
 (declare-function org-in-regexp "org" (re &optional nlines visually))
 (declare-function org-mark-ring-push "org" (&optional pos buffer))
 (declare-function outline-next-heading "outline")

lisp/org.el

@@ -102,10 +102,9 @@
   "Show the org-mode version in the echo area.
 With prefix arg HERE, insert it at point."
   (interactive "P")
-  (let* ((org-version org-version)
+  (let* ((version org-version)
 	 (git-version)
-	 (dir (concat (file-name-directory (locate-library "org")) "../" ))
-	 (version))
+	 (dir (concat (file-name-directory (locate-library "org")) "../" )))
     (if (and (file-exists-p (expand-file-name ".git" dir))
 	     (executable-find "git"))
 	(let ((pwd (substring (pwd) 10)))
@@ -120,9 +119,9 @@ With prefix arg HERE, insert it at point."
 		(shell-command "git diff-index --name-only HEAD --")
 		(unless (eql 1 (point-max))
 		  (setq git-version (concat git-version ".dirty")))
-		(setq org-version (concat org-version " (" git-version ")")))
+		(setq version (concat version " (" git-version ")")))
 	    (cd pwd))))
-    (setq version (format "Org-mode version %s" org-version))
+    (setq version (format "Org-mode version %s" version))
     (if here (insert version))
     (message version)
     version))
@@ -13455,31 +13454,6 @@ changes from another.  I believe the procedure must be like this:
 
 ;;;; Agenda files
 
-;;;###autoload
-(defun org-iswitchb (&optional arg)
-  "Use `iswitchb-read-buffer' to prompt for an Org buffer to switch to.
-With a prefix argument, restrict available to files.
-With two prefix arguments, restrict available buffers to agenda files.
-
-Due to some yet unresolved reason, the global function
-`iswitchb-mode' needs to be active for this function to work."
-  (interactive "P")
-  (require 'iswitchb)
-  (let ((enabled iswitchb-mode) blist)
-    (or enabled (iswitchb-mode 1))
-    (setq blist (cond ((equal arg '(4)) (org-buffer-list 'files))
-		      ((equal arg '(16)) (org-buffer-list 'agenda))
-		      (t (org-buffer-list))))
-   (unwind-protect
-       (let ((iswitchb-make-buflist-hook
-	      (lambda ()
-		(setq iswitchb-temp-buflist
-		      (mapcar 'buffer-name blist)))))
-	 (switch-to-buffer
-	  (iswitchb-read-buffer
-	   "Switch-to: " nil t)))
-	 (or enabled (iswitchb-mode -1)))))
-
 ;;;###autoload
 (defun org-iswitchb (&optional arg)
   "Use `org-icompleting-read' to prompt for an Org buffer to switch to.
@@ -14024,6 +13998,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]."
 	      (delete-region beg end)
 	      (insert link))))))))
 
+(defvar org-export-latex-packages-alist) ;; defined in org-latex.el
 ;; This function borrows from Ganesh Swami's latex2png.el
 (defun org-create-formula-image (string tofile options buffer)
   (require 'org-latex)