mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-11-24 07:20:29 +00:00
a9880a7710
* org-agenda.el (org-tags-view): Set the matcher after preparing the agenda, as `org-tag-groups-alist-for-agenda' might be needed. (org-agenda-filter-make-matcher): New parameter `filter' and `type'. Handle group tags. (org-agenda-filter-expand-tags): New function. (org-agenda-filter-apply): Handle group tags. * org.el (org-blank-before-new-entry): Tiny docstring fix. (org-tag-alist-for-agenda): Add docstring. (org-tag-groups-alist-for-agenda): New global variable. (org-tag-groups-alist): New buffer-local variable. (org-tag-alist, org-tag-persistent-alist): Handle :grouptags. (org-group-tags): New option. (org-toggle-group-tags): New command. (org-mode-map): Bind `org-toggle-group-tags' to `C-c C-x q'. (org-set-regexps-and-options-for-tags): New function, factored out from `org-set-regexps-and-options'. (org-set-regexps-and-options): Don't handle tags, they are now handled separately by `org-set-regexps-and-options-for-tags'. (org-assign-fast-keys): Handle :grouptags. (org-mode): Use `org-set-regexps-and-options-for-tags' on top of `org-set-regexps-and-options'. (org-fontify-meta-lines-and-blocks-1): Fontify group tags. (org-make-tags-matcher): Expand group tags in the matcher. (org-tags-expand): New function. (org-tags-completion-function): Tiny code clean up. (org-set-current-tags-overlay): Add a docstring. (org-fast-tag-selection): Highlight group tags. (org-agenda-prepare-buffers): Set `org-tag-alist-for-agenda' and `org-tag-groups-alist-for-agenda'. Don't uniquify `org-tag-alist-for-agenda' as we may need the grouping information for filtering in the agenda buffer. (org-uniquify-alist): New function. * org-pcomplete.el (pcomplete/org-mode/file-option/tags): Handle :grouptags. * org-faces.el (mode-line): New face for group tags.
417 lines
14 KiB
EmacsLisp
417 lines
14 KiB
EmacsLisp
;;; org-pcomplete.el --- In-buffer completion code
|
|
|
|
;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
|
|
;;
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
;; John Wiegley <johnw at gnu dot org>
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
;; Homepage: http://orgmode.org
|
|
;;
|
|
;; This file is part of GNU Emacs.
|
|
;;
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
;;
|
|
;;; Code:
|
|
|
|
;;;; Require other packages
|
|
|
|
(eval-when-compile
|
|
(require 'cl))
|
|
|
|
(require 'org-macs)
|
|
(require 'org-compat)
|
|
(require 'pcomplete)
|
|
|
|
(declare-function org-split-string "org" (string &optional separators))
|
|
(declare-function org-make-org-heading-search-string "org"
|
|
(&optional string heading))
|
|
(declare-function org-get-buffer-tags "org" ())
|
|
(declare-function org-get-tags "org" ())
|
|
(declare-function org-buffer-property-keys "org"
|
|
(&optional include-specials include-defaults include-columns))
|
|
(declare-function org-entry-properties "org" (&optional pom which specific))
|
|
|
|
;;;; Customization variables
|
|
|
|
(defgroup org-complete nil
|
|
"Outline-based notes management and organizer."
|
|
:tag "Org"
|
|
:group 'org)
|
|
|
|
(defvar org-drawer-regexp)
|
|
(defvar org-property-re)
|
|
|
|
(defun org-thing-at-point ()
|
|
"Examine the thing at point and let the caller know what it is.
|
|
The return value is a string naming the thing at point."
|
|
(let ((beg1 (save-excursion
|
|
(skip-chars-backward (org-re "[:alnum:]-_@"))
|
|
(point)))
|
|
(beg (save-excursion
|
|
(skip-chars-backward "a-zA-Z0-9-_:$")
|
|
(point)))
|
|
(line-to-here (buffer-substring (point-at-bol) (point))))
|
|
(cond
|
|
((string-match "\\`[ \t]*#\\+begin: clocktable[ \t]+" line-to-here)
|
|
(cons "block-option" "clocktable"))
|
|
((string-match "\\`[ \t]*#\\+begin_src[ \t]+" line-to-here)
|
|
(cons "block-option" "src"))
|
|
((save-excursion
|
|
(re-search-backward "^[ \t]*#\\+\\([A-Z_]+\\):.*"
|
|
(line-beginning-position) t))
|
|
(cons "file-option" (match-string-no-properties 1)))
|
|
((string-match "\\`[ \t]*#\\+[a-zA-Z_]*\\'" line-to-here)
|
|
(cons "file-option" nil))
|
|
((equal (char-before beg) ?\[)
|
|
(cons "link" nil))
|
|
((equal (char-before beg) ?\\)
|
|
(cons "tex" nil))
|
|
((string-match "\\`\\*+[ \t]+\\'"
|
|
(buffer-substring (point-at-bol) beg))
|
|
(cons "todo" nil))
|
|
((equal (char-before beg) ?*)
|
|
(cons "searchhead" nil))
|
|
((and (equal (char-before beg1) ?:)
|
|
(equal (char-after (point-at-bol)) ?*))
|
|
(cons "tag" nil))
|
|
((and (equal (char-before beg1) ?:)
|
|
(not (equal (char-after (point-at-bol)) ?*))
|
|
(save-excursion
|
|
(move-beginning-of-line 1)
|
|
(skip-chars-backward "[ \t\n]")
|
|
;; org-drawer-regexp matches a whole line but while
|
|
;; looking-back, we just ignore trailing whitespaces
|
|
(or (org-looking-back (substring org-drawer-regexp 0 -1))
|
|
(org-looking-back org-property-re))))
|
|
(cons "prop" nil))
|
|
((and (equal (char-before beg1) ?:)
|
|
(not (equal (char-after (point-at-bol)) ?*)))
|
|
(cons "drawer" nil))
|
|
(t nil))))
|
|
|
|
(defun org-command-at-point ()
|
|
"Return the qualified name of the Org completion entity at point.
|
|
When completing for #+STARTUP, for example, this function returns
|
|
\"file-option/startup\"."
|
|
(let ((thing (org-thing-at-point)))
|
|
(cond
|
|
((string= "file-option" (car thing))
|
|
(concat (car thing)
|
|
(and (cdr thing) (concat "/" (downcase (cdr thing))))))
|
|
((string= "block-option" (car thing))
|
|
(concat (car thing) "/" (downcase (cdr thing))))
|
|
(t (car thing)))))
|
|
|
|
(defun org-parse-arguments ()
|
|
"Parse whitespace separated arguments in the current region."
|
|
(let ((begin (line-beginning-position))
|
|
(end (line-end-position))
|
|
begins args)
|
|
(save-restriction
|
|
(narrow-to-region begin end)
|
|
(save-excursion
|
|
(goto-char (point-min))
|
|
(while (not (eobp))
|
|
(skip-chars-forward " \t\n[")
|
|
(setq begins (cons (point) begins))
|
|
(skip-chars-forward "^ \t\n[")
|
|
(setq args (cons (buffer-substring-no-properties
|
|
(car begins) (point))
|
|
args)))
|
|
(cons (reverse args) (reverse begins))))))
|
|
|
|
(defun org-pcomplete-initial ()
|
|
"Calls the right completion function for first argument completions."
|
|
(ignore
|
|
(funcall (or (pcomplete-find-completion-function
|
|
(car (org-thing-at-point)))
|
|
pcomplete-default-completion-function))))
|
|
|
|
(defvar org-options-keywords) ; From org.el
|
|
(defvar org-element-block-name-alist) ; From org-element.el
|
|
(defvar org-element-affiliated-keywords) ; From org-element.el
|
|
(declare-function org-get-export-keywords "org" ())
|
|
(defun pcomplete/org-mode/file-option ()
|
|
"Complete against all valid file options."
|
|
(require 'org-element)
|
|
(pcomplete-here
|
|
(org-pcomplete-case-double
|
|
(append (mapcar (lambda (keyword) (concat keyword " "))
|
|
org-options-keywords)
|
|
(mapcar (lambda (keyword) (concat keyword ": "))
|
|
org-element-affiliated-keywords)
|
|
(let (block-names)
|
|
(mapc (lambda (block-name)
|
|
(let ((name (car block-name)))
|
|
(push (format "END_%s: " name) block-names)
|
|
(push (format "BEGIN_%s: " name) block-names)
|
|
(push (format "ATTR_%s: " name) block-names)))
|
|
org-element-block-name-alist)
|
|
block-names)
|
|
(mapcar (lambda (keyword) (concat keyword ": "))
|
|
(org-get-export-keywords))))
|
|
(substring pcomplete-stub 2)))
|
|
|
|
(defun pcomplete/org-mode/file-option/author ()
|
|
"Complete arguments for the #+AUTHOR file option."
|
|
(pcomplete-here (list user-full-name)))
|
|
|
|
(defvar org-time-stamp-formats)
|
|
(defun pcomplete/org-mode/file-option/date ()
|
|
"Complete arguments for the #+DATE file option."
|
|
(pcomplete-here (list (format-time-string (car org-time-stamp-formats)))))
|
|
|
|
(defun pcomplete/org-mode/file-option/email ()
|
|
"Complete arguments for the #+EMAIL file option."
|
|
(pcomplete-here (list user-mail-address)))
|
|
|
|
(defvar org-export-exclude-tags)
|
|
(defun pcomplete/org-mode/file-option/exclude_tags ()
|
|
"Complete arguments for the #+EXCLUDE_TAGS file option."
|
|
(require 'ox)
|
|
(pcomplete-here
|
|
(and org-export-exclude-tags
|
|
(list (mapconcat 'identity org-export-exclude-tags " ")))))
|
|
|
|
(defvar org-file-tags)
|
|
(defun pcomplete/org-mode/file-option/filetags ()
|
|
"Complete arguments for the #+FILETAGS file option."
|
|
(pcomplete-here (and org-file-tags (mapconcat 'identity org-file-tags " "))))
|
|
|
|
(defvar org-export-default-language)
|
|
(defun pcomplete/org-mode/file-option/language ()
|
|
"Complete arguments for the #+LANGUAGE file option."
|
|
(require 'ox)
|
|
(pcomplete-here
|
|
(pcomplete-uniqify-list
|
|
(list org-export-default-language "en"))))
|
|
|
|
(defvar org-default-priority)
|
|
(defvar org-highest-priority)
|
|
(defvar org-lowest-priority)
|
|
(defun pcomplete/org-mode/file-option/priorities ()
|
|
"Complete arguments for the #+PRIORITIES file option."
|
|
(pcomplete-here (list (format "%c %c %c"
|
|
org-highest-priority
|
|
org-lowest-priority
|
|
org-default-priority))))
|
|
|
|
(defvar org-export-select-tags)
|
|
(defun pcomplete/org-mode/file-option/select_tags ()
|
|
"Complete arguments for the #+SELECT_TAGS file option."
|
|
(require 'ox)
|
|
(pcomplete-here
|
|
(and org-export-select-tags
|
|
(list (mapconcat 'identity org-export-select-tags " ")))))
|
|
|
|
(defvar org-startup-options)
|
|
(defun pcomplete/org-mode/file-option/startup ()
|
|
"Complete arguments for the #+STARTUP file option."
|
|
(while (pcomplete-here
|
|
(let ((opts (pcomplete-uniqify-list
|
|
(mapcar 'car org-startup-options))))
|
|
;; Some options are mutually exclusive, and shouldn't be completed
|
|
;; against if certain other options have already been seen.
|
|
(dolist (arg pcomplete-args)
|
|
(cond
|
|
((string= arg "hidestars")
|
|
(setq opts (delete "showstars" opts)))))
|
|
opts))))
|
|
|
|
(defvar org-tag-alist)
|
|
(defun pcomplete/org-mode/file-option/tags ()
|
|
"Complete arguments for the #+TAGS file option."
|
|
(pcomplete-here
|
|
(list
|
|
(mapconcat (lambda (x)
|
|
(cond
|
|
((eq :startgroup (car x)) "{")
|
|
((eq :endgroup (car x)) "}")
|
|
((eq :grouptags (car x)) ":")
|
|
((eq :newline (car x)) "\\n")
|
|
((cdr x) (format "%s(%c)" (car x) (cdr x)))
|
|
(t (car x))))
|
|
org-tag-alist " "))))
|
|
|
|
(defun pcomplete/org-mode/file-option/title ()
|
|
"Complete arguments for the #+TITLE file option."
|
|
(pcomplete-here
|
|
(let ((visited-file (buffer-file-name (buffer-base-buffer))))
|
|
(list (or (and visited-file
|
|
(file-name-sans-extension
|
|
(file-name-nondirectory visited-file)))
|
|
(buffer-name (buffer-base-buffer)))))))
|
|
|
|
(defun pcomplete/org-mode/file-option/options ()
|
|
"Complete arguments for the #+OPTIONS file option."
|
|
(while (pcomplete-here
|
|
(pcomplete-uniqify-list
|
|
(append
|
|
;; Hard-coded OPTION items always available.
|
|
'("H:" "\\n:" "num:" "timestamp:" "arch:" "author:" "c:"
|
|
"creator:" "date:" "d:" "email:" "*:" "e:" "::" "f:"
|
|
"inline:" "tex:" "p:" "pri:" "':" "-:" "stat:" "^:" "toc:"
|
|
"|:" "tags:" "tasks:" "<:" "todo:")
|
|
;; OPTION items from registered back-ends.
|
|
(let (items)
|
|
(dolist (back-end (org-bound-and-true-p
|
|
org-export-registered-backends))
|
|
(dolist (option (plist-get (cdr back-end) :options-alist))
|
|
(let ((item (nth 2 option)))
|
|
(when item (push (concat item ":") items)))))
|
|
items))))))
|
|
|
|
(defun pcomplete/org-mode/file-option/infojs_opt ()
|
|
"Complete arguments for the #+INFOJS_OPT file option."
|
|
(while (pcomplete-here
|
|
(pcomplete-uniqify-list
|
|
(mapcar (lambda (item) (format "%s:" (car item)))
|
|
(org-bound-and-true-p org-html-infojs-opts-table))))))
|
|
|
|
(defun pcomplete/org-mode/file-option/bind ()
|
|
"Complete arguments for the #+BIND file option, which are variable names."
|
|
(let (vars)
|
|
(mapatoms
|
|
(lambda (a) (if (boundp a) (setq vars (cons (symbol-name a) vars)))))
|
|
(pcomplete-here vars)))
|
|
|
|
(defvar org-link-abbrev-alist-local)
|
|
(defvar org-link-abbrev-alist)
|
|
(defun pcomplete/org-mode/link ()
|
|
"Complete against defined #+LINK patterns."
|
|
(pcomplete-here
|
|
(pcomplete-uniqify-list
|
|
(copy-sequence
|
|
(append (mapcar 'car org-link-abbrev-alist-local)
|
|
(mapcar 'car org-link-abbrev-alist))))))
|
|
|
|
(defvar org-entities)
|
|
(defun pcomplete/org-mode/tex ()
|
|
"Complete against TeX-style HTML entity names."
|
|
(require 'org-entities)
|
|
(while (pcomplete-here
|
|
(pcomplete-uniqify-list (remove nil (mapcar 'car-safe org-entities)))
|
|
(substring pcomplete-stub 1))))
|
|
|
|
(defvar org-todo-keywords-1)
|
|
(defun pcomplete/org-mode/todo ()
|
|
"Complete against known TODO keywords."
|
|
(pcomplete-here (pcomplete-uniqify-list (copy-sequence org-todo-keywords-1))))
|
|
|
|
(defvar org-todo-line-regexp)
|
|
(defun pcomplete/org-mode/searchhead ()
|
|
"Complete against all headings.
|
|
This needs more work, to handle headings with lots of spaces in them."
|
|
(while
|
|
(pcomplete-here
|
|
(save-excursion
|
|
(goto-char (point-min))
|
|
(let (tbl)
|
|
(while (re-search-forward org-todo-line-regexp nil t)
|
|
(push (org-make-org-heading-search-string
|
|
(match-string-no-properties 3) t)
|
|
tbl))
|
|
(pcomplete-uniqify-list tbl)))
|
|
(substring pcomplete-stub 1))))
|
|
|
|
(defvar org-tag-alist)
|
|
(defun pcomplete/org-mode/tag ()
|
|
"Complete a tag name. Omit tags already set."
|
|
(while (pcomplete-here
|
|
(mapcar (lambda (x)
|
|
(concat x ":"))
|
|
(let ((lst (pcomplete-uniqify-list
|
|
(or (remove
|
|
nil
|
|
(mapcar (lambda (x)
|
|
(and (stringp (car x)) (car x)))
|
|
org-tag-alist))
|
|
(mapcar 'car (org-get-buffer-tags))))))
|
|
(dolist (tag (org-get-tags))
|
|
(setq lst (delete tag lst)))
|
|
lst))
|
|
(and (string-match ".*:" pcomplete-stub)
|
|
(substring pcomplete-stub (match-end 0))))))
|
|
|
|
(defun pcomplete/org-mode/prop ()
|
|
"Complete a property name. Omit properties already set."
|
|
(pcomplete-here
|
|
(mapcar (lambda (x)
|
|
(concat x ": "))
|
|
(let ((lst (pcomplete-uniqify-list
|
|
(copy-sequence
|
|
(org-buffer-property-keys nil t t)))))
|
|
(dolist (prop (org-entry-properties))
|
|
(setq lst (delete (car prop) lst)))
|
|
lst))
|
|
(substring pcomplete-stub 1)))
|
|
|
|
(defvar org-drawers)
|
|
|
|
(defun pcomplete/org-mode/drawer ()
|
|
"Complete a drawer name."
|
|
(let ((spc (save-excursion
|
|
(move-beginning-of-line 1)
|
|
(looking-at "^\\([ \t]*\\):")
|
|
(match-string 1)))
|
|
(cpllist (mapcar (lambda (x) (concat x ": ")) org-drawers)))
|
|
(pcomplete-here cpllist
|
|
(substring pcomplete-stub 1)
|
|
(unless (or (not (delq
|
|
nil
|
|
(mapcar (lambda(x)
|
|
(string-match (substring pcomplete-stub 1) x))
|
|
cpllist)))
|
|
(looking-at "[ \t]*\n.*:END:"))
|
|
(save-excursion (insert "\n" spc ":END:"))))))
|
|
|
|
(defun pcomplete/org-mode/block-option/src ()
|
|
"Complete the arguments of a begin_src block.
|
|
Complete a language in the first field, the header arguments and switches."
|
|
(pcomplete-here
|
|
(mapcar
|
|
(lambda(x) (symbol-name (nth 3 x)))
|
|
(cdr (car (cdr (memq :key-type (plist-get
|
|
(symbol-plist
|
|
'org-babel-load-languages)
|
|
'custom-type)))))))
|
|
(while (pcomplete-here
|
|
'("-n" "-r" "-l"
|
|
":cache" ":colnames" ":comments" ":dir" ":eval" ":exports"
|
|
":file" ":hlines" ":no-expand" ":noweb" ":results" ":rownames"
|
|
":session" ":shebang" ":tangle" ":var"))))
|
|
|
|
(defun pcomplete/org-mode/block-option/clocktable ()
|
|
"Complete keywords in a clocktable line."
|
|
(while (pcomplete-here '(":maxlevel" ":scope" ":lang"
|
|
":tstart" ":tend" ":block" ":step"
|
|
":stepskip0" ":fileskip0"
|
|
":emphasize" ":link" ":narrow" ":indent"
|
|
":tcolumns" ":level" ":compact" ":timestamp"
|
|
":formula" ":formatter" ":wstart" ":mstart"))))
|
|
|
|
(defun org-pcomplete-case-double (list)
|
|
"Return list with both upcase and downcase version of all strings in LIST."
|
|
(let (e res)
|
|
(while (setq e (pop list))
|
|
(setq res (cons (downcase e) (cons (upcase e) res))))
|
|
(nreverse res)))
|
|
|
|
;;;; Finish up
|
|
|
|
(provide 'org-pcomplete)
|
|
|
|
;;; org-pcomplete.el ends here
|