| 
					
				 | 
			
			
				@@ -1595,7 +1595,7 @@ two parameters: the first one is the link, the second one is the 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 description generated by `org-insert-link'.  The function should 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 return the description to use." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   :group 'org-link 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  :type 'function) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  :type '(choice (const nil) (function))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 (defgroup org-link-store nil 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   "Options concerning storing links in Org-mode." 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1684,7 +1684,7 @@ Org contains a function for this, so if you set this variable to 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 `org-translate-link-from-planner', you should be able follow many 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 links created by planner." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   :group 'org-link-follow 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  :type 'function) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  :type '(choice (const nil) (function))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 (defcustom org-follow-link-hook nil 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   "Hook that is run after a link has been followed." 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1766,6 +1766,11 @@ another window." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 (const vm-visit-folder) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 (const vm-visit-folder-other-window) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 (const vm-visit-folder-other-frame))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  (cons (const vm-imap) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		(choice 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 (const vm-visit-imap-folder) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 (const vm-visit-imap-folder-other-window) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 (const vm-visit-imap-folder-other-frame))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  (cons (const gnus) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		(choice 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 (const gnus) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2164,7 +2169,9 @@ should be continued.  For example, the function may decide that the entire 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 subtree of the current entry should be excluded and move point to the end 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 of the subtree." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   :group 'org-refile 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  :type 'function) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  :type '(choice 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  (const nil) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  (function))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 (defcustom org-refile-use-cache nil 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   "Non-nil means cache refile targets to speed up the process. 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2807,7 +2814,9 @@ The user can set a different function here, which should take a string 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 as an argument and return the numeric priority." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   :group 'org-priorities 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   :version "24.1" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  :type 'function) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  :type '(choice 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  (const nil) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  (function))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 (defgroup org-time nil 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   "Options concerning time stamps and deadlines in Org-mode." 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3270,7 +3279,7 @@ automatically if necessary." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   :type '(choice 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  (const :tag "Always" t) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  (const :tag "Never" nil) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	  (const :tag "When selection characters are configured" 'auto))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  (const :tag "When selection characters are configured" auto))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 (defcustom org-fast-tag-selection-single-key nil 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   "Non-nil means fast tag selection exits after first change. 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3491,7 +3500,7 @@ value           The value that should be modified. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 The function should return the value that should be displayed, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 or nil if the normal value should be used." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   :group 'org-properties 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  :type 'function) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  :type '(choice (const nil) (function))) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 (defcustom org-effort-property "Effort" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   "The property that is being used to keep track of effort estimates. 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4491,7 +4500,7 @@ Otherwise, these types are allowed: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    inactive: only inactive timestamps (<...) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   scheduled: only scheduled timestamps 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    deadline: only deadline timestamps" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  :type '(choice (const :tag "Scheduled or deadline" 'scheduled-or-deadline) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  :type '(choice (const :tag "Scheduled or deadline" scheduled-or-deadline) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 (const :tag "All timestamps" all) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 (const :tag "Only active timestamps" active) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 (const :tag "Only inactive timestamps" inactive) 
			 |