summaryrefslogtreecommitdiff
path: root/lisp/cedet
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@users.sourceforge.net>2019-04-05 08:00:09 -0400
committerNoam Postavsky <npostavs@gmail.com>2019-04-15 20:28:03 -0400
commit7a382383ac7912541bcceea16676ade20cc6b9ba (patch)
treee0079da096dba4b8198c17535a89f8a65e7e1c14 /lisp/cedet
parent74412e7dcb10909ffebb27db7d6eaffe96599810 (diff)
downloademacs-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/cedet')
-rw-r--r--lisp/cedet/semantic/doc.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index 5611629c14d..4f98cf41027 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -103,7 +103,8 @@ If NOSNARF is `lex', then return the lex token."
nil
;; ok, try to clean the text up.
;; Comment start thingy
- (while (string-match (concat "^\\s-*" comment-start-skip) ct)
+ (while (string-match (concat "^\\s-*\\(?:" comment-start-skip "\\)")
+ ct)
(setq ct (concat (substring ct 0 (match-beginning 0))
(substring ct (match-end 0)))))
;; Arbitrary punctuation at the beginning of each line.