Re: [O] Bug: cdlatex-tab in math-env isn't considered when inside of a list item. [7.7 (release_7.7.513.g2a5877)]

[Nicolas Goaziou]

Hello,

Maik Beckmann <address@hidden> writes:

> The attached patch what works for me.

Your patch prevents cdlatex expansion for LaTeX environments, since
point must be in a LaTeX fragment to trigger `cdlatex-tab'.

I've slightly modified your patch to repair that. Could you test it and
report back the result?

Thanks,

-- 
Nicolas Goaziou

>From fed598af22ac0ecb29285c02d0a10a5af7d91fef Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <address@hidden>
Date: Sat, 12 Nov 2011 15:04:19 +0100
Subject: [PATCH] Allow cdlatex expansions at a list item

* lisp/org.el (org-try-cdlatex-tab): Don't try to expand a LaTeX
  environment when at an item.
(org-cycle): Try to call `cdlatex-tab' before cycling item's
visibility, in order to catch LaTeX fragments at an item.

This patch is a slightly modified version of Maik Beckmann's work.
---
 lisp/org.el |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 9f5754d..0eb458f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6144,6 +6144,8 @@ in special contexts.
             (or (bolp) (not (eq org-cycle-emulate-tab 'exc-hl-bol))))
        (org-inlinetask-toggle-visibility))
 
+       ((org-try-cdlatex-tab))
+
        ;; At an item/headline: delegate to `org-cycle-internal-local'.
        ((and (or (and org-cycle-include-plain-lists (org-at-item-p))
                 (save-excursion (beginning-of-line 1)
@@ -6159,8 +6161,6 @@ in special contexts.
 
        ((org-try-structure-completion))
 
-       ((org-try-cdlatex-tab))
-
        ((run-hook-with-args-until-success
         'org-tab-before-tab-emulation-hook))
 
@@ -16566,7 +16566,8 @@ It makes sense to do so if `org-cdlatex-mode' is active 
and if the cursor is
      ((save-excursion
        (skip-chars-backward "a-zA-Z0-9*")
        (skip-chars-backward " \t")
-       (bolp))
+       ;; An environment cannot be started at an item bullet.
+       (and (bolp) (not (org-at-item-p))))
       (cdlatex-tab) t)
      ((org-inside-LaTeX-fragment-p)
       (cdlatex-tab) t)
-- 
1.7.7.3