ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-02-22 19:58:25 +01:00
parent 9eddf47059 029cf66f01
commit 2097f5488b
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lisp/org-agenda.el
View File

@ -3027,19 +3027,18 @@ s Search for keywords M Like m, but only TODO entries
(symbol-name type) (symbol-name type)
"Lambda expression")) "Lambda expression"))
(t "???")))) (t "???"))))
(if org-agenda-menu-show-matcher (cond
(setq line ((not (org-string-nw-p match)) nil)
(concat line ": " (org-agenda-menu-show-matcher
(cond (setq line
((stringp match) (concat line ": "
(setq match (copy-sequence match)) (cond
(org-add-props match nil 'face 'org-warning)) ((stringp match)
((listp type) (propertize match nil 'face 'org-warning))
(format "set of %d commands" (length type)))))) ((listp type)
(when (org-string-nw-p match) (format "set of %d commands" (length type)))))))
(add-text-properties (t
0 (length line) (list 'help-echo (org-add-props line nil 'help-echo (concat "Matcher: " match))))
(concat "Matcher: " match)) line)))
(push line lines))) (push line lines)))
(setq lines (nreverse lines)) (setq lines (nreverse lines))
(when prefixes (when prefixes
@ -4673,18 +4672,8 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
(when (and (stringp arg) (not (string-match "\\S-" arg))) (setq arg nil)) (when (and (stringp arg) (not (string-match "\\S-" arg))) (setq arg nil))
(let* ((today (org-today)) (let* ((today (org-today))
(date (calendar-gregorian-from-absolute today)) (date (calendar-gregorian-from-absolute today))
(kwds org-todo-keywords-for-agenda)
(completion-ignore-case t) (completion-ignore-case t)
(org-select-this-todo-keyword kwds org-select-this-todo-keyword rtn rtnall files file pos)
(if (stringp arg) arg
(and arg (integerp arg) (> arg 0)
(nth (1- arg) kwds))))
rtn rtnall files file pos)
(when (equal arg '(4))
(setq org-select-this-todo-keyword
(completing-read "Keyword (or KWD1|K2D2|...): "
(mapcar #'list kwds) nil nil)))
(and (equal 0 arg) (setq org-select-this-todo-keyword nil))
(catch 'exit (catch 'exit
(when org-agenda-sticky (when org-agenda-sticky
(setq org-agenda-buffer-name (setq org-agenda-buffer-name
@ -4693,6 +4682,16 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
org-select-this-todo-keyword) org-select-this-todo-keyword)
(format "*Org Agenda(%s)*" (or org-keys "t"))))) (format "*Org Agenda(%s)*" (or org-keys "t")))))
(org-agenda-prepare "TODO") (org-agenda-prepare "TODO")
(setq kwds org-todo-keywords-for-agenda
org-select-this-todo-keyword (if (stringp arg) arg
(and (integerp arg)
(> arg 0)
(nth (1- arg) kwds))))
(when (equal arg '(4))
(setq org-select-this-todo-keyword
(completing-read "Keyword (or KWD1|K2D2|...): "
(mapcar #'list kwds) nil nil)))
(and (equal 0 arg) (setq org-select-this-todo-keyword nil))
(org-compile-prefix-format 'todo) (org-compile-prefix-format 'todo)
(org-set-sorting-strategy 'todo) (org-set-sorting-strategy 'todo)
(setq org-agenda-redo-command (setq org-agenda-redo-command

4
lisp/org.el
View File

@ -12573,7 +12573,9 @@ Returns the new TODO keyword, or nil if no state change should occur."
(when (and (= cnt 0) (not ingroup)) (insert " ")) (when (and (= cnt 0) (not ingroup)) (insert " "))
(insert "[" c "] " tg (make-string (insert "[" c "] " tg (make-string
(- fwidth 4 (length tg)) ?\ )) (- fwidth 4 (length tg)) ?\ ))
(when (= (setq cnt (1+ cnt)) ncol) (when (and (= (setq cnt (1+ cnt)) ncol)
;; Avoid lines with just a closing delimiter.
(not (equal (car tbl) '(:endgroup))))
(insert "\n") (insert "\n")
(when ingroup (insert " ")) (when ingroup (insert " "))
(setq cnt 0))))) (setq cnt 0)))))