From 9a8dab1436fe10ca222544125695cd38e91c7eb2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 9 Apr 2011 13:18:13 +0200 Subject: [PATCH 1/2] Correctly fontify description items * lisp/org.el (org-set-font-lock-defaults): Be more strict when recognizing description items, and do not fontify wrong cases like: "- term ::description" or "1. term :: description" --- lisp/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 50ca6bc83..2d780f62f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5593,8 +5593,8 @@ needs to be inserted at a specific position in the font-lock sequence.") '("\\[\\([0-9]*%\\)\\]\\|\\[\\([0-9]*\\)/\\([0-9]*\\)\\]" (0 (org-get-checkbox-statistics-face) t))) ;; Description list items - '("^[ \t]*\\([-+*]\\|[0-9]+[.)]\\)[ \t]+\\(.*? ::\\)" - 2 'bold prepend) + '("^[ \t]*[-+*][ \t]+\\(.*?[ \t]+::\\)\\([ \t]+\\|$\\)" + 1 'bold prepend) ;; ARCHIVEd headings (list (concat "^\\*+ \\(.*:" org-archive-tag ":.*\\)") '(1 'org-archived prepend)) From abad1b499471150604e4c0bec20369d8e089c3e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 12 Mar 2011 17:26:18 +0100 Subject: [PATCH 2/2] Auto-fill shouldn't insert new items * lisp/org-list.el (org-list-in-valid-context-p): renamed from org-list-in-valid-block-p. (org-at-item-p,org-list-search-generic): use renamed function. * lisp/org.el (org-fill-item-nobreak-p): new function. (org-set-autofill-regexps): modify `fill-nobreak-predicate' to prevent auto-fill from breaking line just before an item regexp. --- lisp/org-list.el | 6 +++--- lisp/org.el | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/org-list.el b/lisp/org-list.el index 2950daac9..b657042c2 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -401,7 +401,7 @@ group 4: description tag") (goto-char (match-end 0))) (looking-at regexp)))) -(defun org-list-in-valid-block-p () +(defun org-list-in-valid-context-p () "Non-nil if point is in a valid block. Invalid blocks are referring to `org-list-forbidden-blocks'." (save-match-data @@ -491,7 +491,7 @@ This checks `org-list-ending-method'." "Is point in a line starting a hand-formatted item?" (save-excursion (beginning-of-line) - (and (looking-at (org-item-re)) (org-list-in-valid-block-p)))) + (and (looking-at (org-item-re)) (org-list-in-valid-context-p)))) (defun org-at-item-bullet-p () "Is point at the bullet of a plain list item?" @@ -1053,7 +1053,7 @@ in `re-search-forward'." nil))) ;; 2. Match in valid context: return point. Else, continue ;; searching. - (when (org-list-in-valid-block-p) (throw 'exit (point))))))) + (when (org-list-in-valid-context-p) (throw 'exit (point))))))) (defun org-list-search-backward (regexp &optional bound noerror) "Like `re-search-backward' but stop only where lists are recognized. diff --git a/lisp/org.el b/lisp/org.el index 2d780f62f..08f8fa659 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19180,6 +19180,11 @@ the functionality can be provided as a fall-back.") ;; and fixed-width regions are not wrapped. That function will pass ;; through to `fill-paragraph' when appropriate. (org-set-local 'fill-paragraph-function 'org-fill-paragraph) + ;; Prevent auto-fill from inserting unwanted new items. + (org-set-local 'fill-nobreak-predicate + (if (memq 'org-fill-item-nobreak-p fill-nobreak-predicate) + fill-nobreak-predicate + (cons 'org-fill-item-nobreak-p fill-nobreak-predicate))) ;; 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 (current-buffer)) @@ -19195,6 +19200,10 @@ the functionality can be provided as a fall-back.") (regexp . "^#\\+[A-Z_]+:\\(\\s-*\\)\\S-+") (modes . '(org-mode)))))) +(defun org-fill-item-nobreak-p () + "Non-nil when a line break at point would insert a new item." + (and (looking-at (org-item-re)) (org-list-in-valid-context-p))) + (defun org-fill-paragraph (&optional justify) "Re-align a table, pass through to fill-paragraph if no table." (let ((table-p (org-at-table-p))