Merge branch 'maint'

etc/ORG-NEWS

@@ -1,10 +1,59 @@
+#+LINK: doc http://orgmode.org/worg/doc.html#%s
+
 ORG NEWS -- history of user-visible changes.           -*- org -*-
 
-Copyright (C) 2012  Free Software Foundation, Inc.
+Copyright (C) 2012-2013  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Org bug reports to emacs-orgmode@gnu.org.
 
+* Version 7.9.3
+
+** Agenda speed up
+
+** New option [[doc::org-agenda-use-tag-inheritance][org-agenda-use-tag-inheritance]]
+
+[[doc::org-use-tag-inheritance][org-use-tag-inheritance]] controls whether tags are inherited when
+org-tags-view is called (either in =tags=, =tags-tree= or =tags-todo=
+agenda views.)
+
+When generating other agenda types such as =agenda=, =todo= and
+=todo-tree=, tags inheritance is not used when selecting the entries
+to display.  Still, you might want to have all tag information correct
+in the agenda buffer, e.g. for tag filtering.  In that case, add the
+agenda type to this variable.
+
+Note that setting this variable to nil considerably speeds up the
+agenda generation.
+
+** New default value nil for [[doc::org-agenda-dim-blocked-tasks][org-agenda-dim-blocked-tasks]]
+
+Using `nil' as the default value speeds up the agenda generation.  You
+can hit `#' (or `C-u #') in agenda buffers to temporarily dim (or turn
+invisible) blocked tasks.
+
+** New speedy keys for [[doc::org-speed-commands-default][org-speed-commands-default]]
+
+You can now use `:' (instead of `;') for setting tags---this is
+consistent with using the `:' key in agenda view.
+
+You can now use `=' for [[doc::org-columns][org-columns]].
+
+** =org-float= is now obsolete, use =diary-float= instead
+
+** No GPL manual anymore
+
+There used to be a GPL version of the Org manual, but this is not the
+case anymore, the Free Software Foundation does not permit this.
+
+The GNU FDL license is now included in the manual directly.
+    
+** Enhanced compatibility with Emacs 22 and XEmacs
+
+Thanks to Achim for his work on enhancing Org's compatibility with
+various Emacsen.  Things may not be perfect, but Org should work okay
+in most environments.
+
 * Version 7.9.2
 
 ** New ELPA repository for Org packages

lisp/org-agenda.el

@@ -1686,8 +1686,13 @@ controlled by `org-use-tag-inheritance'.  In other agenda types,
 entries, but you may want the agenda to use the inherited tags
 anyway, e.g. for later tag filtering.
 
-Setting this to nil will speed up non-tags agenda view a lot."
-  :version "24.3")
+The default value reset tags in every agenda type.  Setting this
+option to nil will speed up non-tags agenda view a lot.
+
+Allowed value are 'todo, 'search, 'timeline and 'agenda."
+  :version "24.3"
+  :group 'org-agenda
+  :type '(repeat (symbol :tag "Agenda type")))
 
 (defcustom org-agenda-hide-tags-regexp nil
   "Regular expression used to filter away specific tags in agenda views.