[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/with-editor 3385ffd 037/140: Revert "Use when-let instead
From: |
Jonas Bernoulli |
Subject: |
[nongnu] elpa/with-editor 3385ffd 037/140: Revert "Use when-let instead of macros from dash" |
Date: |
Fri, 6 Aug 2021 12:51:15 -0400 (EDT) |
branch: elpa/with-editor
commit 3385ffdc6faed5a283e26a7ebf89825c700dd395
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Revert "Use when-let instead of macros from dash"
This reverts commit 8c95e7de363715e8e38bbb4d9eac2dd63ac8b74e.
---
with-editor.el | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/with-editor.el b/with-editor.el
index be1974c..13e0c6a 100644
--- a/with-editor.el
+++ b/with-editor.el
@@ -82,7 +82,6 @@
(require 'cl-lib)
(require 'dash)
(require 'server)
-(require 'subr-x)
(require 'tramp)
(require 'tramp-sh nil t)
@@ -109,14 +108,15 @@
(defun with-editor-locate-emacsclient ()
"Search for a suitable Emacsclient executable."
- (or (with-editor-locate-emacsclient-1 (with-editor-emacsclient-path) 3)
- (display-warning 'with-editor (format "\
+ (--if-let (with-editor-locate-emacsclient-1 (with-editor-emacsclient-path) 3)
+ it
+ (display-warning 'with-editor (format "\
Cannot determine a suitable Emacsclient
Determining an Emacsclient executable suitable for the
current Emacs instance failed. For more information
please see https://github.com/magit/magit/wiki/Emacsclient."))
- nil))
+ nil))
(defun with-editor-locate-emacsclient-1 (path depth)
(let* ((version-lst (-take depth (split-string emacs-version "\\.")))
@@ -140,7 +140,7 @@ please see
https://github.com/magit/magit/wiki/Emacsclient."))
(with-editor-locate-emacsclient-1 path (1- depth))))))
(defun with-editor-emacsclient-version (exec)
- (when-let (1st-line (car (process-lines exec "--version")))
+ (-when-let (1st-line (car (process-lines exec "--version")))
(cadr (split-string 1st-line))))
(defun with-editor-emacsclient-path ()
@@ -662,10 +662,10 @@ else like the former."
(defun with-editor-shell-command-read-args (prompt &optional async)
(let ((command (read-shell-command
prompt nil nil
- (when-let (file (or buffer-file-name
- (and (eq major-mode 'dired-mode)
- (dired-get-filename nil t))))
- (file-relative-name file)))))
+ (--when-let (or buffer-file-name
+ (and (eq major-mode 'dired-mode)
+ (dired-get-filename nil t)))
+ (file-relative-name it)))))
(list command
(if (or async (setq async (string-match-p "&[ \t]*\\'" command)))
(< (prefix-numeric-value current-prefix-arg) 0)
- [nongnu] elpa/with-editor 216ee34 056/140: Build on Travis, (continued)
- [nongnu] elpa/with-editor 216ee34 056/140: Build on Travis, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor b37d94b 035/140: with-editor-debug: fix old reference to magit in output, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 706c8ce 011/140: instruct users to use term-exec-hook, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 07bb67b 010/140: remove with-editor-export-editor from hook for shell-command, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 6f41998 017/140: with-editor-export-editor: fix doc-string, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 0a8d9ce 039/140: manual: set version in Org source, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 1a6c49b 023/140: update list of contributors, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor b2d9d6b 024/140: stop using "BEGIN_EXPORT texinfo" to support Org v9.0, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 8ae3c7a 032/140: Add a space in before export command to avoid polluting HISTFILE, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor ebf6ee4 034/140: with-editor-debug: don't run emacsclientw.exe, it makes popup windows, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 3385ffd 037/140: Revert "Use when-let instead of macros from dash",
Jonas Bernoulli <=
- [nongnu] elpa/with-editor 229e80f 038/140: manual: regenerate using updated Org and Ox-Texinfo+, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 5851e76 043/140: Adapt to bug fixes in ox-texinfo and changes in ox-texinfo+ v2, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 5cddefa 044/140: Use remacsclient when using remacs, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 1343935 045/140: Fix doc-string typos, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 8d73358 046/140: Provide actual url when mentioning old Magit issue numbers, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 890f923 048/140: Drop dependency on dash, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 2417261 051/140: Guard against nonexistent default directory, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor ae23243 053/140: Cosmetics and typo fixes, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor 1b7f6ef 055/140: Require pcase, Jonas Bernoulli, 2021/08/06
- [nongnu] elpa/with-editor fb9e560 057/140: .travis.yml: fail on byte compilation warnings, Jonas Bernoulli, 2021/08/06