Imported Upstream version 8.2.4

8 files changed, 25 insertions, 15 deletions

diff --git a/contrib/lisp/org-colview-xemacs.el b/contrib/lisp/org-colview-xemacs.el
index 63c0238..f9b35d3 100644
--- a/contrib/lisp/org-colview-xemacs.el
+++ b/contrib/lisp/org-colview-xemacs.el
@@ -477,6 +477,7 @@ This is the compiled version of the format.")
 (defvar org-colview-initial-truncate-line-value nil
   "Remember the value of `truncate-lines' across colview.")
 
+;;;###autoload
 (defun org-columns-remove-overlays ()
   "Remove all currently active column overlays."
   (interactive)
@@ -820,6 +821,7 @@ around it."
   (let ((value (get-char-property (point) 'org-columns-value)))
     (org-open-link-from-string value arg)))
 
+;;;###autoload
 (defun org-columns-get-format-and-top-level ()
   (let (fmt)
     (when (condition-case nil (org-back-to-heading) (error nil))
@@ -1091,6 +1093,7 @@ Don't set this, this is meant for dynamic scoping.")
                     (org-overlay-display ov (format fmt val))))))
 	    org-columns-overlays))))
 
+;;;###autoload
 (defun org-columns-compute (property)
   "Sum the values of property PROPERTY hierarchically, for the entire buffer."
   (interactive)
@@ -1187,6 +1190,7 @@ Don't set this, this is meant for dynamic scoping.")
 	(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
       sum)))
 
+;;;###autoload
 (defun org-columns-number-to-string (n fmt &optional printf)
   "Convert a computed column number to a string value, according to FMT."
   (cond
diff --git a/contrib/lisp/org-drill.el b/contrib/lisp/org-drill.el
index 5bf6dd4..4387161 100644
--- a/contrib/lisp/org-drill.el
+++ b/contrib/lisp/org-drill.el
@@ -104,7 +104,7 @@ Possible values:
   but a warning message is printed when each leech item is
   presented."
   :group 'org-drill
-  :type '(choice (const 'warn) (const 'skip) (const nil)))
+  :type '(choice (const warn) (const skip) (const nil)))
 
 (defface org-drill-visible-cloze-face
   '((t (:foreground "darkseagreen")))
@@ -256,10 +256,14 @@ directory            All files with the extension '.org' in the same
   ;; 'file-no-restriction' means current file/buffer, ignoring restrictions
   ;; 'directory' means all *.org files in current directory
   :group 'org-drill
-  :type '(choice (const 'file) (const 'tree) (const 'file-no-restriction)
-                 (const 'file-with-archives) (const 'agenda)
-                 (const 'agenda-with-archives) (const 'directory)
-                 list))
+  :type '(choice (const :tag "The current buffer, respecting the restriction if any." file)
+                 (const :tag "The subtree started with the entry at point" tree)
+                 (const :tag "The current buffer, without restriction" file-no-restriction)
+                 (const :tag "The current buffer, and any archives associated with it." file-with-archives)
+                 (const :tag "All agenda files" agenda)
+                 (const :tag "All agenda files with any archive files associated with them." agenda-with-archives)
+                 (const :tag "All files with the extension '.org' in the same directory as the current file (includes the current file if it is an .org file.)"  directory)
+                 (repeat :tag "List of files to scan for drill items." file)))
 
 (defcustom org-drill-save-buffers-after-drill-sessions-p t
   "If non-nil, prompt to save all modified buffers after a drill session
@@ -280,7 +284,7 @@ Available choices are:
   adjusting intervals when items are reviewed early or late has been taken
   from SM11, a later version of the algorithm, and included in Simple8."
   :group 'org-drill
-  :type '(choice (const 'sm2) (const 'sm5) (const 'simple8)))
+  :type '(choice (const sm2) (const sm5) (const simple8)))
 
 (defcustom org-drill-optimal-factor-matrix nil
   "DO NOT CHANGE THE VALUE OF THIS VARIABLE.
diff --git a/contrib/lisp/org-registry.el b/contrib/lisp/org-registry.el
index 1950797..b0ee208 100644
--- a/contrib/lisp/org-registry.el
+++ b/contrib/lisp/org-registry.el
@@ -5,8 +5,8 @@
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-registry.el
 ;; Version: 0.1a
-;; Author: Bastien Guerry <bzg AT gnu DOT org>
-;; Maintainer: Bastien Guerry <bzg AT gnu DOT org>
+;; Author: Bastien Guerry <bzg@gnu.org>
+;; Maintainer: Bastien Guerry <bzg@gnu.org>
 ;; Keywords: org, wp, registry
 ;; Description: Shows Org files where the current buffer is linked
 ;; URL: http://www.cognition.ens.fr/~guerry/u/org-registry.el
diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el
index e0e6098..2d6c846 100644
--- a/contrib/lisp/org-toc.el
+++ b/contrib/lisp/org-toc.el
@@ -2,7 +2,7 @@
 
 ;; Copyright 2007-2013 Free Software Foundation, Inc.
 ;;
-;; Author: Bastien Guerry <bzg AT gnu DOT org>
+;; Author: Bastien Guerry <bzg@gnu.org>
 ;; Keywords: Org table of contents
 ;; Homepage: http://www.cognition.ens.fr/~guerry/u/org-toc.el
 ;; Version: 0.8
diff --git a/contrib/lisp/org-track.el b/contrib/lisp/org-track.el
index db8c34e..4a9d71d 100644
--- a/contrib/lisp/org-track.el
+++ b/contrib/lisp/org-track.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2013
 ;;   Free Software Foundation, Inc.
 ;;
-;; Author: Bastien Guerry <bzg at altern dot org>
+;; Author: Bastien Guerry <bzg@gnu.org>
 ;;         Eric S Fraga   <e.fraga at ucl.ac dot uk>
 ;;         Sebastian Rose <sebastian_rose at gmx dot de>
 ;;         The Worg people http://orgmode.org/worg/
diff --git a/contrib/lisp/ox-freemind.el b/contrib/lisp/ox-freemind.el
index aafd714..801bda1 100644
--- a/contrib/lisp/ox-freemind.el
+++ b/contrib/lisp/ox-freemind.el
@@ -520,7 +520,7 @@ Return output file's name."
   (let* ((extension (concat ".mm" ))
 	 (file (org-export-output-file-name extension subtreep))
 	 (org-export-coding-system 'utf-8))
-    (org-export-to-file 'freemind ,file
+    (org-export-to-file 'freemind file
       async subtreep visible-only body-only ext-plist)))
 
 (provide 'ox-freemind)
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index 672e970..2777e02 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2013  Bastien Guerry
 
-;; Author: Bastien Guerry <bzg at gnu dot org>
+;; Author: Bastien Guerry <bzg@gnu.org>
 ;; Keywords: org, wp, blog, feed, rss
 
 ;; This file is not yet part of GNU Emacs.
@@ -236,7 +236,7 @@ communication channel."
 	   (pubdate
 	    (let ((system-time-locale "C"))
 	      (format-time-string
-	       "%a, %d %h %Y %H:%M:%S %z"
+	       "%a, %d %b %Y %H:%M:%S %z"
 	       (org-time-string-to-time
 		(or (org-element-property :PUBDATE headline)
 		    (error "Missing PUBDATE property"))))))
@@ -308,7 +308,7 @@ as a communication channel."
 	 (author (and (plist-get info :with-author)
 		      (let ((auth (plist-get info :author)))
 			(and auth (org-export-data auth info)))))
-	 (date (format-time-string "%a, %d %h %Y %H:%M:%S %z")) ;; RFC 882
+	 (date (format-time-string "%a, %d %b %Y %H:%M:%S %z")) ;; RFC 882
 	 (description (org-export-data (plist-get info :description) info))
 	 (lang (plist-get info :language))
 	 (keywords (plist-get info :keywords))
diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el
index 13f2f5e..fe88b45 100644
--- a/contrib/lisp/ox-taskjuggler.el
+++ b/contrib/lisp/ox-taskjuggler.el
@@ -800,7 +800,9 @@ a unique id will be associated to it."
           (if (eq (org-element-property :todo-type task) 'done) "100"
             (org-element-property :COMPLETE task)))
          (depends (org-taskjuggler-resolve-dependencies task info))
-         (effort (org-element-property :EFFORT task))
+         (effort (let ((property
+			(intern (concat ":" (upcase org-effort-property)))))
+		   (org-element-property property task)))
          (milestone
           (or (org-element-property :MILESTONE task)
               (not (or (org-element-map (org-element-contents task) 'headline