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 2015-09-10 14:29:19 +02:00
parent de9a4fc576 bde1ebc20a
commit f91968bc38
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/lisp/ox-koma-letter.el
View File

@ -439,7 +439,8 @@ e.g. \"title-subject:t\"."
(:inbuffer-with-backaddress nil "backaddress" 'koma-letter:empty) (:inbuffer-with-backaddress nil "backaddress" 'koma-letter:empty)
(:inbuffer-with-email nil "email" 'koma-letter:empty) (:inbuffer-with-email nil "email" 'koma-letter:empty)
(:inbuffer-with-foldmarks nil "foldmarks" 'koma-letter:empty) (:inbuffer-with-foldmarks nil "foldmarks" 'koma-letter:empty)
(:inbuffer-with-phone nil "phone" 'koma-letter:empty)) (:inbuffer-with-phone nil "phone" 'koma-letter:empty)
(:inbuffer-with-place nil "place" 'koma-letter:empty))
:translate-alist '((export-block . org-koma-letter-export-block) :translate-alist '((export-block . org-koma-letter-export-block)
(export-snippet . org-koma-letter-export-snippet) (export-snippet . org-koma-letter-export-snippet)
(headline . org-koma-letter-headline) (headline . org-koma-letter-headline)
@ -745,9 +746,13 @@ a communication channel."
(format "\\KOMAoption{backaddress}{%s}\n" (format "\\KOMAoption{backaddress}{%s}\n"
(if (plist-get info :with-backaddress) "true" "false"))) (if (plist-get info :with-backaddress) "true" "false")))
;; Place. ;; Place.
(and (funcall check-scope 'place) (let ((with-place-set (funcall check-scope 'with-place))
(format "\\setkomavar{place}{%s}\n" (place-set (funcall check-scope 'place)))
(if (plist-get info :with-place) (plist-get info :place) ""))) (and (or (and with-place-set place-set)
(and (eq scope 'buffer) (or with-place-set place-set)))
(format "\\setkomavar{place}{%s}\n"
(if (plist-get info :with-place) (plist-get info :place)
""))))
;; Folding marks. ;; Folding marks.
(and (funcall check-scope 'with-foldmarks) (and (funcall check-scope 'with-foldmarks)
(let ((foldmarks (plist-get info :with-foldmarks))) (let ((foldmarks (plist-get info :with-foldmarks)))

7
doc/org.texi
View File

@ -8620,9 +8620,10 @@ selected.
@vindex org-agenda-category-filter-preset @vindex org-agenda-category-filter-preset
Filter the current agenda view with respect to the category of the item at Filter the current agenda view with respect to the category of the item at
point. Pressing @code{<} another time will remove this filter. You can add point. Pressing @code{<} another time will remove this filter. When called
a filter preset through the option @code{org-agenda-category-filter-preset} with a prefix argument exclude the category of the item at point from the
(see below.) agenda. You can add a filter preset through the option
@code{org-agenda-category-filter-preset} (see below.)
@orgcmd{^,org-agenda-filter-by-top-headline} @orgcmd{^,org-agenda-filter-by-top-headline}
Filter the current agenda view and only display the siblings and the parent Filter the current agenda view and only display the siblings and the parent

9
lisp/org-agenda.el
View File

@ -7352,8 +7352,11 @@ in the agenda."
(defvar org-agenda-filtered-by-category nil) (defvar org-agenda-filtered-by-category nil)
(defun org-agenda-filter-by-category (strip) (defun org-agenda-filter-by-category (strip)
"Keep only those lines in the agenda buffer that have a specific category. "Filter lines in the agenda buffer that have a specific category.
The category is that of the current line." The category is that of the current line.
Without prefix argument, keep only the lines of that category.
With a prefix argument, exclude the lines of that category.
"
(interactive "P") (interactive "P")
(if (and org-agenda-filtered-by-category (if (and org-agenda-filtered-by-category
org-agenda-category-filter) org-agenda-category-filter)
@ -7363,7 +7366,7 @@ The category is that of the current line."
((and cat strip) ((and cat strip)
(org-agenda-filter-apply (org-agenda-filter-apply
(push (concat "-" cat) org-agenda-category-filter) 'category)) (push (concat "-" cat) org-agenda-category-filter) 'category))
((and cat) (cat
(org-agenda-filter-apply (org-agenda-filter-apply
(setq org-agenda-category-filter (setq org-agenda-category-filter
(list (concat "+" cat))) 'category)) (list (concat "+" cat))) 'category))