mirror of
https://github.com/golang/go
synced 2024-11-15 11:30:36 -07:00
[release-branch.go1] Emacs go-mode: don't indent the inside of strings.
««« backport 8888febbe757 Emacs go-mode: don't indent the inside of strings. Two fixes for indentation problems: 1. Properly recognize multi-line strings. These start with `, not ". 2. Don't indent a line if the beginning of the line is the end of a multi-line string. This happened for instance when inserting a closing bracket after a multi-line string. R=sameer CC=golang-dev https://golang.org/cl/6157044 »»»
This commit is contained in:
parent
d0176e77e7
commit
c8ba37cf37
@ -250,8 +250,8 @@ comment or string."
|
|||||||
|
|
||||||
(unless pos
|
(unless pos
|
||||||
(setq pos (point)))
|
(setq pos (point)))
|
||||||
(when (> pos go-mode-mark-cs-end)
|
(when (>= pos go-mode-mark-cs-end)
|
||||||
(go-mode-mark-cs pos))
|
(go-mode-mark-cs (1+ pos)))
|
||||||
(get-text-property pos 'go-mode-cs))
|
(get-text-property pos 'go-mode-cs))
|
||||||
|
|
||||||
(defun go-mode-mark-cs (end)
|
(defun go-mode-mark-cs (end)
|
||||||
@ -597,7 +597,7 @@ indented one level."
|
|||||||
(cond
|
(cond
|
||||||
((and cs (save-excursion
|
((and cs (save-excursion
|
||||||
(goto-char (car cs))
|
(goto-char (car cs))
|
||||||
(looking-at "\\s\"")))
|
(looking-at "`")))
|
||||||
;; Inside a multi-line string. Don't mess with indentation.
|
;; Inside a multi-line string. Don't mess with indentation.
|
||||||
nil)
|
nil)
|
||||||
(cs
|
(cs
|
||||||
|
Loading…
Reference in New Issue
Block a user