From fbe1b2ccf74ad5820af056e74e15603481ba4f04 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Thu, 29 Oct 2009 15:21:48 +0100 Subject: [PATCH] Work with abbrev tables only if abbrev.el is loaded --- lisp/ChangeLog | 3 +++ lisp/org.el | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83e051cce..d6ecb1099 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-10-29 Carsten Dominik + * org.el ("abbrev"): Work with abbrev tables only after they have + been loaded. + * org-list.el (org-list-send-list): Fix bug related to match data. diff --git a/lisp/org.el b/lisp/org.el index 8189b8a0b..c9de4c673 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4141,8 +4141,9 @@ The following commands are available: (org-indent-mode 1)) (org-set-startup-visibility))) -(abbrev-table-put org-mode-abbrev-table - :parents (list text-mode-abbrev-table)) +(eval-after-load "abbrev" + '(abbrev-table-put org-mode-abbrev-table + :parents (list text-mode-abbrev-table))) (put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify)