hiro/apheleia
1
0
Fork 0
mirror of https://github.com/vale981/apheleia synced 2025-03-05 09:31:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

strip trailing CR (#54)

Browse source 
* strip trailing CR

* updated changelog for pr #54

Co-authored-by: Asif Mahmmud Shimon <shimon.technext@gmail.com>
This commit is contained in:
Asif Mahmud Shimon 2021-10-31 23:55:26 +06:00 • committed by GitHub
parent 1bf7db7477
commit 0c88ad95b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -33,6 +33,8 @@ The format is based on [Keep a Changelog].
will no longer trigger a reconnect every time you save. will no longer trigger a reconnect every time you save.
* Fix inconsistent `:type` spec preventing use of `customize-variable` * Fix inconsistent `:type` spec preventing use of `customize-variable`
on `apheleia-formatters`. 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 [#24]: https://github.com/raxod502/apheleia/pull/24
[#30]: https://github.com/raxod502/apheleia/issues/30 [#30]: https://github.com/raxod502/apheleia/issues/30
@ -41,6 +43,7 @@ The format is based on [Keep a Changelog].
[#39]: https://github.com/raxod502/apheleia/issues/39 [#39]: https://github.com/raxod502/apheleia/issues/39
[#48]: https://github.com/raxod502/apheleia/pull/48 [#48]: https://github.com/raxod502/apheleia/pull/48
[#49]: https://github.com/raxod502/apheleia/pull/49 [#49]: https://github.com/raxod502/apheleia/pull/49
[#54]: https://github.com/raxod502/apheleia/pull/54
## 1.1.2 (released 2021-02-26) ## 1.1.2 (released 2021-02-26)
### Enhancements ### Enhancements

2
apheleia.el
View file

@ -384,7 +384,7 @@ as its sole argument."
(with-current-buffer (get-buffer-create " *apheleia-patch*") (with-current-buffer (get-buffer-create " *apheleia-patch*")
(erase-buffer) (erase-buffer)
(apheleia--make-process (apheleia--make-process
:command `("diff" "--rcs" "--" :command `("diff" "--rcs" "--strip-trailing-cr" "--"
,(or old-fname "-") ,(or old-fname "-")
,(or new-fname "-")) ,(or new-fname "-"))
:stdin (if new-fname old-buffer new-buffer) :stdin (if new-fname old-buffer new-buffer)