Re: bug#15888: 24.3.50; Eval-after-load eval'ed twice

[Nick Dokos <ndokos@gmail.com>]

Nicolas Goaziou <n.goaziou@gmail.com> writes:

> Hello,
>
> Nick Dokos <ndokos@gmail.com> writes:
>
>> Glenn Morris <rgm@gnu.org> writes:
>>
>>> "Sebastien Vauban" wrote:
>>>
>>>> But I wonder: how can you now reproduce it (and not before)?
>>>
>>> Because I downloaded a snapshot of Org.
>>> Your problem is not with code that is in Emacs current trunk.
>>
>> Using Glenn's reproducer, I bisected it - another one for Nicolas's
>> TODO list, proving once again that no good deed goes unpunished :-)
>>
>> 0cecf32a0ae559266555b96668dc305710366c96 is the first bad commit
>> commit 0cecf32a0ae559266555b96668dc305710366c96
>> Author: Nicolas Goaziou <n.goaziou@gmail.com>
>> Date:   Sun Oct 27 11:09:17 2013 +0100
>
> Well. The only thing related to load/autoload I can think of is calling
> `org-element-cache-reset' in `org-mode' and `org-set-modules'.
>
> Could you try to replace these calls with
>
>   (when (fboundp 'org-element-cache-reset) (org-element-cache-reset))
>
> and test again?
>
>

Assuming I've done everything correctly, this does not fix it.

Here's the diff of what I did - let me know if I goofed:

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/org.el b/lisp/org.el
index a3c1958..53eea84 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -373,7 +373,8 @@ When MESSAGE is non-nil, display a message with the version."
   (set var value)
   (when (featurep 'org)
     (org-load-modules-maybe 'force)
-    (org-element-cache-reset 'all)))
+    (when (fboundp 'org-element-cache-reset) (org-element-cache-reset 'all))))
+;    (org-element-cache-reset 'all)))
 
 (defcustom org-modules '(org-w3m org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail)
   "Modules that should always be loaded together with org.el.
@@ -5361,7 +5362,8 @@ The following commands are available:
   ;; Comments.
   (org-setup-comments-handling)
   ;; Initialize cache.
-  (org-element-cache-reset)
+  ;; (org-element-cache-reset)
+  (when (fboundp 'org-element-cache-reset) (org-element-cache-reset))
   ;; Beginning/end of defun
   (org-set-local 'beginning-of-defun-function 'org-backward-element)
   (org-set-local 'end-of-defun-function 'org-forward-element)
--8<---------------cut here---------------end--------------->8---

> Regards,

-- 
Nick