Keep compiler happy

4 files changed, 20 insertions, 19 deletions

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 4202aa6..6fe4e34 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -304,15 +304,6 @@ pointing to it."
 	(insert (format "[%c] %-15s %s\n" i cat task))
 	(cons i marker)))))
 
-
-(defun org-clock-sum-current-item (&optional tstart)
-  "Returns time, clocked on current item in total"
-  (save-excursion
-    (save-restriction
-      (org-narrow-to-subtree)
-      (org-clock-sum tstart)
-      org-clock-file-total-minutes)))
-
 (defun org-clock-get-clock-string ()
   "Form a clock-string, that will be show in the mode line.
 If an effort estimate was defined for current item, use
@@ -785,6 +776,14 @@ TSTART and TEND can mark a time range to be considered."
       (setq org-clock-file-total-minutes (aref ltimes 0)))
     (set-buffer-modified-p bmp)))
 
+(defun org-clock-sum-current-item (&optional tstart)
+  "Returns time, clocked on current item in total"
+  (save-excursion
+    (save-restriction
+      (org-narrow-to-subtree)
+      (org-clock-sum tstart)
+      org-clock-file-total-minutes)))
+
 (defun org-clock-display (&optional total-only)
   "Show subtree times in the entire buffer.
 If TOTAL-ONLY is non-nil, only show the total time for the entire file
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 4c9f8e0..b543d67 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -709,7 +709,7 @@ lang=\"%s\" xml:lang=\"%s\">
 		      (cdr (assoc html-extension org-export-html-xml-declaration))
 		      (cdr (assoc "html" org-export-html-xml-declaration))
 
-		      (t ""))
+		      "")
 		  (or charset "iso-8859-1"))
 		 language language (org-html-expand title)
 		 (or charset "iso-8859-1")
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 0116e44..7947845 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1450,6 +1450,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 
 (defvar org-latex-entities)   ; defined below
 (defvar org-latex-entities-regexp)   ; defined below
+(defvar org-latex-entities-exceptions)   ; defined below
 
 (defun org-export-latex-preprocess (parameters)
   "Clean stuff in the LaTeX export."
diff --git a/lisp/org.el b/lisp/org.el
index 1ba6337..1c3dfe5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -583,6 +583,16 @@ Drawers can be defined on the per-file basis with a line like:
   :group 'org-cycle
   :type '(repeat (string :tag "Drawer Name")))
 
+(defcustom org-hide-block-startup nil
+  "Non-nil means, , entering Org-mode will fold all blocks.
+This can also be set in on a per-file basis with
+
+#+STARTUP: hideblocks
+#+STARTUP: showblocks"
+  :group 'org-startup
+  :group 'org-cycle
+  :type 'boolean)
+
 (defcustom org-cycle-global-at-bob nil
   "Cycle globally if cursor is at beginning of buffer and not at a headline.
 This makes it possible to do global cycling without having to use S-TAB or
@@ -5135,15 +5145,6 @@ Optional argument N means, put the headline into the Nth line of the window."
 
 ;;; Folding of blocks
 
-(defcustom org-hide-block-startup nil
-  "Non-nil means, , entering Org-mode will fold all blocks.
-This can also be set in on a per-file basis with
-
-#+STARTUP: hideblocks
-#+STARTUP: showblocks"
-  :group 'org-startup
-  :type 'boolean)
-
 (defconst org-block-regexp
 
   "^[ \t]*#\\+begin_\\([^ \n]+\\)\\(\\([^\n]+\\)\\)?\n\\([^\000]+?\\)#\\+end_\\1"