diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2025-08-23 18:28:00 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-08-23 18:28:00 +0200 |
| commit | 2ab34a757503436904b80d0a24feeb45ab1e01c5 (patch) | |
| tree | 75e3f4ebe4a4ed48c774799cd1ab6d9b27eabd65 /docs | |
| parent | b4768acb1f7b903b4b66233a2f4fcbc2466d54ca (diff) | |
Add missing references to Cond-Let package
Closes #5429.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/magit.org | 16 | ||||
| -rw-r--r-- | docs/magit.texi | 16 |
2 files changed, 18 insertions, 14 deletions
diff --git a/docs/magit.org b/docs/magit.org index 4c1089c..bfd5ace 100644 --- a/docs/magit.org +++ b/docs/magit.org @@ -153,8 +153,8 @@ Now see [[*Post-Installation Tasks]]. ** Installing from the Git Repository -Magit depends on the ~compat~, ~llama~, ~seq~ (the built-in version is -enough when using Emacs >= 29.1), ~transient~ and ~with-editor~ libraries +Magit depends on the ~compat~, ~cond-let~, ~llama~, ~seq~ (the built-in version +is enough when using Emacs >= 29.1), ~transient~ and ~with-editor~ libraries which are available from Melpa and Melpa-Stable. Install them using ~M-x package-install RET <package> RET~. Of course you may also install them manually from their repository. @@ -172,15 +172,16 @@ Then compile the libraries and generate the info manuals: $ make #+end_src -If you haven't installed ~compat~, ~llama~, ~seq~ (for Emacs < 29.1), -~transient~ and ~with-editor~ from Melpa, or at -~/path/to/magit/../<package>~, then you have to tell ~make~ where to -find them. To do so create the file ~/path/to/magit/config.mk~ -with the following content before running ~make~: +If you haven't installed ~compat~, ~cond-let~, ~llama~, ~seq~ +(only for Emacs 28), ~transient~ and ~with-editor~ from Melpa, or at +~/path/to/magit/../<package>~, then you have to tell ~make~ where to find +them. To do so create the file ~/path/to/magit/config.mk~ with the +following content before running ~make~: #+begin_src makefile LOAD_PATH = -L ~/.emacs.d/site-lisp/magit/lisp LOAD_PATH += -L ~/.emacs.d/site-lisp/compat + LOAD_PATH += -L ~/.emacs.d/site-lisp/cond-let LOAD_PATH += -L ~/.emacs.d/site-lisp/llama LOAD_PATH += -L ~/.emacs.d/site-lisp/seq LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp @@ -203,6 +204,7 @@ you have to tell Emacs about them too, by prefixing the above with: #+begin_src emacs-lisp (add-to-list 'load-path "~/.emacs.d/site-lisp/compat") + (add-to-list 'load-path "~/.emacs.d/site-lisp/cond-let") (add-to-list 'load-path "~/.emacs.d/site-lisp/llama") (add-to-list 'load-path "~/.emacs.d/site-lisp/seq") (add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp") diff --git a/docs/magit.texi b/docs/magit.texi index 4e96c3a..28c8cc8 100644 --- a/docs/magit.texi +++ b/docs/magit.texi @@ -305,8 +305,8 @@ Now see @ref{Post-Installation Tasks}. @node Installing from the Git Repository @section Installing from the Git Repository -Magit depends on the @code{compat}, @code{llama}, @code{seq} (the built-in version is -enough when using Emacs >= 29.1), @code{transient} and @code{with-editor} libraries +Magit depends on the @code{compat}, @code{cond-let}, @code{llama}, @code{seq} (the built-in version +is enough when using Emacs >= 29.1), @code{transient} and @code{with-editor} libraries which are available from Melpa and Melpa-Stable. Install them using @code{M-x package-install RET <package> RET}. Of course you may also install them manually from their repository. @@ -324,15 +324,16 @@ Then compile the libraries and generate the info manuals: $ make @end example -If you haven't installed @code{compat}, @code{llama}, @code{seq} (for Emacs < 29.1), -@code{transient} and @code{with-editor} from Melpa, or at -@code{/path/to/magit/../<package>}, then you have to tell @code{make} where to -find them. To do so create the file @code{/path/to/magit/config.mk} -with the following content before running @code{make}: +If you haven't installed @code{compat}, @code{cond-let}, @code{llama}, @code{seq} +(only for Emacs 28), @code{transient} and @code{with-editor} from Melpa, or at +@code{/path/to/magit/../<package>}, then you have to tell @code{make} where to find +them. To do so create the file @code{/path/to/magit/config.mk} with the +following content before running @code{make}: @example LOAD_PATH = -L ~/.emacs.d/site-lisp/magit/lisp LOAD_PATH += -L ~/.emacs.d/site-lisp/compat +LOAD_PATH += -L ~/.emacs.d/site-lisp/cond-let LOAD_PATH += -L ~/.emacs.d/site-lisp/llama LOAD_PATH += -L ~/.emacs.d/site-lisp/seq LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp @@ -355,6 +356,7 @@ you have to tell Emacs about them too, by prefixing the above with: @lisp (add-to-list 'load-path "~/.emacs.d/site-lisp/compat") +(add-to-list 'load-path "~/.emacs.d/site-lisp/cond-let") (add-to-list 'load-path "~/.emacs.d/site-lisp/llama") (add-to-list 'load-path "~/.emacs.d/site-lisp/seq") (add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp") |
