Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various housekeeping #1704

Merged
merged 27 commits into from Aug 8, 2018
Merged

Various housekeeping #1704

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5272e07
counsel.el: Optimise counsel-unicode-char
basil-conto Aug 6, 2018
e4e286a
counsel.el: #'-quote defalias definitions
basil-conto Aug 6, 2018
4739bef
counsel.el: Reword docstring of symbol history var
basil-conto Jun 14, 2018
759f83e
counsel.el: Simplify regexp unquoting
basil-conto Jun 14, 2018
bec04b6
ivy.el: Replace assoc with assq where appropriate
basil-conto Aug 6, 2018
1fcbd49
ivy.el (ivy--buffer-list): Optimise
basil-conto Aug 6, 2018
7c1ab84
Use the variable, not function, buffer-file-name
basil-conto Aug 6, 2018
e7bf2b3
ivy.el (ivy--find-file-action): Simplify
basil-conto Aug 6, 2018
7f07dbd
ivy.el (ivy--recompute-index): Simplify
basil-conto Aug 6, 2018
90238e7
ivy.el (ivy--add-face): Update docstring
basil-conto Aug 6, 2018
7c8beb2
ivy.el: Add convenience function ivy--parent-dir
basil-conto Aug 6, 2018
8df5553
ivy.el (ivy-call): Simplify I
basil-conto Aug 6, 2018
bc45f69
ivy.el (ivy-call): Simplify II
basil-conto Aug 6, 2018
79be4ba
counsel.el (counsel-apropos): Simplify
basil-conto Aug 6, 2018
9797fcb
counsel.el (counsel-apropos): Set sort & preselect
basil-conto Aug 6, 2018
8e01c20
ivy.el (ivy-thing-at-point): Simplify
basil-conto Aug 6, 2018
8539fa3
counsel.el (counsel--M-x-externs): Touch-up
basil-conto Aug 6, 2018
85cbaac
ivy.el (ivy-switch-buffer): Fix this-command usage
basil-conto Aug 6, 2018
52013fa
ivy.el: Use delete-dups where appropriate
basil-conto Aug 6, 2018
2cdd808
ivy.el (ivy--virtual-buffers): Simplify I
basil-conto Aug 6, 2018
f2bcc68
ivy.el (ivy--virtual-buffers): Simplify II
basil-conto Aug 6, 2018
16a5352
counsel.el (counsel-library-candidates): Simplify
basil-conto Aug 6, 2018
ccffa6e
Quote function symbols with #'
basil-conto Aug 6, 2018
bf9d098
Pacify byte-compiler
basil-conto Aug 6, 2018
4092882
Simplify counsel-imenu-categorize-functions
basil-conto May 17, 2018
3e1489c
counsel.el (counsel-git-checkout-action): Touch-up
basil-conto Aug 6, 2018
b5e8556
ivy.el (ivy-on-del-error-function): Simplify
basil-conto Aug 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 15 additions & 17 deletions ivy.el
View file
Open in desktop
Expand Up @@ -3457,26 +3457,24 @@ CANDS is a list of strings."
(let (virtual-buffers)
(bookmark-maybe-load-default-file)
(dolist (head (append
(copy-sequence recentf-list)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was copy-sequence not needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICT no, given the call to append.

recentf-list
(delete " - no file -"
(delq nil (mapcar #'bookmark-get-filename
(copy-sequence bookmark-alist))))))
(let ((file-name (if (stringp head)
head
(cdr head)))
name)
(setq name
(cond ((eq ivy-virtual-abbreviate 'name)
(file-name-nondirectory file-name))
((eq ivy-virtual-abbreviate 'abbreviate)
(abbreviate-file-name file-name))
(t
(expand-file-name file-name))))
bookmark-alist)))))
(let* ((file-name (if (stringp head)
head
(cdr head)))
(name (cond ((eq ivy-virtual-abbreviate 'name)
(file-name-nondirectory file-name))
((eq ivy-virtual-abbreviate 'abbreviate)
(abbreviate-file-name file-name))
(t
(expand-file-name file-name)))))
(when (equal name "")
(if (consp head)
(setq name (car head))
(setq name (file-name-nondirectory
(directory-file-name file-name)))))
(setq name
(if (consp head)
(car head)
(file-name-nondirectory (directory-file-name file-name)))))
(and (not (equal name ""))
(null (get-file-buffer file-name))
(not (assoc name virtual-buffers))
Expand Down