Merge from emacs-24; up to 2012-12-08T12:11:29Z!eliz@gnu.org

[gnu-emacs] / lisp / org / org-xoxo.el

diff --git a/lisp/org/org-xoxo.el b/lisp/org/org-xoxo.el
index 02f351fe724944c8b0a5f26830011d5d9178f9d5..1083fe16c536ef7adb183b4347f3f83b3b0521e9 100644 (file)
--- a/lisp/org/org-xoxo.el
+++ b/lisp/org/org-xoxo.el
@@ -1,11 +1,10 @@
 ;;; org-xoxo.el --- XOXO export for Org-mode
 
-;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -50,7 +49,7 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
   (with-current-buffer (get-buffer buffer)
     (let* ((pos (point))
           (opt-plist (org-combine-plists (org-default-export-plist)
-                                       (org-infile-export-plist)))
+                                         (org-infile-export-plist)))
           (filename (concat (file-name-as-directory
                              (org-export-directory :xoxo opt-plist))
                             (file-name-sans-extension
@@ -123,5 +122,8 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 
 (provide 'org-xoxo)
 
+;; Local variables:
+;; generated-autoload-file: "org-loaddefs.el"
+;; End:
 
 ;;; org-xoxo.el ends here