Keep byte compiler happy

4 files changed, 32 insertions, 28 deletions

diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index fd6ab3e..6d5a36c 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -348,37 +348,38 @@ This is used by Org to re-create the anniversary hash table."
 	  (bbdb-record-name (car (bbdb-completing-read-record "Name: ")))))
 
 (defun org-bbdb-anniv-export-ical ()
- "Extract anniversaries from BBDB and convert them to icalendar format."
- (require 'bbdb)
- (require 'diary-lib)
- (unless (hash-table-p org-bbdb-anniv-hash)
-   (setq org-bbdb-anniv-hash
+  "Extract anniversaries from BBDB and convert them to icalendar format."
+  (require 'bbdb)
+  (require 'diary-lib)
+  (unless (hash-table-p org-bbdb-anniv-hash)
+    (setq org-bbdb-anniv-hash
 	  (make-hash-table :test 'equal :size 366)))
- (when (or org-bbdb-updated-p
-           (= 0 (hash-table-count org-bbdb-anniv-hash)))
-   (org-bbdb-make-anniv-hash))
- 
- (defun org-bbdb-format-vevent (key recs)
-   (while (setq rec (pop recs))
-     (princ (format "BEGIN:VEVENT
+  (when (or org-bbdb-updated-p
+	    (= 0 (hash-table-count org-bbdb-anniv-hash)))
+    (org-bbdb-make-anniv-hash))
+  (maphash 'org-bbdb-format-vevent org-bbdb-anniv-hash))
+
+(defun org-bbdb-format-vevent (key recs)
+  (let (rec categ)
+    (while (setq rec (pop recs))
+      (princ (format "BEGIN:VEVENT
 UID: ANNIV-%4i%02i%02i-%s
 DTSTART:%4i%02i%02i
 SUMMARY:%s\n"
-                      (nth 0 rec)
-                      (nth 0 key)
-                      (nth 1 key)
-		      (mapconcat 'identity
-				 (org-split-string (nth 1 rec) "[^a-zA-Z0-90]+")
-				 "-")
-                      (nth 0 rec)
-                      (nth 0 key)
-                      (nth 1 key)
-                      (nth 1 rec)))
-     (if (setq categ (nth 2 rec))
-         (princ (format "CATEGORIES:%s\n" (upcase categ))))
-     (princ "RRULE:FREQ=YEARLY
-END:VEVENT\n")))
- (maphash 'org-bbdb-format-vevent org-bbdb-anniv-hash))
+		     (nth 0 rec)
+		     (nth 0 key)
+		     (nth 1 key)
+		     (mapconcat 'identity
+				(org-split-string (nth 1 rec) "[^a-zA-Z0-90]+")
+				"-")
+		     (nth 0 rec)
+		     (nth 0 key)
+		     (nth 1 key)
+		     (nth 1 rec)))
+      (if (setq categ (nth 2 rec))
+	  (princ (format "CATEGORIES:%s\n" (upcase categ))))
+      (princ "RRULE:FREQ=YEARLY
+END:VEVENT\n"))))
 
 (provide 'org-bbdb)
 
diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el
index 8b3681a..195a7af 100644
--- a/lisp/org-icalendar.el
+++ b/lisp/org-icalendar.el
@@ -28,6 +28,8 @@
 
 (require 'org-exp)
 
+(declare-function org-bbdb-anniv-export-ical "org-bbdb" nil)
+
 (defgroup org-export-icalendar nil
   "Options specific for iCalendar export of Org-mode files."
   :tag "Org Export iCalendar"
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 63581ff..483267b 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1386,7 +1386,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	      (trans '(("\\" . "\\backslash")
 		       ("~" . "\\ensuremath{\\sim}")
 		       ("^" . "\\ensuremath{\\wedge}")))
-	      (rtn ""))
+	      (rtn "") char)
 	  (while (string-match "[\\{}$%&_#~^]" string)
 	    (setq char (match-string 0 string))
 	    (if (> (match-beginning 0) 0)
diff --git a/lisp/org-src.el b/lisp/org-src.el
index d5719dc..4f55c7a 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -35,6 +35,7 @@
 (require 'org-compat)
 
 (declare-function org-do-remove-indentation "org" (&optional n))
+(declare-function org-get-indentation "org" (&optional line))
 
 (defcustom org-edit-src-region-extra nil
   "Additional regexps to identify regions for editing with `org-edit-src-code'.