diff options
| author | Glenn Morris | 2014-02-25 13:10:52 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-02-25 13:10:52 -0500 |
| commit | 4ff933dd26228b54603393fa0aff17a9a945b9b2 (patch) | |
| tree | c535c74f35af449e522a62c47d43b08f89626dca /lisp | |
| parent | ea922c8bb309d1e3d52ea27960ed626f589fd63f (diff) | |
| download | emacs-4ff933dd26228b54603393fa0aff17a9a945b9b2.tar.gz emacs-4ff933dd26228b54603393fa0aff17a9a945b9b2.zip | |
* org-version.el (org-odt-data-dir): Remove incorrect, duplicate definition.
Fixes: debbugs:16734
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/org/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 3 |
2 files changed, 5 insertions, 3 deletions
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 @@ | |||
| 1 | 2014-02-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * org-version.el (org-odt-data-dir): | ||
| 4 | Remove incorrect, duplicate definition. (Bug#16734) | ||
| 5 | |||
| 1 | 2014-01-08 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2014-01-08 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Spelling fixes. | 8 | 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 @@ | |||
| 13 | Inserted by installing org-mode or when a release is made." | 13 | Inserted by installing org-mode or when a release is made." |
| 14 | (let ((org-git-version "release_8.2.5c")) | 14 | (let ((org-git-version "release_8.2.5c")) |
| 15 | org-git-version)) | 15 | org-git-version)) |
| 16 | ;;;###autoload | ||
| 17 | (defvar org-odt-data-dir "/usr/share/emacs/etc/org" | ||
| 18 | "The location of ODT styles.") | ||
| 19 | 16 | ||
| 20 | (provide 'org-version) | 17 | (provide 'org-version) |
| 21 | 18 | ||