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

Merge branch 'maint' into master

This commit is contained in:
Nicolas Goaziou 2020-09-15 09:51:56 +02:00
parent e6021bc9b1 10ed4994f5
commit 354461be8f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-table.el
View File

@ -935,7 +935,7 @@ lines. It can have the following values:
- regexp When a regular expression, use it to match the separator." - regexp When a regular expression, use it to match the separator."
(interactive "f\nP") (interactive "f\nP")
(when (and (called-interactively-p 'any) (when (and (called-interactively-p 'any)
(not (string-match-p "\.\\(?:[tc]sv\\|txt\\)$" file))) (not (string-match-p (rx "." (or "txt" "tsv" "csv") eos) file)))
(user-error "Cannot import such file")) (user-error "Cannot import such file"))
(unless (bolp) (insert "\n")) (unless (bolp) (insert "\n"))
(let ((beg (point)) (let ((beg (point))