From: Glenn Morris <rgm@gnu.org>
Date: Tue, 25 Feb 2014 18:10:52 +0000 (-0500)
Subject: * org-version.el (org-odt-data-dir): Remove incorrect, duplicate definition.
X-Git-Tag: emacs-24.3.90~357^2~7^2~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ff933dd26228b54603393fa0aff17a9a945b9b2;p=emacs.git

* 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 05549c7eb6b..ebc7799a9a6 100644
--- 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 7ccddb52a92..d6317274bd3 100644
--- 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.")
 
 (provide 'org-version)