summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-05-06 09:37:14 +0200
committerBastien Guerry <bzg@altern.org>2012-05-06 09:37:14 +0200
commit99c97fbffc89e956c9179401187fbc5a69547cf9 (patch)
treed4dd936fe2b28977162e0924df097282bd4b900b
parentfe0641a0fbef7b70834cbfefc61b42f188098d6d (diff)
downloadorg-mode-99c97fbffc89e956c9179401187fbc5a69547cf9.tar.gz
Fix bug in `org-indent-line-function'.
* org.el (org-indent-line-function): Use `org-let' instead of `orgstruct++-ignore-org-filling'. (org-fill-paragraph, org-auto-fill-function): Ditto. * org-macs.el (orgstruct++-ignore-org-filling): Delete.
-rw-r--r--lisp/org-macs.el6
-rw-r--r--lisp/org.el13
2 files changed, 6 insertions, 13 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index c33ae57..481558f 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -410,12 +410,6 @@ the value in cdr."
(cons (list (car flat) (cadr flat))
(org-make-parameter-alist (cddr flat)))))
-(defmacro orgstruct++-ignore-org-filling (&rest body)
- "Ignore org filling in `orgstruct++-mode'."
- `(let ,org-fb-vars
- ,@body))
-(def-edebug-spec orgstruct++-ignore-org-filling (body))
-
(provide 'org-macs)
;;; org-macs.el ends here
diff --git a/lisp/org.el b/lisp/org.el
index e81abe3..e7c42db 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20422,7 +20422,6 @@ If point is in an inline task, mark that task instead."
;;; Paragraph filling stuff.
;; We want this to be just right, so use the full arsenal.
-(declare-function orgstruct++-ignore-org-filling "org-macs.el" (&rest body))
(defun org-indent-line-function ()
"Indent line depending on context."
(interactive)
@@ -20534,8 +20533,8 @@ If point is in an inline task, mark that task instead."
t t))
(org-move-to-column column)
(when (and orgstruct-is-++ (eq pos (point)))
- (orgstruct++-ignore-org-filling
- (indent-according-to-mode)))))
+ (org-let org-fb-vars
+ '(indent-according-to-mode)))))
(defun org-indent-drawer ()
"Indent the drawer at point."
@@ -20732,8 +20731,8 @@ the functionality can be provided as a fall-back.")
(fill-paragraph justify) t))
;; Else falls back on `org-fill-paragraph-fallback-function'
(orgstruct-is-++
- (orgstruct++-ignore-org-filling
- (fill-paragraph)))
+ (org-let org-fb-vars
+ '(fill-paragraph)))
;; (org-fill-paragraph-fallback-function
;; (funcall org-fill-paragraph-fallback-function justify))
;; Else simply call `fill-paragraph'.
@@ -20781,8 +20780,8 @@ the functionality can be provided as a fall-back.")
(flet ((fill-context-prefix (from to &optional flr) prefix))
(do-auto-fill))))
(orgstruct-is-++
- (orgstruct++-ignore-org-filling
- (do-auto-fill)))
+ (org-let org-fb-vars
+ '(do-auto-fill)))
(t (do-auto-fill))))))
;;; Other stuff.