mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

Tweak heredoc expansion in shell-script-mode

Browse Source 
* lisp/progmodes/sh-script.el (sh--maybe-here-document): Allow
expanding <<E, too.
This commit is contained in:
Lars Ingebrigtsen 2019-10-16 03:47:12 +02:00
parent 2912de1e10
commit 7fd1093d28
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lisp/progmodes/sh-script.el
View File

@ -4356,27 +4356,29 @@ The document is bounded by `sh-here-document-word'."
(or arg (sh--maybe-here-document)))
(defun sh--maybe-here-document ()
(or (not (looking-back "[^<]<< " (line-beginning-position)))
(when (and (looking-back "[^<]<<[ E]" (line-beginning-position))
(save-excursion
(backward-char 2)
(not
(or (sh-quoted-p)
(sh--inside-noncommand-expression (point)))))
(not (nth 8 (syntax-ppss))))
(let ((tabs (if (string-match "\\`-" sh-here-document-word)
(make-string (/ (current-indentation) tab-width) ?\t)
""))
(delim (replace-regexp-in-string "['\"]" ""
sh-here-document-word)))
(delete-char -1)
(insert sh-here-document-word)
(or (eolp) (looking-at "[ \t]") (insert ?\s))
(end-of-line 1)
(while
(sh-quoted-p)
(end-of-line 2))
(insert ?\n tabs)
(save-excursion
(backward-char 2)
(or (sh-quoted-p)
(sh--inside-noncommand-expression (point))))
(nth 8 (syntax-ppss))
(let ((tabs (if (string-match "\\`-" sh-here-document-word)
(make-string (/ (current-indentation) tab-width) ?\t)
""))
(delim (replace-regexp-in-string "['\"]" ""
sh-here-document-word)))
(insert sh-here-document-word)
(or (eolp) (looking-at "[ \t]") (insert ?\s))
(end-of-line 1)
(while
(sh-quoted-p)
(end-of-line 2))
(insert ?\n tabs)
(save-excursion
(insert ?\n tabs (replace-regexp-in-string
"\\`-?[ \t]*" "" delim))))))
(insert ?\n tabs (replace-regexp-in-string
"\\`-?[ \t]*" "" delim))))))
(define-minor-mode sh-electric-here-document-mode
"Make << insert a here document skeleton."