Keep byte compiler happy

lisp/ChangeLog

@@ -1,3 +1,9 @@
+2009-11-05  Dan Davison  <davison@stats.ox.ac.uk>
+
+	* org-exp.el (org-export-format-source-code-or-example): restrict
+	scope of preserve-indentp to the let binding.
+	(org-src): require org-src, since org-src-preserve-indentation is used.
+
 2009-11-05  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-timer.el (org-timer-set-timer): Set variables

lisp/org-agenda.el

@@ -5763,6 +5763,7 @@ Point is in the buffer where the item originated.")
      (with-current-buffer buffer (delete-region dbeg dend))
      (message "Agenda item and source killed"))))
 
+(defvar org-archive-default-command)
 (defun org-agenda-archive-default ()
   "Archive the entry or subtree belonging to the current agenda entry."
   (interactive)

lisp/org-exp.el

@@ -30,6 +30,7 @@
 (require 'org-macs)
 (require 'org-agenda)
 (require 'org-exp-blocks)
+(require 'org-src)
 (eval-when-compile
   (require 'cl))
 
@@ -2270,7 +2271,7 @@ Code formatting according to language currently only works for HTML.
 Numbering lines works for all three major backends (html, latex, and ascii).
 INDENT was the original indentation of the block."
   (save-match-data
-    (let (num cont rtn rpllbl keepp textareap cols rows fmt)
+    (let (num cont rtn rpllbl keepp textareap preserve-indentp cols rows fmt)
       (setq opts (or opts "")
 	    num (string-match "[-+]n\\>" opts)
 	    cont (string-match "\\+n\\>" opts)

lisp/org.el

@@ -12028,6 +12028,7 @@ allowed value."
 	 (cur (org-entry-get nil prop))
 	 (allowed (org-property-get-allowed-values nil prop 'table))
 	 (existing (mapcar 'list (org-property-values prop)))
+	 rpl
 	 (val (cond
 	       ((stringp value) value)
 	       ((and allowed (integerp value))
@@ -12039,7 +12040,7 @@ allowed value."
 			 (mapconcat 'car allowed " "))
 		(setq rpl (read-char-exclusive))
 		(if (equal rpl ?\r)
-		    (setq val cur)
+		    cur
 		  (setq rpl (- rpl ?0))
 		  (if (equal rpl 0) (setq rpl 10))
 		  (if (and (> rpl 0) (<= rpl (length allowed)))