diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2011-02-22 20:55:41 +0100 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2011-02-22 20:55:41 +0100 |
commit | 648934609336a8919009599260a8b2d94f2b4d64 (patch) | |
tree | d7c9af6f7a92c4496f0dcdbbb11de9f55d88d4d3 | |
parent | 90ad8147032794ae5a63f9994e01ae42c2a1df06 (diff) | |
download | org-mode-648934609336a8919009599260a8b2d94f2b4d64.tar.gz |
Make byte-compiler happy
-rw-r--r-- | lisp/org-list.el | 1 | ||||
-rw-r--r-- | lisp/org.el | 28 |
2 files changed, 14 insertions, 15 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el index a171ced..f66c665 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -121,6 +121,7 @@ (declare-function org-trim "org" (s)) (declare-function org-uniquify "org" (list)) (declare-function outline-invisible-p "outline" (&optional pos)) +(declare-function outline-flag-region "outline" (from to flag)) (declare-function outline-next-heading "outline" ()) (declare-function outline-previous-heading "outline" ()) diff --git a/lisp/org.el b/lisp/org.el index bff345b..f4d6962 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19096,23 +19096,21 @@ the functionality can be provided as a fall-back.") (save-restriction (narrow-to-region beg end) (save-excursion (fill-paragraph justify)))) t)) - ;; Special case where point is not in a list but is on a - ;; paragraph adjacent to a list: make sure this paragraph + ;; Special case where point is not in a list but is on + ;; a paragraph adjacent to a list: make sure this paragraph ;; doesn't get merged with the end of the list by narrowing ;; buffer first. - ((save-excursion - (fill-forward-paragraph -1) - (setq itemp (org-in-item-p))) - (save-excursion - (goto-char itemp) - (setq struct (org-list-struct))) - (save-restriction - (narrow-to-region (org-list-get-bottom-point struct) - (save-excursion - (fill-forward-paragraph 1) - (point))) - (fill-paragraph justify) t)) - (t nil)))) ; call `fill-paragraph' + ((save-excursion (fill-forward-paragraph -1) + (setq itemp (org-in-item-p))) + (let ((struct (save-excursion (goto-char itemp) + (org-list-struct)))) + (save-restriction + (narrow-to-region (org-list-get-bottom-point struct) + (save-excursion (fill-forward-paragraph 1) + (point))) + (fill-paragraph justify) t))) + ;; Else simply call `fill-paragraph'. + (t nil)))) ;; For reference, this is the default value of adaptive-fill-regexp ;; "[ \t]*\\([-|#;>*]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*" |