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

Fix (null uniquify-buffer-name-style) errors from ivy

Browse source 
Errors out in Emacs 25.x
This commit is contained in:
Henrik Lissner 2019-07-17 16:00:12 +02:00
parent 92aab23ca0
commit 854d8ce00a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/completion/ivy/autoload/ivy.el
View file

@ -20,17 +20,17 @@
Buffers that are considered unreal (see `doom-real-buffer-p') are dimmed with Buffers that are considered unreal (see `doom-real-buffer-p') are dimmed with
`+ivy-buffer-unreal-face'." `+ivy-buffer-unreal-face'."
(let ((b (get-buffer candidate))) (let ((b (get-buffer candidate)))
(when-let* (((null uniquify-buffer-name-style)) (when (null uniquify-buffer-name-style)
(file-path (buffer-file-name b)) (when-let* ((file-path (buffer-file-name b))
(uniquify-buffer-name-style 'forward)) (uniquify-buffer-name-style 'forward))
(setq candidate (setq candidate
(uniquify-get-proposed-name (uniquify-get-proposed-name
(replace-regexp-in-string "<[0-9]+>$" "" (buffer-name b)) (replace-regexp-in-string "<[0-9]+>$" "" (buffer-name b))
(directory-file-name (directory-file-name
(if file-path (if file-path
(file-name-directory file-path) (file-name-directory file-path)
default-directory)) default-directory))
1))) 1))))
(cond ((ignore-errors (cond ((ignore-errors
(file-remote-p (file-remote-p
(buffer-local-value 'default-directory b))) (buffer-local-value 'default-directory b)))