diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2019-08-04 11:39:03 -0700 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2019-08-17 09:45:22 -0400 |
commit | 08c7bbbf713839cbf3ff0cc8741faf22d0e0021e (patch) | |
tree | 28e40f1780c9c70c445f1d34d2665205790ee263 | |
parent | 71ce18920a843bc9e4e9dbcba3056eeab98cf6da (diff) | |
download | org-mode-08c7bbbf713839cbf3ff0cc8741faf22d0e0021e.tar.gz |
Backport commit a5b796a87 from Emacs
* lisp/ob-haskell.el (org-babel-haskell-export-to-lhs):
Omit unnecessary ‘?’ after nullable pattern.
* lisp/org-capture.el (org-capture-fill-template):
Match upper-case as well as lower-case letters.
Fix 2019-08-04 regex lint
a5b796a8798a809044d847568e6472cc5eca077e
Paul Eggert
Sun Aug 4 11:39:54 2019 -0700
-rw-r--r-- | lisp/ob-haskell.el | 2 | ||||
-rw-r--r-- | lisp/org-capture.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el index 0346c2d..a683b11 100644 --- a/lisp/ob-haskell.el +++ b/lisp/ob-haskell.el @@ -158,7 +158,7 @@ constructs (header arguments, no-web syntax etc...) are ignored." (interactive "P") (let* ((contents (buffer-string)) (haskell-regexp - (concat "^\\([ \t]*\\)#\\+begin_src[ \t]haskell*\\(.*\\)?[\r\n]" + (concat "^\\([ \t]*\\)#\\+begin_src[ \t]haskell*\\(.*\\)[\r\n]" "\\([^\000]*?\\)[\r\n][ \t]*#\\+end_src.*")) (base-name (file-name-sans-extension (buffer-file-name))) (tmp-file (org-babel-temp-file "haskell-")) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 748cae7..f04e9c4 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1646,7 +1646,7 @@ The template may still contain \"%?\" for cursor positioning." ;; Mark %() embedded elisp for later evaluation. (org-capture-expand-embedded-elisp 'mark) ;; Expand non-interactive templates. - (let ((regexp "%\\(:[-a-za-z]+\\|<\\([^>\n]+\\)>\\|[aAcfFikKlntTuUx]\\)")) + (let ((regexp "%\\(:[-A-Za-z]+\\|<\\([^>\n]+\\)>\\|[aAcfFikKlntTuUx]\\)")) (save-excursion (while (re-search-forward regexp nil t) ;; `org-capture-escaped-%' may modify buffer and cripple |