From 2a736738095c313ccef07d074aac4c5467b750e0 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 22 Sep 2021 05:57:48 +0200 Subject: [PATCH] Change how thread-first/thread-last indent the first argument * lisp/doc-view.el (doc-view--current-cache-dir): Reindent. * lisp/emacs-lisp/subr-x.el (thread-first): (thread-last): Change indentation to match examples. (internal--build-binding): Reindent. * test/lisp/emacs-lisp/subr-x-tests.el (subr-x-test-thread-first-function-names-are-threaded): (subr-x-test-thread-first-examples): (subr-x-test-thread-last-function-names-are-threaded): (subr-x-test-thread-last-examples): Reindent. --- lisp/doc-view.el | 2 +- lisp/emacs-lisp/subr-x.el | 6 +++--- test/lisp/emacs-lisp/subr-x-tests.el | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 0896bd13eb5..088ca5bfeae 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -727,7 +727,7 @@ It's a subdirectory of `doc-view-cache-directory'." (file-name-as-directory (expand-file-name (concat (thread-last - (file-name-nondirectory doc-view--buffer-file-name) + (file-name-nondirectory doc-view--buffer-file-name) ;; bug#13679 (subst-char-in-string ?% ?_) ;; arc-mode concatenates archive name and file name diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 4204d20249d..3de666682fa 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -62,7 +62,7 @@ Is equivalent to: (+ (- (/ (+ 5 20) 25)) 40) Note how the single `-' got converted into a list before threading." - (declare (indent 1) + (declare (indent 0) (debug (form &rest [&or symbolp (sexp &rest form)]))) `(internal--thread-argument t ,@forms)) @@ -79,7 +79,7 @@ Is equivalent to: (+ 40 (- (/ 25 (+ 20 5)))) Note how the single `-' got converted into a list before threading." - (declare (indent 1) (debug thread-first)) + (declare (indent 0) (debug thread-first)) `(internal--thread-argument nil ,@forms)) (defsubst internal--listify (elt) @@ -107,7 +107,7 @@ If ELT is of the form ((EXPR)), listify (EXPR) with a dummy symbol." (defun internal--build-binding (binding prev-var) "Check and build a single BINDING with PREV-VAR." (thread-first - binding + binding internal--listify internal--check-binding (internal--build-binding-value-form prev-var))) diff --git a/test/lisp/emacs-lisp/subr-x-tests.el b/test/lisp/emacs-lisp/subr-x-tests.el index ef04cde3867..1d19496ba44 100644 --- a/test/lisp/emacs-lisp/subr-x-tests.el +++ b/test/lisp/emacs-lisp/subr-x-tests.el @@ -455,18 +455,18 @@ "Test `thread-first' wraps single function names." (should (equal (macroexpand '(thread-first 5 - -)) + -)) '(- 5))) (should (equal (macroexpand '(thread-first (+ 1 2) - -)) + -)) '(- (+ 1 2))))) (ert-deftest subr-x-test-thread-first-expansion () "Test `thread-first' expands correctly." (should (equal (macroexpand '(thread-first - 5 + 5 (+ 20) (/ 25) - @@ -477,13 +477,13 @@ "Test several `thread-first' examples." (should (equal (thread-first (+ 40 2)) 42)) (should (equal (thread-first - 5 + 5 (+ 20) (/ 25) - (+ 40)) 39)) (should (equal (thread-first - "this-is-a-string" + "this-is-a-string" (split-string "-") (nbutlast 2) (append (list "good"))) @@ -500,18 +500,18 @@ "Test `thread-last' wraps single function names." (should (equal (macroexpand '(thread-last 5 - -)) + -)) '(- 5))) (should (equal (macroexpand '(thread-last (+ 1 2) - -)) + -)) '(- (+ 1 2))))) (ert-deftest subr-x-test-thread-last-expansion () "Test `thread-last' expands correctly." (should (equal (macroexpand '(thread-last - 5 + 5 (+ 20) (/ 25) - @@ -522,13 +522,13 @@ "Test several `thread-last' examples." (should (equal (thread-last (+ 40 2)) 42)) (should (equal (thread-last - 5 + 5 (+ 20) (/ 25) - (+ 40)) 39)) (should (equal (thread-last - (list 1 -2 3 -4 5) + (list 1 -2 3 -4 5) (mapcar #'abs) (cl-reduce #'+) (format "abs sum is: %s")) -- 2.39.5