ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2012-10-20 11:59:07 +02:00
parent 6f7e92bdb6 93040f4671
commit bef53d7f67
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -21360,7 +21360,10 @@ a footnote definition, try to fill the first paragraph within."
;; Check if auto-filling is meaningful. ;; Check if auto-filling is meaningful.
(let ((fc (current-fill-column))) (let ((fc (current-fill-column)))
(when (and fc (> (current-column) fc)) (when (and fc (> (current-column) fc))
(let ((fill-prefix (org-adaptive-fill-function))) (let* ((fill-prefix (org-adaptive-fill-function))
;; Enforce empty fill prefix, if required. Otherwise, it
;; will be computed again.
(adaptive-fill-mode (not (equal fill-prefix ""))))
(when fill-prefix (do-auto-fill)))))) (when fill-prefix (do-auto-fill))))))
(defun org-comment-line-break-function (&optional soft) (defun org-comment-line-break-function (&optional soft)

16
testing/lisp/test-org.el
View File

@ -200,6 +200,22 @@
(end-of-line) (end-of-line)
(org-auto-fill-function) (org-auto-fill-function)
(buffer-string))))) (buffer-string)))))
;; A hash within a line isn't a comment.
(should-not
(equal "12345 # 7890\n# 1"
(org-test-with-temp-text "12345 # 7890 1"
(let ((fill-column 12))
(end-of-line)
(org-auto-fill-function)
(buffer-string)))))
;; Correctly interpret empty prefix.
(should-not
(equal "# a\n# b\nRegular\n# paragraph"
(org-test-with-temp-text "# a\n# b\nRegular paragraph"
(let ((fill-column 12))
(end-of-line 3)
(org-auto-fill-function)
(buffer-string)))))
;; Comment block: auto fill contents. ;; Comment block: auto fill contents.
(should (should
(equal "#+BEGIN_COMMENT\n12345\n7890\n#+END_COMMENT" (equal "#+BEGIN_COMMENT\n12345\n7890\n#+END_COMMENT"