* org-version.el (org-odt-data-dir): Remove incorrect, duplicate definition.

Fixes: debbugs:16734

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 05549c7eb6b7accaf81614255a710b5816704e30..ebc7799a9a6d0174f1b94c98b87bccaf27a8576a 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-25  Glenn Morris  <rgm@gnu.org>
+
+       * org-version.el (org-odt-data-dir):
+       Remove incorrect, duplicate definition.  (Bug#16734)
+
 2014-01-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        Spelling fixes.

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 7ccddb52a925b54e9b11fefcff8d50df84cb0ba7..d6317274bd3b9704ce7902d267d7608e1bedbc43 100644 (file)
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -13,9 +13,6 @@
   Inserted by installing org-mode or when a release is made."
    (let ((org-git-version "release_8.2.5c"))
      org-git-version))
-;;;###autoload
-(defvar org-odt-data-dir "/usr/share/emacs/etc/org"
-  "The location of ODT styles.")
 \f
 (provide 'org-version)
 \f