diff options
| author | Noam Postavsky <npostavs@users.sourceforge.net> | 2019-04-05 08:00:09 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2019-04-15 20:28:03 -0400 |
| commit | 7a382383ac7912541bcceea16676ade20cc6b9ba (patch) | |
| tree | e0079da096dba4b8198c17535a89f8a65e7e1c14 /lisp/emacs-lisp | |
| parent | 74412e7dcb10909ffebb27db7d6eaffe96599810 (diff) | |
| download | emacs-7a382383ac7912541bcceea16676ade20cc6b9ba.tar.gz | |
Properly bracket concat of comment-start-skip (Bug#34805)
* lisp/emacs-lisp/smie.el (smie-indent-fixindent):
* lisp/cedet/semantic/doc.el (semantic-doc-snarf-comment-for-tag):
* lisp/progmodes/fortran.el (fortran-previous-statement)
(fortran-next-statement)
(fortran-fill-statement):
* lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-statement): Bracket
comment-start-skip and comment-end-skip to avoid unexpected regexp
operator precedence.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 92b639d71e2..e0293c3cbb4 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1446,9 +1446,9 @@ in order to figure out the indentation of some other (further down) point." (and (smie-indent--bolp) (save-excursion (comment-normalize-vars) - (re-search-forward (concat comment-start-skip + (re-search-forward (concat "\\(?:" comment-start-skip "\\)" "fixindent" - comment-end-skip) + "\\(?:" comment-end-skip "\\)") ;; 1+ to account for the \n comment termination. (1+ (line-end-position)) t)) (current-column))) |