diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 17a3434cb19..cfec8e62eb2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-20 Daniel Colascione <dancol@dancol.org> | ||
| 2 | |||
| 3 | * progmodes/sh-script.el (sh-mode): Tweak paragraph-separate | ||
| 4 | so that we don't reflow comments into the shebang line. | ||
| 5 | |||
| 1 | 2013-12-20 Juri Linkov <juri@jurta.org> | 6 | 2013-12-20 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * saveplace.el (save-place-to-alist): Add `dired-filename' as | 8 | * saveplace.el (save-place-to-alist): Add `dired-filename' as |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index c270d433e76..5f2f70cf32a 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -1589,7 +1589,7 @@ with your script for an edit-interpret-debug cycle." | |||
| 1589 | (lambda () (or (eolp) (newline) (indent-relative)))) | 1589 | (lambda () (or (eolp) (newline) (indent-relative)))) |
| 1590 | 1590 | ||
| 1591 | (setq-local paragraph-start (concat page-delimiter "\\|$")) | 1591 | (setq-local paragraph-start (concat page-delimiter "\\|$")) |
| 1592 | (setq-local paragraph-separate paragraph-start) | 1592 | (setq-local paragraph-separate (concat paragraph-start "\\|#!/")) |
| 1593 | (setq-local comment-start "# ") | 1593 | (setq-local comment-start "# ") |
| 1594 | (setq-local comment-start-skip "#+[\t ]*") | 1594 | (setq-local comment-start-skip "#+[\t ]*") |
| 1595 | (setq-local local-abbrev-table sh-mode-abbrev-table) | 1595 | (setq-local local-abbrev-table sh-mode-abbrev-table) |