procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* ido.el (ido-delete-file-at-head): Respect delete-by-moving-to-trash.

Browse source
This commit is contained in:
Leo Liu 2013-07-03 11:01:34 +08:00
parent 3086ca2e2c
commit e01aa29cd9
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2013-07-03 Leo Liu <sdl.web@gmail.com>
* ido.el (ido-delete-file-at-head): Respect delete-by-moving-to-trash.
2013-07-03 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-move-to-block): When we're at a

6
lisp/ido.el
View file

@ -3986,6 +3986,7 @@ If cursor is not at the end of the user input, delete to end of input."
;;; DELETE CURRENT FILE
(defun ido-delete-file-at-head ()
"Delete the file at the head of `ido-matches'.
Trash the file if `delete-by-moving-to-trash' is non-nil.
If cursor is not at the end of the user input, delete to end of input."
(interactive)
(if (not (eobp))
@ -3998,8 +3999,9 @@ If cursor is not at the end of the user input, delete to end of input."
(file-exists-p file)
(not (file-directory-p file))
(file-writable-p ido-current-directory)
(yes-or-no-p (concat "Delete " file "? ")))
(delete-file file)
(or delete-by-moving-to-trash
(yes-or-no-p (concat "Delete " file "? "))))
(delete-file file 'trash)
;; Check if file still exists.
(if (file-exists-p file)
;; file could not be deleted