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

This commit is contained in:
Bastien 2018-04-27 01:27:40 +02:00
commit 67f1a33b45
1 changed files with 10 additions and 7 deletions

View File

@ -14212,9 +14212,10 @@ Assume point is on a headline."
(defun org-set-tags-command (&optional arg) (defun org-set-tags-command (&optional arg)
"Set the tags for the current visible entry. "Set the tags for the current visible entry.
When called with `\\[universal-argument]' prefix argument ARG, When called with `\\[universal-argument]' prefix argument ARG, \
realign all tags in headings in the current buffer. If a region realign all tags
is active, set tags for all headlines in the region. in the current buffer. If a region is active, set tags for
all headlines in the region.
This function is for interactive use only; This function is for interactive use only;
in Lisp code use `org-set-tags' instead." in Lisp code use `org-set-tags' instead."
@ -14418,10 +14419,12 @@ TODO keywords, should these have keys assigned to them.
If the keys are nil, a-z are automatically assigned. If the keys are nil, a-z are automatically assigned.
Returns the new tags string, or nil to not change the current settings." Returns the new tags string, or nil to not change the current settings."
(let* ((fulltable (append table todo-table)) (let* ((fulltable (append table todo-table))
(maxlen (apply 'max (mapcar (maxlen (if (null fulltable) 0
(lambda (x) (apply #'max
(if (stringp (car x)) (string-width (car x)) 0)) (mapcar (lambda (x)
fulltable))) (if (stringp (car x)) (string-width (car x))
0))
fulltable))))
(buf (current-buffer)) (buf (current-buffer))
(expert (eq org-fast-tag-selection-single-key 'expert)) (expert (eq org-fast-tag-selection-single-key 'expert))
(buffer-tags nil) (buffer-tags nil)