TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Re-factor and expand support for trash can on OS X

Browse source
This commit is contained in:
Uri Sharf 2015-07-06 15:43:20 +02:00 committed by syl20bnr
parent c1f6c40a16
commit d1a87c750d
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
contrib/osx/packages.el
View file

@ -4,12 +4,32 @@
reveal-in-finder reveal-in-finder
)) ))
(if (and (system-is-mac) (executable-find "gls")) (when (system-is-mac)
;; Note: `delete-by-moving-to-trash' is set to true globaly in
;; `spacemacs/config.el'
;; (setq trash-directory "~/.Trash/emacs") ; bare minimum
;; Use `trash' cli tool, if installed.
;; See brew info trash (or osx-tools)
;; otherwise, enable built-in support for trashing using Finder API
(if (executable-find "trash")
(defun system-move-file-to-trash (file)
"Use `trash' to move FILE to the system/volume trash can.
Can be installed with `brew install trash'."
(call-process (executable-find "trash") nil 0 nil file))
(setq mac-system-move-file-to-trash-use-finder t))
;; Use `gls' if `coreutils' was installed prefixed ('g') otherwise, leave
;; alone. Manually add to config `(setq dired-use-ls-dired nil)' to surpesss
;; warnings, when not using `coreutils' version of 'ls' on OS X.
;; See brew info coreutils
(when (executable-find "gls")
;; maybe absolute or relative name of the `ls' program used by ;; maybe absolute or relative name of the `ls' program used by
;; `insert-directory'. ;; `insert-directory'.
;; brew info coreutils
(setq insert-directory-program "gls" (setq insert-directory-program "gls"
dired-listing-switches "-aBhl --group-directories-first")) dired-listing-switches "-aBhl --group-directories-first")
))
(defun osx/init-pbcopy () (defun osx/init-pbcopy ()
(use-package pbcopy (use-package pbcopy

11
spacemacs/config.el
View file

@ -143,17 +143,8 @@ It runs `tabulated-list-revert-hook', then calls `tabulated-list-print'."
;; Use system trash for file deletion ;; Use system trash for file deletion
;; should work on Windows and Linux distros ;; should work on Windows and Linux distros
;; on OS X, install `trash' from `homebrew' ;; on OS X, see contrib/osx layer
(setq delete-by-moving-to-trash t) (setq delete-by-moving-to-trash t)
(when (system-is-mac)
;; use trash if installed
(if (executable-find "trash")
(defun system-move-file-to-trash (file)
"Use `trash' to move FILE to the system trash.
Can be installed with `brew install trash'."
(call-process (executable-find "trash") nil 0 nil file))
;; regular move to trash directory
(setq trash-directory "~/.Trash/emacs")))
;; auto fill breaks line beyond current-fill-column ;; auto fill breaks line beyond current-fill-column
(setq-default default-fill-column 80) (setq-default default-fill-column 80)