Try to fix the abbrev bug again.

lisp/org.el

@@ -4142,8 +4142,9 @@ The following commands are available:
     (org-set-startup-visibility)))
 
 (eval-after-load "abbrev"
-  '(abbrev-table-put org-mode-abbrev-table
-		     :parents (list text-mode-abbrev-table)))
+  '(when (fboundp 'abbrev-table-put)
+     (abbrev-table-put org-mode-abbrev-table
+		       :parents (list text-mode-abbrev-table))))
 
 (put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify)