maciej/counsel-projectile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

define string-trim-right locally to support emacs 25

Browse source 
Fixes #122
This commit is contained in:
Eric Danan 2019-03-10 23:05:51 +01:00
parent d64e5275c5
commit edc60cd429
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
counsel-projectile.el
View file

@ -243,6 +243,17 @@ If anything goes wrong, throw an error and do not modify ACTION-VAR."
(cdr action-list)))))) (cdr action-list))))))
(set action-var action-list))) (set action-var action-list)))
;; Copy the function `string-trim-right' from emacs 26 here so as to
;; support emacs 25 (the function exists in emacs 25 but doesn't
;; accept the REGEXP optional argument).
(defsubst counsel-projectile--string-trim-right (string &optional regexp)
"Trim STRING of trailing string matching REGEXP.
REGEXP defaults to \"[ \\t\\n\\r]+\"."
(if (string-match (concat "\\(?:" (or regexp "[ \t\n\r]+") "\\)\\'") string)
(replace-match "" t t string)
string))
;;* counsel-projectile-find-file ;;* counsel-projectile-find-file
(defcustom counsel-projectile-sort-files nil (defcustom counsel-projectile-sort-files nil
@ -748,7 +759,7 @@ with a prefix argument."
(car (projectile-parse-dirconfig-file))) (car (projectile-parse-dirconfig-file)))
" ")) " "))
(counsel-git-grep-cmd-default (counsel-git-grep-cmd-default
(concat (string-trim-right counsel-git-grep-cmd-default " \\.") (concat (counsel-projectile--string-trim-right counsel-git-grep-cmd-default " \\.")
" " path))) " " path)))
(ivy-add-actions (ivy-add-actions
'counsel-git-grep 'counsel-git-grep
@ -815,7 +826,7 @@ is called with a prefix argument."
(projectile-ignored-directories-rel)) (projectile-ignored-directories-rel))
" ")) " "))
(counsel-ag-base-command (counsel-ag-base-command
(format (string-trim-right counsel-ag-base-command " \\.") (format (counsel-projectile--string-trim-right counsel-ag-base-command " \\.")
(concat ignored " %s " path)))) (concat ignored " %s " path))))
(ivy-add-actions (ivy-add-actions
'counsel-ag 'counsel-ag
@ -887,7 +898,7 @@ is called with a prefix argument."
(projectile-ignored-directories-rel)) (projectile-ignored-directories-rel))
" ")) " "))
(counsel-rg-base-command (counsel-rg-base-command
(format (string-trim-right counsel-rg-base-command " \\.") (format (counsel-projectile--string-trim-right counsel-rg-base-command " \\.")
(concat ignored " %s " path)))) (concat ignored " %s " path))))
(ivy-add-actions (ivy-add-actions
'counsel-ag 'counsel-ag