yogsototh/doom-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(lib): leave point at bob in with-file-contents!

Browse source 
with-file-contents!'s docstring promises that point will end up at the
beginning of the buffer, but this promise wasn't kept until now.
This commit is contained in:
Henrik Lissner 2022-09-08 00:24:16 +02:00
parent b121c5e1c6
commit cd269753cf
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/lib/files.el
View file

@ -342,6 +342,7 @@ optimizations for `binary' IO."
(declare (indent 1))
`(doom--with-prepared-file-buffer ,file (or coding-system-for-read 'utf-8) nil
(doom-file-read buffer-file-name :by 'insert :coding coding-system-for-read)
(goto-char (point-min))
,@body))
;;;###autoload

4
lisp/lib/system.el
View file

@ -8,7 +8,7 @@
(IS-MAC 'macos)
((ignore-errors
(with-file-contents! "/etc/os-release"
(when (re-search-backward "^ID=\"?\\([^\"\n]+\\)\"?" nil t)
(when (re-search-forward "^ID=\"?\\([^\"\n]+\\)\"?" nil t)
(intern (downcase (match-string 1)))))))
;; A few redundancies in case os-release fails us
((file-exists-p "/etc/debian_version")
@ -37,7 +37,7 @@
(format "NixOS %s" (sh "nixos-version")))
((ignore-errors
(with-file-contents! "/etc/os-release"
(when (re-search-backward "^PRETTY_NAME=\"?\\([^\"\n]+\\)\"?" nil t)
(when (re-search-forward "^PRETTY_NAME=\"?\\([^\"\n]+\\)\"?" nil t)
(match-string 1)))))
((when-let (files (doom-glob "/etc/*-release"))
(truncate-string-to-width