Achim Gratz <strom...@nexgo.de> wrote: > Bastien writes: > > Well -- I'll be pretty busy next week, so hopefully we can fix this > > soon... any help welcome! :) > > Ditto, but you do realize this will be horribly broken in Emacs 24? > > Anyway, for that single dynamic "state" variable: it is let-bound in > org.el/org-todo and then dynamically scoped in many, many places: > > contrib/lisp/{org-{checklist,choose},org2rem}.el > > /lisp/{org-{agenda,clock,icalendar,mouse,taskjuggler},org}.el > > So the correct prefixed name should probably be org-todo-state (there > are other such "state"s in other places, don't know yet if they are also > dynamically scoped into other functions). You need to also keep track > of which functions use "state" as a formal parameter name, since these > shadow the dynamic variable from the outside, but provide another > "state" for calls on the inside⦠> > Haven't yet checked any of the other definitions that had their name > changed, gotta fetch some sleep before work. > >
I assume that we are talking about the seven commits $ git log --oneline -100 | grep 'Fix global' 6cbf1f4 Fix global dynamic variables in org-agenda.el and org.el. b689cbf Fix global dynamic variables in org-table.el. 9054ba3 Fix global dynamic variables in org-special-blocks.el. b46fa17 Fix global dynamic variables in org-clock.el. 08d9b46 Fix global dynamic variables prefixes in org-bibtex.el. c24fa19 Fix global dynamic variables prefixes in org-mouse.el. fcf13e0 Fix global dynamic variables prefixes in org-beamer.el. I tried reverting these in a branch: I had to merge lisp/org.el by hand while reverting the first one, but the rest went through without any problems. Does that seem like the right thing to do for now then? Nick