diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2019-07-27 22:04:06 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2019-07-27 22:04:06 +0200 |
commit | 2d08e9d4be87489045c33792ddbc368eba188e04 (patch) | |
tree | c3c2d1e2ede751b3dd1a1b9eeb5cf5063b5dac2b | |
parent | e413e7695c4872ff4eca12d4ce2ef367d4284530 (diff) | |
parent | 29f96ef1b7e67ee61e6840537bd8d1feb271a739 (diff) | |
download | org-mode-2d08e9d4be87489045c33792ddbc368eba188e04.tar.gz |
Merge branch 'master' of code.orgmode.org:bzg/org-mode
-rw-r--r-- | doc/org-manual.org | 2 | ||||
-rw-r--r-- | lisp/ol-gnus.el | 4 | ||||
-rw-r--r-- | lisp/org-agenda.el | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org index ea99d07..245a728 100644 --- a/doc/org-manual.org +++ b/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. diff --git a/lisp/ol-gnus.el b/lisp/ol-gnus.el index 9c1c2be..8ac36f0 100644 --- a/lisp/ol-gnus.el +++ b/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) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 9106415..f1a99bc 100644 --- a/lisp/org-agenda.el +++ b/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))) |