emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix interactive codes for doom/{move,copy,sudo}-this-file

Browse source
This commit is contained in:
Henrik Lissner 2019-05-14 20:53:51 -04:00
parent f381701aab
commit c5a3556510
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/autoload/files.el
View file

@ -163,7 +163,9 @@ kills the buffer. If FORCE-P, force the deletion (don't ask for confirmation)."
(defun doom/copy-this-file (new-path &optional force-p) (defun doom/copy-this-file (new-path &optional force-p)
"Copy current buffer's file to NEW-PATH. If FORCE-P, overwrite the destination "Copy current buffer's file to NEW-PATH. If FORCE-P, overwrite the destination
file if it exists, without confirmation." file if it exists, without confirmation."
(interactive "F") (interactive
(list (read-file-name "Copy file to: ")
current-prefix-arg))
(pcase (catch 'status (pcase (catch 'status
(when-let* ((dest (doom--copy-file (buffer-file-name) new-path force-p))) (when-let* ((dest (doom--copy-file (buffer-file-name) new-path force-p)))
(doom--update-file new-path) (doom--update-file new-path)
@ -176,7 +178,9 @@ file if it exists, without confirmation."
(defun doom/move-this-file (new-path &optional force-p) (defun doom/move-this-file (new-path &optional force-p)
"Move current buffer's file to NEW-PATH. If FORCE-P, overwrite the destination "Move current buffer's file to NEW-PATH. If FORCE-P, overwrite the destination
file if it exists, without confirmation." file if it exists, without confirmation."
(interactive "FP") (interactive
(list (read-file-name "Move file to: ")
current-prefix-arg))
(pcase (catch 'status (pcase (catch 'status
(let ((old-path (buffer-file-name)) (let ((old-path (buffer-file-name))
(new-path (expand-file-name new-path))) (new-path (expand-file-name new-path)))
@ -195,8 +199,7 @@ file if it exists, without confirmation."
;;;###autoload ;;;###autoload
(defun doom/sudo-find-file (file) (defun doom/sudo-find-file (file)
"Open FILE as root." "Open FILE as root."
(interactive (interactive "FOpen file as root: ")
(list (read-file-name "Open as root: ")))
(when (file-writable-p file) (when (file-writable-p file)
(user-error "File is user writeable, aborting sudo")) (user-error "File is user writeable, aborting sudo"))
(find-file (if (file-remote-p file) (find-file (if (file-remote-p file)