Merge branch 'maint'

lisp/org-agenda.el

@@ -3005,6 +3005,8 @@ This ensures the export commands can easily use it."
 	       (kill-buffer bufname)))))))
 (def-edebug-spec org-batch-store-agenda-views (&rest sexp))
 
+(defvar org-agenda-current-span nil
+  "The current span used in the agenda view.") ; local variable in the agenda buffer
 (defun org-agenda-mark-header-line (pos)
   "Mark the line at POS as an agenda structure header."
   (save-excursion
@@ -3818,8 +3820,6 @@ When EMPTY is non-nil, also include days without any entries."
   "Start day for the agenda view.
 Custom commands can set this variable in the options section.")
 (defvar org-starting-day nil) ; local variable in the agenda buffer
-(defvar org-agenda-current-span nil
-  "The current span used in the agenda view.") ; local variable in the agenda buffer
 (defvar org-arg-loc nil) ; local variable
 
 (defvar org-agenda-entry-types '(:deadline :scheduled :timestamp :sexp)
@@ -4131,9 +4131,6 @@ as a whole, to include whitespace.
 This command searches the agenda files, and in addition the files listed
 in `org-agenda-text-search-extra-files'."
   (interactive "P")
-  (org-agenda-prepare "SEARCH")
-  (org-compile-prefix-format 'search)
-  (org-set-sorting-strategy 'search)
   (let* ((props (list 'face nil
 		      'done-face 'org-agenda-done
 		      'org-not-done-regexp org-not-done-regexp
@@ -4157,12 +4154,21 @@ in `org-agenda-text-search-extra-files'."
 		     ((integerp edit-at) (cons string edit-at))
 		     (edit-at string))
 		    'org-agenda-search-history)))
+    (catch 'exit
+      (if org-agenda-sticky
+	  (setq org-agenda-buffer-name
+		(if (stringp string)
+		    (format "*Org Agenda(%s:%s)*"
+			    (or keys (or (and todo-only "S") "s")) string)
+		  (format "*Org Agenda(%s)*" (or (and todo-only "S") "s")))))
+      (org-agenda-prepare "SEARCH")
+      (org-compile-prefix-format 'search)
+      (org-set-sorting-strategy 'search)
       (org-set-local 'org-todo-only todo-only)
       (setq org-agenda-redo-command
 	    (list 'org-search-view (if todo-only t nil) string
 		  '(if current-prefix-arg 1 nil)))
       (setq org-agenda-query-string string)
-
       (if (equal (string-to-char string) ?*)
 	  (setq hdl-only t
 		words (substring string 1))
@@ -4327,7 +4333,7 @@ in `org-agenda-text-search-extra-files'."
       (or org-agenda-multi (org-agenda-fit-window-to-buffer))
       (add-text-properties (point-min) (point-max) '(org-agenda-type search))
       (org-finalize-agenda)
-    (setq buffer-read-only t)))
+      (setq buffer-read-only t))))
 
 ;;; Agenda TODO list
 
@@ -4342,9 +4348,6 @@ the list to these.  When using \\[universal-argument], you will be prompted
 for a keyword.  A numeric prefix directly selects the Nth keyword in
 `org-todo-keywords-1'."
   (interactive "P")
-  (org-agenda-prepare "TODO")
-  (org-compile-prefix-format 'todo)
-  (org-set-sorting-strategy 'todo)
   (if (and (stringp arg) (not (string-match "\\S-" arg))) (setq arg nil))
   (let* ((today (org-today))
 	 (date (calendar-gregorian-from-absolute today))
@@ -4360,6 +4363,16 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
 	    (org-icompleting-read "Keyword (or KWD1|K2D2|...): "
 				  (mapcar 'list kwds) nil nil)))
     (and (equal 0 arg) (setq org-select-this-todo-keyword nil))
+    (catch 'exit
+      (if org-agenda-sticky
+	  (setq org-agenda-buffer-name
+		(if (stringp org-select-this-todo-keyword)
+		    (format "*Org Agenda(%s:%s)*" (or keys "t")
+			    org-select-this-todo-keyword)
+		  (format "*Org Agenda(%s)*" (or keys "t")))))
+      (org-agenda-prepare "TODO")
+      (org-compile-prefix-format 'todo)
+      (org-set-sorting-strategy 'todo)
       (org-set-local 'org-last-arg arg)
       (setq org-agenda-redo-command
 	    '(org-todo-list (or current-prefix-arg org-last-arg)))
@@ -4385,7 +4398,7 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
 	(add-text-properties pos (1- (point)) (list 'face 'org-warning))
 	(setq pos (point))
 	(unless org-agenda-multi
-	(insert "Available with `N r': (0)ALL")
+	  (insert "Available with `N r': (0)[ALL]")
 	  (let ((n 0) s)
 	    (mapc (lambda (x)
 		    (setq s (format "(%d)%s" (setq n (1+ n)) x))
@@ -4402,7 +4415,7 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
       (or org-agenda-multi (org-agenda-fit-window-to-buffer))
       (add-text-properties (point-min) (point-max) '(org-agenda-type todo))
       (org-finalize-agenda)
-    (setq buffer-read-only t)))
+      (setq buffer-read-only t))))
 
 ;;; Agenda tags match
 
@@ -4420,6 +4433,13 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
       (setq match nil))
     (setq matcher (org-make-tags-matcher match)
 	  match (car matcher) matcher (cdr matcher))
+    (catch 'exit
+      (if org-agenda-sticky
+	  (setq org-agenda-buffer-name
+		(if (stringp match)
+		    (format "*Org Agenda(%s:%s)*"
+			    (or keys (or (and todo-only "M") "m")) match)
+		  (format "*Org Agenda(%s)*" (or (and todo-only "M") "m")))))
       (org-agenda-prepare (concat "TAGS " match))
       (org-compile-prefix-format 'tags)
       (org-set-sorting-strategy 'tags)
@@ -4473,7 +4493,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
       (or org-agenda-multi (org-agenda-fit-window-to-buffer))
       (add-text-properties (point-min) (point-max) '(org-agenda-type tags))
       (org-finalize-agenda)
-    (setq buffer-read-only t)))
+      (setq buffer-read-only t))))
 
 ;;; Agenda Finding stuck projects