summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-04-23 21:02:19 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-04-23 21:02:19 +0200
commit07198e34f6b9895498cdf0aa840c5dddaef070e0 (patch)
treefd5b0a2c5a3cb765646ceb954da62eb4d89aeb7e
parentff3855027811bae0bc071fc9989952b5a6dd5f2a (diff)
downloadorg-mode-07198e34f6b9895498cdf0aa840c5dddaef070e0.tar.gz
XEmacs compatibility fix
-rwxr-xr-xlisp/ChangeLog2
-rw-r--r--lisp/org.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9087453..ad6d7c6 100755
--- a/lisp/ChangeLog
+++ b/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
diff --git a/lisp/org.el b/lisp/org.el
index c0369f3..62df86c 100644
--- a/lisp/org.el
+++ b/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")