From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: [PATCH] Auto-fill shouldn't insert new items Date: Sat, 12 Mar 2011 17:29:39 +0100 Message-ID: <1299947379-19291-1-git-send-email-n.goaziou@gmail.com> Return-path: Received: from [140.186.70.92] (port=48743 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PyRhZ-0007Jf-Fz for emacs-orgmode@gnu.org; Sat, 12 Mar 2011 11:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PyRhY-0000jx-5s for emacs-orgmode@gnu.org; Sat, 12 Mar 2011 11:30:01 -0500 Received: from mail-fx0-f41.google.com ([209.85.161.41]:62350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PyRhX-0000jp-W3 for emacs-orgmode@gnu.org; Sat, 12 Mar 2011 11:30:00 -0500 Received: by fxm18 with SMTP id 18so2116822fxm.0 for ; Sat, 12 Mar 2011 08:29:59 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org mode list Cc: Nicolas Goaziou * 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 4b50910..bdef14e 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -400,7 +400,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 @@ -487,7 +487,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?" @@ -1049,7 +1049,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 96ad8ff..4a3efc4 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19113,6 +19113,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)) @@ -19128,6 +19133,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)) -- 1.7.4.1