Skip to content

Commit

Permalink
strip trailing CR (#54)
Browse files Browse the repository at this point in the history
* strip trailing CR

* updated changelog for pr #54

Co-authored-by: Asif Mahmmud Shimon <shimon.technext@gmail.com>
  • Loading branch information
asif-mahmud and Shimon-Technext authored Oct 31, 2021
1 parent 1bf7db7 commit 0c88ad9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ The format is based on [Keep a Changelog].
will no longer trigger a reconnect every time you save.
* Fix inconsistent `:type` spec preventing use of `customize-variable`
on `apheleia-formatters`.
* Fix mixed style line ending generated by `diff` ([#54]) by adding
`--strip-trailing-cr` to `diff`'s argument list.

[#24]: https://github.com/raxod502/apheleia/pull/24
[#30]: https://github.com/raxod502/apheleia/issues/30
Expand All @@ -41,6 +43,7 @@ The format is based on [Keep a Changelog].
[#39]: https://github.com/raxod502/apheleia/issues/39
[#48]: https://github.com/raxod502/apheleia/pull/48
[#49]: https://github.com/raxod502/apheleia/pull/49
[#54]: https://github.com/raxod502/apheleia/pull/54

## 1.1.2 (released 2021-02-26)
### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion apheleia.el
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ as its sole argument."
(with-current-buffer (get-buffer-create " *apheleia-patch*")
(erase-buffer)
(apheleia--make-process
:command `("diff" "--rcs" "--"
:command `("diff" "--rcs" "--strip-trailing-cr" "--"
,(or old-fname "-")
,(or new-fname "-"))
:stdin (if new-fname old-buffer new-buffer)
Expand Down

0 comments on commit 0c88ad9

Please sign in to comment.