mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-24 23:02:52 +00:00
Code Releases Activity

org-tags-expand: Do no modify buffer's syntax table by side effect

Browse source 
* lisp/org.el (org-mode-tags-syntax-table): New variable holding
syntax table for tags.
(org-mode): Initialize tag syntax table.
(org-make-tags-matcher): Match tags using appropriate syntax table.
(org-tags-expand): Do no modify syntax table by side effect.

Reported-by: Mattias Engdegård <mattias.engdegard@gmail.com>
Link: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63225#68
This commit is contained in:
Ihor Radchenko 2023-05-08 13:23:15 +02:00
parent fdea20084d
commit 6e6354c074
No known key found for this signature in database
GPG key ID: 6470762A7DA11D8B
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/org.el
View file

@ -4788,6 +4788,9 @@ This is for getting out of special buffers like capture.")
(defvar org-agenda-file-menu-enabled t
"When non-nil, refresh Agenda files in Org menu when loading Org.")
(defvar org-mode-tags-syntax-table
"Syntax table including \"@\" and \"_\" as word constituents.")
;;;###autoload
(define-derived-mode org-mode outline-mode "Org"
"Outline-based notes management and organizer, alias
@ -4844,6 +4847,12 @@ The following commands are available:
(modify-syntax-entry ?~ "_")
(modify-syntax-entry ?< "(>")
(modify-syntax-entry ?> ")<")
;; Set tags syntax table.
(setq org-mode-tags-syntax-table
(make-syntax-table org-mode-syntax-table))
;; @ and _ are allowed as word-components in tags.
(modify-syntax-entry ?@ "w" org-mode-tags-syntax-table)
(modify-syntax-entry ?_ "w" org-mode-tags-syntax-table)
(setq-local font-lock-unfontify-region-function 'org-unfontify-region)
;; Activate before-change-function
(setq-local org-table-may-need-update t)
@ -11406,7 +11415,9 @@ See also `org-scan-tags'."
(propp (match-end 5))
(mm
(cond
(regexp `(org-match-any-p ,(substring tag 1 -1) tags-list))
(regexp
`(with-syntax-table org-mode-tags-syntax-table
(org-match-any-p ,(substring tag 1 -1) tags-list)))
(levelp
`(,(org-op-to-function (match-string 3 term))
level
@ -11518,7 +11529,6 @@ the list of tags in this group."
(single-as-list (org--tags-expand-group (list match) tag-groups nil))
(org-group-tags
(let* ((case-fold-search t)
(tag-syntax org-mode-syntax-table)
(group-keys (mapcar #'car tag-groups))
(key-regexp (concat "\\([+-]?\\)" (regexp-opt group-keys 'words)))
(return-match match))
@ -11529,11 +11539,8 @@ the list of tags in this group."
(setq s (match-end 0))
(add-text-properties
(match-beginning 0) (match-end 0) '(regexp t) return-match)))
;; @ and _ are allowed as word-components in tags.
(modify-syntax-entry ?@ "w" tag-syntax)
(modify-syntax-entry ?_ "w" tag-syntax)
;; For each tag token found in MATCH, compute a regexp and it
(with-syntax-table tag-syntax
(with-syntax-table org-mode-tags-syntax-table
(replace-regexp-in-string
key-regexp
(lambda (m)