mirrors
/
ambevar-dotfiles
mirror of https://gitlab.com/ambrevar/dotfiles/
1
0
Fork 0
Code Issues Releases Wiki Activity

Eshell: Remove spurious em-cmpl line 

That used to break fish-completion loading
master
Pierre Neidhardt 2017-12-09 14:09:27 +01:00
parent 1eb7b6b998
commit 3b2ffd0a74
2 changed files with 4 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
.emacs.d/lisp/init-emms.el
View File

@ -4,8 +4,6 @@
;;; TODO: Change face from purple to white?
;;; TODO: Delete entry from cache? See `emms-cache-del'.
(load "patch-emms-cover")
(setq emms-directory (concat emacs-cache-folder "emms"))
(emms-all)
;; TODO: emms-all causes some "require"d files to be loaded twice if called after, say, emms-browser was loaded.
@ -29,111 +27,6 @@
(delete 'emms-info-ogginfo emms-info-functions)
(delete 'emms-info-mp3info emms-info-functions))
;;; Cache cover thumbnails.
;;; TODO: This needs a modification to upstream `emms-browser-get-cover-from-path'. Report the problem. Advice function in the meantime?
;; ((functionp 'emms-browser-covers)
;; (emms-browser-covers (file-name-directory path) size))
(defvar emms-cache-cover-small-size 128)
(defvar emms-cache-cover-medium-size 256)
(defvar emms-cache-cover-large-size 1024) ; Emms does not use it as of this writing
;;; TODO: Sync cover cache? What if covers are updated? Implement function to scan db and remove unlinked files.
;;; TODO: `emms-browser-expand-all' is slow because of all the covers. Turn off cover cache momentarily?
;;; TODO: Async version? Maybe not needed. Test with big music folder.
(defun emms-cache-cover-filter-default (dir)
"Select covers containing 'front' in DIR.
If none was found, fallback on all files matching 'cover'.
If none, fallback on `emms-cache-cover-filter-all'.
See `emms-cache-cover-filter'."
(let (covers)
;; TODO: Refactor this code.
(dolist (ext emms-browser-covers-file-extensions)
(setq covers (append (file-expand-wildcards (expand-file-name (concat "*front*." ext) dir)) covers))
(setq covers (append (file-expand-wildcards (expand-file-name (concat "*Front*." ext) dir)) covers)))
(unless covers
(dolist (ext emms-browser-covers-file-extensions)
(setq covers (append (file-expand-wildcards (expand-file-name (concat "*cover*." ext) dir)) covers))
(setq covers (append (file-expand-wildcards (expand-file-name (concat "*Cover*." ext) dir)) covers)))
(unless covers
(setq covers (emms-cache-cover-filter-all dir))))
covers))
(defun emms-cache-cover-filter-all (dir)
"Return the list of all files with `emms-browser-covers-file-extensions' in DIR.
See `emms-cache-cover-filter'."
(let (covers)
(dolist (ext emms-browser-covers-file-extensions)
(setq covers (append (file-expand-wildcards (expand-file-name (concat "*." ext) dir)) covers)))))
(defvar emms-cache-cover-filter 'emms-cache-cover-filter-default
"This filter must hold a function that takes a directory argument and returns a list of cover file names.
The list will be processed by `emms-cache-covers'.
See also `emms-cache-cover-filter-default'.")
(defun emms-cache-covers (dir size)
"Return cached cover SIZE for album in DIR.
SIZE must be 'small, 'medium or 'large. It will determine the
resolution of the cached file. See `emms-cache-cover-SIZE-size'.
If cover is not cached or if cache is out-of-date, re-cache it.
If the cover is smaller than `emms-cache-cover-SIZE-size', it
need not be cached and will be used directly.
Emms assumes that you have one album per folder. This function
will always use the same cover per folder."
(if (eq size 'large)
;; 'large is unused for now. Return empty.
nil
(let (covers
cover
(cover-width 0) (cover-height 0)
(size-value (symbol-value (intern (concat "emms-cache-cover-" (symbol-name size) "-size"))))
cache-dest-file)
(setq covers (funcall emms-cache-cover-filter dir))
(if (not covers)
nil
;; Find best quality cover.
(let (res)
(dolist (c covers)
(setq res (image-size (create-image c) t))
;; image-size does not error, it returns (30. 30) instead.
(and (> (car res) 30) (> (cdr res) 30)
(< cover-width (car res)) (< cover-height (cdr res))
(setq cover-width (car res) cover-height (cdr res) cover c))))
(if (and (>= size-value cover-width) (>= size-value cover-height))
;; No need to resize and cache.
cover
(let ((cache-dest (concat (expand-file-name "cover-cache" emms-directory) (file-name-directory cover))))
(mkdir cache-dest t)
(setq cache-dest-file (concat
(expand-file-name "cover_" cache-dest)
(symbol-name size)
"." (file-name-extension cover))))
(and (executable-find "convert")
(or (not (file-exists-p cache-dest-file))
(time-less-p (nth 5 (file-attributes cache-dest-file))
(nth 5 (file-attributes cover)) ))
(let (err msg)
;; An Elisp function would be faster, but Emacs does not seem be be
;; able to resize image files. It can resize image displays though.
(setq msg (with-output-to-string
(with-current-buffer standard-output
(setq err (call-process "convert" nil '(t t) nil
"-resize" (format "%sx%s" size-value size-value)
cover
cache-dest-file)))))
;; (message "EMMS convert status: %s, msg %s" err msg)
(when (/= err 0)
(warn "%s" msg)
(setq cache-dest-file nil))))
cache-dest-file)))))
(fset 'emms-browser-covers 'emms-cache-covers)
;;; Resume on restart.
;;; We don't use bookmarks as that could interfere with user's ones.
(with-eval-after-load 'desktop
@ -182,4 +75,6 @@ This function uses 'info-albumartistsort, 'info-albumartist,
helm-source-emms-files ; Disable for a huge speed-up.
helm-source-emms-streams)))
(load "patch-emms-cover")
(provide 'init-emms)

4
.emacs.d/lisp/init-eshell.el
View File

@ -192,7 +192,6 @@
;;; Hooks
;;; `nobreak-char-display' makes some output look weird, e.g. with 'tree'.
(add-hook 'eshell-mode-hook 'turn-off-nobreak-char-display)
(add-hook 'eshell-mode-hook 'eshell-cmpl-initialize)
;;; History
;;; Filter out space-beginning commands from history.
@ -244,7 +243,8 @@ See `eshell' for the numeric prefix ARG."
(setq-local company-backends '(company-eshell-autosuggest))
(setq-local company-frontends '(company-preview-frontend)))
;; TODO: Fix https://github.com/jojojames/evil-collection/issues/41.
(define-key company-active-map (kbd "<tab>") 'company-select-next-if-tooltip-visible-or-complete-selection)
;; (define-key company-active-map (kbd "<tab>") 'company-select-next-if-tooltip-visible-or-complete-selection)
;; (add-to-list 'company-frontends 'company-tng-frontend)
(add-hook 'eshell-mode-hook 'company-mode)
(when (require 'helm-config nil t)
(define-key company-active-map (kbd "M-p") 'helm-eshell-history))