Browse Source

Merge branch 'master' of code.orgmode.org:bzg/org-mode

Carsten Dominik 2 years ago
parent
commit
2d08e9d4be
3 changed files with 10 additions and 8 deletions
  1. 1 1
      doc/org-manual.org
  2. 3 1
      lisp/ol-gnus.el
  3. 6 6
      lisp/org-agenda.el

+ 1 - 1
doc/org-manual.org

@@ -10033,7 +10033,7 @@ the other commands, point needs to be in the desired line.
   persist, set ~org-agenda-bulk-persistent-marks~ to ~t~ or hit
   {{{kbd(p)}}} at the prompt.
 
-  - {{{kbd(*)}}} ::
+  - {{{kbd(p)}}} ::
 
     Toggle persistent marks.
 

+ 3 - 1
lisp/ol-gnus.el

@@ -244,7 +244,9 @@ If `org-store-link' was called with a prefix arg the meaning of
 	       (let ((articles 1)
 		     group-opened)
 		 (while (and (not group-opened)
-			     ;; Stop on integer overflows.
+			     ;; Stop on integer overflows.  Note: We
+			     ;; can drop this once we require at least
+			     ;; Emacs 27, which supports bignums.
 			     (> articles 0))
 		   (setq group-opened (gnus-group-read-group articles t group))
 		   (setq articles (if (< articles 16)

+ 6 - 6
lisp/org-agenda.el

@@ -7576,11 +7576,11 @@ also press `-' or `+' to switch between filtering and excluding."
     (unless char
       (while (not (memq char valid-char-list))
 	(org-unlogged-message
-	 "%s by tag [%s ]:tag-char, [TAB]:tag, %s[/]:off, [+/-]:filter/exclude%s, [q]:quit"
-	 (if exclude "Exclude" "Filter")
+	 "%s by tag%s: [%s ]tag-char [TAB]tag %s[/]off [q]uit"
+	 (if exclude "Exclude[+]" "Filter[-]")
+	 (if expand "" " (no grouptag expand)")
 	 tag-chars
-	 (if org-agenda-auto-exclude-function "[RET], " "")
-	 (if expand "" ", no grouptag expand"))
+	 (if org-agenda-auto-exclude-function "[RET] " ""))
 	(setq char (read-char-exclusive))
 	;; Excluding or filtering down
 	(cond ((eq char ?-) (setq exclude t))
@@ -9915,9 +9915,9 @@ The prefix arg is passed through to the command if possible."
 
   ;; Prompt for the bulk command.
   (org-unlogged-message
-   (concat (if org-agenda-persistent-marks "Bulk (persistent): " "Bulk: ")
+   (concat "Bulk (" (if org-agenda-persistent-marks "" "don't ") "[p]ersist marks): "
 	   "[$]arch [A]rch->sib [t]odo [+/-]tag [s]chd [d]eadline [r]efile "
-	   "[S]catter [f]unction [p]ersist-toggle    "
+	   "[S]catter [f]unction    "
 	   (and org-agenda-bulk-custom-functions
 		(format " Custom: [%s]"
 			(mapconcat (lambda (f) (char-to-string (car f)))