6eab954afe
Helm seems to treat "!" specially in pattern matching, so having a ! in the pattern string when traversing directories is problematic. This change fixes #2737, because as far as I can tell "+" has no special meaning in a helm pattern. Of course, we can choose a different character, but I'm fond of "+" as representing "more layers here".
139 lines
4.5 KiB
EmacsLisp
139 lines
4.5 KiB
EmacsLisp
;; funcs.el file for vinegar contribution layer
|
|
|
|
(defun vinegar/dotfiles-toggle ()
|
|
"Show/hide dot-files"
|
|
(interactive)
|
|
(when (equal major-mode 'dired-mode)
|
|
(if (or (not (boundp 'dired-dotfiles-show-p)) dired-dotfiles-show-p) ; if currently showing
|
|
(progn
|
|
(set (make-local-variable 'dired-dotfiles-show-p) nil)
|
|
(message "h")
|
|
(dired-mark-files-regexp "^\\\.")
|
|
(dired-do-kill-lines))
|
|
(progn (revert-buffer) ; otherwise just revert to re-show
|
|
(set (make-local-variable 'dired-dotfiles-show-p) t)))))
|
|
|
|
(defun vinegar/back-to-top ()
|
|
"Move to first file"
|
|
(interactive)
|
|
(beginning-of-buffer)
|
|
(dired-next-line 1))
|
|
|
|
(defun vinegar/jump-to-bottom ()
|
|
"Move to last file"
|
|
(interactive)
|
|
(end-of-buffer)
|
|
(dired-next-line -1))
|
|
|
|
(defun vinegar/move-up ()
|
|
"Move to previous file"
|
|
(interactive)
|
|
(dired-previous-line 1)
|
|
(if (bobp)
|
|
(dired-next-line 1)))
|
|
|
|
(defun vinegar/move-down ()
|
|
"Move to next file"
|
|
(interactive)
|
|
(dired-next-line 1)
|
|
(if (eobp)
|
|
(dired-next-line -1)))
|
|
|
|
(defun vinegar/up-directory (&optional other-window)
|
|
"Run Dired on parent directory of current directory."
|
|
(interactive "P")
|
|
(let* ((dir (dired-current-directory))
|
|
(orig (current-buffer))
|
|
(up (file-name-directory (directory-file-name dir))))
|
|
(or (dired-goto-file (directory-file-name dir))
|
|
;; Only try dired-goto-subdir if buffer has more than one dir.
|
|
(and (cdr dired-subdir-alist)
|
|
(dired-goto-subdir up))
|
|
(progn
|
|
(kill-buffer orig)
|
|
(dired up)
|
|
(dired-goto-file dir)))))
|
|
|
|
(defun vinegar/dired-diff ()
|
|
"Ediff marked files in dired or selected files in separate window"
|
|
(interactive)
|
|
(let* ((marked-files (dired-get-marked-files nil nil))
|
|
(other-win (get-window-with-predicate
|
|
(lambda (window)
|
|
(with-current-buffer (window-buffer window)
|
|
(and (not (eq window (selected-window)))
|
|
(eq major-mode 'dired-mode))))))
|
|
(other-marked-files (and other-win
|
|
(with-current-buffer (window-buffer other-win)
|
|
(dired-get-marked-files nil)))))
|
|
(cond ((= (length marked-files) 2)
|
|
(ediff-files (nth 0 marked-files)
|
|
(nth 1 marked-files)))
|
|
((= (length marked-files) 3)
|
|
(ediff-files3 (nth 0 marked-files)
|
|
(nth 1 marked-files)
|
|
(nth 2 marked-files)
|
|
))
|
|
((and (= (length marked-files) 1)
|
|
(= (length other-marked-files) 1))
|
|
(ediff-files (nth 0 marked-files)
|
|
(nth 0 other-marked-files)))
|
|
((= (length marked-files) 1)
|
|
(dired-diff))
|
|
(t (error "mark exactly 2 files, at least 1 locally")))))
|
|
|
|
|
|
(defun vinegar/dired-setup ()
|
|
"Setup custom dired settings for vinegar"
|
|
(setq dired-omit-verbose nil)
|
|
(make-local-variable 'dired-hide-symlink-targets)
|
|
(setq dired-hide-details-hide-symlink-targets nil)
|
|
|
|
;; hide details by default
|
|
(dired-hide-details-mode t)
|
|
;; omit the .. in dired
|
|
(dired-omit-mode t)
|
|
|
|
;; allow selection with mouse
|
|
(make-local-variable 'mouse-1-click-follows-link)
|
|
(setq mouse-1-click-follows-link nil)
|
|
|
|
(local-set-key (kbd "<mouse-1>") 'vinegar/dired-mouse-click)
|
|
(local-set-key (kbd "<mouse-3>") 'vinegar/up-directory)
|
|
(local-set-key (kbd "<down-mouse-3>") nil)
|
|
)
|
|
|
|
(defun vinegar/dired-mouse-click (event)
|
|
"In Dired, visit the file or directory name you click on."
|
|
(interactive "e")
|
|
(let (window pos file)
|
|
(save-excursion
|
|
(setq window (posn-window (event-end event))
|
|
pos (posn-point (event-end event)))
|
|
(if (not (windowp window))
|
|
(error "No file chosen"))
|
|
(set-buffer (window-buffer window))
|
|
(goto-char pos)
|
|
(setq file (dired-get-file-for-visit)))
|
|
(find-alternate-file file)))
|
|
|
|
(defun vinegar/dired-mouse-click-3 (event)
|
|
"In Dired, show context menu or go up a directory."
|
|
(interactive "e")
|
|
(let (window pos file)
|
|
(save-excursion
|
|
(setq window (posn-window (event-end event))
|
|
pos (posn-point (event-end event)))
|
|
(if (not (windowp window))
|
|
(error "No file chosen"))
|
|
(set-buffer (window-buffer window))
|
|
(goto-char pos)
|
|
(condition-case ex
|
|
(progn
|
|
(setq file (dired-get-file-for-visit))
|
|
(dired-find-file-other-window))
|
|
('error
|
|
(vinegar/up-directory)
|
|
))
|
|
)))
|
|
;; )
|