Merge branch 'maint'

doc/org.texi

@@ -4273,10 +4273,10 @@ The TODO may also have minimum and maximum ranges specified by using the
 syntax @samp{.+2d/3d}, which says that you want to do the task at least every
 three days, but at most every two days.
 @item
-You must also have state logging for the @code{DONE} state enabled, in order
+You must also have state logging for the @code{DONE} state enabled
-for historical data to be represented in the consistency graph.  If it is not
+(@pxref{Tracking TODO state changes}), in order for historical data to be
-enabled it is not an error, but the consistency graphs will be largely
+represented in the consistency graph.  If it is not enabled it is not an
-meaningless.
+error, but the consistency graphs will be largely meaningless.
 @end enumerate
 
 To give you an idea of what the above rules look like in action, here's an

lisp/org-agenda.el

@@ -1883,11 +1883,8 @@ The buffer is still writable when this hook is called.")
 Agenda commands will then show existing buffer instead of generating new ones.
 When nil, `q' will kill the single agenda buffer."
   :group 'org-agenda
-  :type 'boolean
+  ;; :version "24.3"
-  :set (lambda (var val)
+  :type 'boolean)
-	 (if (boundp var)
-	     (org-toggle-sticky-agenda (if val 1 0))
-	   (set var val))))
 
 ;;;###autoload
 (defun org-toggle-sticky-agenda (&optional arg)