diff options
Diffstat (limited to 'lisp/km-projectile.el')
| -rw-r--r-- | lisp/km-projectile.el | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/lisp/km-projectile.el b/lisp/km-projectile.el index cb4d0fe..e22eeae 100644 --- a/lisp/km-projectile.el +++ b/lisp/km-projectile.el @@ -77,8 +77,8 @@ names separated by a space." (org-element-property :path el)) (and (derived-mode-p 'dired-mode) (dired-get-marked-files 'nodir nil)) - (--when-let (thing-at-point 'filename) - (and (file-exists-p it) it))))) + (when-let ((fname (thing-at-point 'filename))) + (and (file-exists-p fname) fname))))) (when fname (mapconcat `(lambda (f) (file-relative-name f ,(projectile-project-root))) @@ -97,7 +97,7 @@ names separated by a space." If point is on a file, copy this as the file name. Otherwise, use the name of the current file." (interactive) - (-when-let (fname (km/projectile-project-filename)) + (when-let ((fname (km/projectile-project-filename))) (if (eq last-command 'kill-region) (kill-append fname nil) (kill-new fname)) @@ -109,10 +109,11 @@ use the name of the current file." Currently, only Python mode is supported." (interactive) (when (derived-mode-p 'python-mode) - (-when-let* ((fname (km/projectile-project-filename)) - (module (--> fname - (replace-regexp-in-string "/" "." it nil t) - (replace-regexp-in-string "\\.py" "" it t t)))) + (when-let ((fname (km/projectile-project-filename)) + (module (replace-regexp-in-string + "\\.py" "" + (replace-regexp-in-string "/" "." fname nil t) + t t))) (if (eq last-command 'kill-region) (kill-append module nil) (kill-new module)) @@ -157,16 +158,16 @@ Thing is a character representing "Restore saved thing for current project. Return nil if there is no thing saved for the current project." (interactive) - (-when-let* ((thing-value (lax-plist-get km/projectile-project-saved-thing - (projectile-project-root))) - (thing (car thing-value)) - (value (cdr thing-value))) + (when-let ((thing-value (lax-plist-get km/projectile-project-saved-thing + (projectile-project-root))) + (thing (car thing-value)) + (value (cdr thing-value))) (cl-case thing (?. - (-if-let (buf (marker-buffer value)) - (progn (switch-to-buffer buf) - (goto-char value)) - (user-error "Buffer no longer exists"))) + (switch-to-buffer + (or (marker-buffer value) + (user-error "Buffer no longer exists"))) + (goto-char value)) (?b (if (buffer-live-p value) (switch-to-buffer value) |