Skip to content

Commit abb9e1e

Browse files
committed
Mention 'make deps' target in more places
* targets/obsolete-config.el: * doc/ivy.org (Setup): Add directory names to load-path. (Installing from the Git repository): * CONTRIBUTING.org (Reporting issues): Mention 'make deps' as a prerequisite for installing the 'avy' package. * doc/ivy.texi: Regenerate manual. * ivy.el (ivy--sorted-files): Add commentary about the potential need for substitute-in-file-name (#3060).
1 parent 2393ed2 commit abb9e1e

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

CONTRIBUTING.org

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ init file.
1414
This shortcut will start =emacs -Q= for you with =ivy-mode= already
1515
loaded:
1616
#+begin_src sh
17-
git clone https://github.com/abo-abo/swiper/
18-
cd swiper
19-
make plain
17+
git clone 'https://github.com/abo-abo/swiper.git'
18+
cd swiper
19+
make deps plain
2020
#+end_src
2121

2222
* Contributing code

doc/ivy.org

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#+STARTUP: indent
1919
* Setup :noexport:
2020
#+BEGIN_SRC elisp :exports results :results silent
21-
(add-to-list 'load-path default-directory)
22-
(require 'ivy-ox)
21+
(add-to-list 'load-path (directory-file-name default-directory))
22+
(require 'ivy-ox)
2323
#+END_SRC
2424
* Writing this manual :noexport:
2525
To highlight a section without introducing a new subheading use
@@ -189,15 +189,15 @@ For package manager details, see [[info:emacs#Packages]].
189189
First clone the Swiper repository with:
190190

191191
#+begin_src sh
192-
cd ~/git && git clone https://github.com/abo-abo/swiper
193-
cd swiper && make compile
192+
cd ~/git && git clone 'https://github.com/abo-abo/swiper.git'
193+
cd swiper && make deps compile
194194
#+end_src
195195

196196
Second, add these lines to the Emacs init file:
197197

198198
#+begin_src elisp
199-
(add-to-list 'load-path "~/git/swiper/")
200-
(require 'ivy)
199+
(add-to-list 'load-path "~/git/swiper")
200+
(require 'ivy)
201201
#+end_src
202202

203203
Then, update the code with:

doc/ivy.texi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,14 +261,14 @@ Contribute to Ivy's development; send patches; pull requests
261261
First clone the Swiper repository with:
262262

263263
@example
264-
cd ~/git && git clone https://github.com/abo-abo/swiper
265-
cd swiper && make compile
264+
cd ~/git && git clone 'https://github.com/abo-abo/swiper.git'
265+
cd swiper && make deps compile
266266
@end example
267267

268268
Second, add these lines to the Emacs init file:
269269

270270
@lisp
271-
(add-to-list 'load-path "~/git/swiper/")
271+
(add-to-list 'load-path "~/git/swiper")
272272
(require 'ivy)
273273
@end lisp
274274

ivy.el

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2037,6 +2037,8 @@ Directories come first."
20372037
(seq (cl-mapcan
20382038
(lambda (f)
20392039
(unless (member f '("./" "../"))
2040+
;; FIXME: Use `substitute-in-file-name'?
2041+
;; Re: #2012, #3060.
20402042
(setq f (ivy--string-replace "$$" "$" f))
20412043
(list (if (and dirs-first (ivy--dirname-p f))
20422044
(propertize f 'ivy--dir (directory-file-name f))

targets/obsolete-config.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;; Copyright (C) 2016-2024 Free Software Foundation, Inc.
2-
(add-to-list 'load-path default-directory)
2+
(add-to-list 'load-path (directory-file-name default-directory))
33
(require 'counsel)
4-
(ivy-set-display-transformer 'ivy-switch-buffer 'ivy-switch-buffer-transformer)
4+
(ivy-set-display-transformer 'ivy-switch-buffer #'ivy-switch-buffer-transformer)
55
(byte-compile-file (expand-file-name "targets/obsolete-config.el"))

0 commit comments

Comments
 (0)