Re: orgstruct-mode with custom headline prefix

[Bastien <bzg@altern.org>]

[-- Attachment #1: Type: text/plain, Size: 960 bytes --]

Hi Christopher,

Christopher Schmidt <christopher@ch.ristopher.com> writes:

> These internal functions should have been autoloaded.  progv is pretty
> obscure and I guess noone has noticed that bug in cl-macs until now.

The attached patch gets rid of progv by using org-let.

As a side-effect, it fixes a but that was introduced with
your change: M-x turn-on-orgstruct RET in message-mode and
try to move around list items for example... it will choke
at org-auto-fill-function not being defined.  The bug is
not limited to this example of course.

Let me know if it breaks something I may have overlooked.

>> Emacs 24.3.93 seems to have that fixed,
>
> So does 24.2.x.
>
> I will push a fix ASAP.
>
>> but complains about this instead:
>> In org-heading-components:
>> org.el:7436:16:Warning: reference to free variable `orgstruct-mode'
>
> This one is bogus, the variable is defined later on.  I will silence
> that warning.

Thanks in advance for this!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix-orgstruct-changes.patch --]
[-- Type: text/x-patch, Size: 1157 bytes --]

diff --git a/lisp/org.el b/lisp/org.el
index 5892489..b251cbe 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8781,7 +8781,7 @@ Possible values in the list of contexts are `table', `headline', and `item'."
              (setq x
                    (if (symbolp x)
                        (list x)
-                     (list (car x) (cdr x))))
+                     (list (car x) (list 'quote (cdr x)))))
              (if (and (not (get (car x) 'org-state))
                       (string-match
                        "^\\(org-\\|orgtbl-\\|outline-\\|comment-\\|paragraph-\\|auto-fill\\|normal-auto-fill\\|fill-paragraph\\|indent-\\)"
@@ -8810,15 +8810,8 @@ call CMD."
   (org-load-modules-maybe)
   (unless org-local-vars
     (setq org-local-vars (org-get-local-variables)))
-  (let (symbols values)
-    (dolist (var org-local-vars)
-      (when (or (not (boundp (car var)))
-		(eq (symbol-value (car var))
-		    (default-value (car var))))
-        (push (car var) symbols)
-        (push (cadr var) values)))
-    (progv symbols values
-      (call-interactively cmd))))
+  (org-let org-local-vars
+    (call-interactively cmd)))
 
 ;;;; Archiving
 

[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


-- 
 Bastien