@@ -2094,7 +2094,7 @@ This performs fontification according to `typescript--class-styles'."
20942094 ; ; but need care to avoid affecting the // and */ comment markers.
20952095 (" \\ (?:^\\ |[=([{,:;|&!]\\ |\\ _<return\\ _>\\ )\\ (?:[ \t ]\\ )*\\ (/\\ )[^/*]"
20962096 (1 (ignore
2097- (forward-char -1 )
2097+ (forward-char -1 )
20982098 (when (or (not (memq (char-after (match-beginning 0 )) '(?\s ?\t )))
20992099 ; ; If the / is at the beginning of line, we have to check
21002100 ; ; the end of the previous text.
@@ -2330,20 +2330,20 @@ the same column as the current line."
23302330 (save-excursion
23312331 (save-match-data
23322332 (when (looking-at " \\ s-*\\ _<while\\ _>" )
2333- (if (save-excursion
2334- (skip-chars-backward " [ \t\n ]*}" )
2335- (looking-at " [ \t\n ]*}" ))
2336- (save-excursion
2337- (backward-list ) (forward-symbol -1 ) (looking-at " \\ _<do\\ _>" ))
2338- (typescript--re-search-backward " \\ _<do\\ _>" (point-at-bol ) t )
2339- (or (looking-at " \\ _<do\\ _>" )
2340- (let ((saved-indent (current-indentation )))
2341- (while (and (typescript--re-search-backward " ^\\ s-*\\ _<" nil t )
2342- (/= (current-indentation ) saved-indent)))
2343- (and (looking-at " \\ s-*\\ _<do\\ _>" )
2344- (not (typescript--re-search-forward
2345- " \\ _<while\\ _>" (point-at-eol ) t ))
2346- (= (current-indentation ) saved-indent)))))))))
2333+ (if (save-excursion
2334+ (skip-chars-backward " [ \t\n ]*}" )
2335+ (looking-at " [ \t\n ]*}" ))
2336+ (save-excursion
2337+ (backward-list ) (forward-symbol -1 ) (looking-at " \\ _<do\\ _>" ))
2338+ (typescript--re-search-backward " \\ _<do\\ _>" (point-at-bol ) t )
2339+ (or (looking-at " \\ _<do\\ _>" )
2340+ (let ((saved-indent (current-indentation )))
2341+ (while (and (typescript--re-search-backward " ^\\ s-*\\ _<" nil t )
2342+ (/= (current-indentation ) saved-indent)))
2343+ (and (looking-at " \\ s-*\\ _<do\\ _>" )
2344+ (not (typescript--re-search-forward
2345+ " \\ _<while\\ _>" (point-at-eol ) t ))
2346+ (= (current-indentation ) saved-indent)))))))))
23472347
23482348
23492349(defun typescript--ctrl-statement-indentation ()
@@ -2952,9 +2952,9 @@ Key bindings:
29522952 comment-start-skip " \\ (//+\\ |/\\ *+\\ )\\ s *" )
29532953
29542954 (setq-local electric-indent-chars
2955- (append " {}():;," electric-indent-chars))
2955+ (append " {}():;," electric-indent-chars))
29562956 (setq-local electric-layout-rules
2957- '((?\; . after) (?\{ . after) (?\} . before)))
2957+ '((?\; . after) (?\{ . after) (?\} . before)))
29582958
29592959 (let ((c-buffer-is-cc-mode t ))
29602960 ; ; FIXME: These are normally set by `c-basic-common-init' . Should
0 commit comments