Browse Source

Get rid of unnecessary prompt in agenda view

Patch by Bernt Hansen

http://thread.gmane.org/gmane.emacs.orgmode/16485
Carsten Dominik 15 years ago
parent
commit
7d5fe030e3
2 changed files with 14 additions and 11 deletions
  1. 11 7
      doc/org.texi
  2. 3 4
      lisp/org-agenda.el

+ 11 - 7
doc/org.texi

@@ -7078,14 +7078,18 @@ the effort criterion.  You can achieve the same effect by pressing @kbd{+} or
 @kindex @{
 @kindex @}
 @item [ ] @{ @}
-In the @i{search view} (@pxref{Keyword search}), these keys add new search
-words (@kbd{[} and @kbd{]}) or new regular expressions (@kbd{@{} and
-@kbd{@}}) to the query string.  The opening bracket/brace will add a positive
-search term prefixed by @samp{+}, indicating that this search term @i{must}
-occur/match in the entry.  The closing bracket/brace will add a negative
-search term which @i{must not} occur/match in the entry for it to be
+@table @i
+@item @r{in} search view
+add new search words (@kbd{[} and @kbd{]}) or new regular expressions
+(@kbd{@{} and @kbd{@}}) to the query string.  The opening bracket/brace will
+add a positive search term prefixed by @samp{+}, indicating that this search
+term @i{must} occur/match in the entry.  The closing bracket/brace will add a
+negative search term which @i{must not} occur/match in the entry for it to be
 selected.
-
+@item @r{in} weekly/daily agenda @r{or}
+@itemx @r{in} timeline view
+Redisplay with inactive timestamps included.
+@end table
 
 @tsubheading{Remote editing}
 @cindex remote editing, from agenda

+ 3 - 4
lisp/org-agenda.el

@@ -4957,10 +4957,9 @@ Negative selection means, regexp must not match for selection of an entry."
 (defun org-agenda-manipulate-query (char)
   (cond
    ((memq org-agenda-type '(timeline agenda))
-    (if (y-or-n-p "Re-display with inactive time stamps included? ")
-	(let ((org-agenda-include-inactive-timestamps t))
-	  (org-agenda-redo))
-      (error "Abort")))
+    (let ((org-agenda-include-inactive-timestamps t))
+      (org-agenda-redo))
+    (message "Display now includes inactive timestamps as well"))
    ((eq org-agenda-type 'search)
     (org-add-to-string
      'org-agenda-query-string