XEmacs compatibility fix

lisp/ChangeLog

@@ -1,5 +1,7 @@
 2010-04-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-set-autofill-regexps): XEmacs compatibility.
+
 	* org-latex.el (org-export-latex-set-initial-vars): Allow "-"
 	in latex class definitions
 

lisp/org.el

@@ -17790,7 +17790,7 @@ the functionality can be provided as a fall-back.")
   (org-set-local 'fill-paragraph-function 'org-fill-paragraph)
   ;; Adaptive filling: To get full control, first make sure that
   ;; `adaptive-fill-regexp' never matches.  Then install our own matcher.
-  (unless (local-variable-p 'adaptive-fill-regexp)
+  (unless (local-variable-p 'adaptive-fill-regexp (current-buffer))
     (org-set-local 'org-adaptive-fill-regexp-backup
                    adaptive-fill-regexp))
   (org-set-local 'adaptive-fill-regexp "\000")