Merge 'docfix' (#3014), 'recipes' (#3015) and 'test-update-load-path'

Author: npostavs

.github/workflows/test.yml

@@ -8,6 +8,7 @@ on:
     paths-ignore:
     - '**.png'
     - '**.svg'
+    - '**.md'
     - '**.texi'
     - '**.info'
     - '.dir-locals.el'

README.md

@@ -73,7 +73,7 @@ your package manager if you are using Linux or by downloading it from the
 Installing El-Get depends on a working `install-info` command, please make
 sure you have one in your `PATH`. In `debian`, it's available in the
 [install-info debian package](http://packages.debian.org/squeeze/install-info). The
-[MacOSX install-info](http://developer.apple.com/library/mac/#DOCUMENTATION/Darwin/Reference/ManPages/man1/install-info.1.html)
+[MacOSX brew install-info](https://formulae.brew.sh/formula/texinfo)
 version works fine with El-Get.
 
 When using the *windows* operating system, take into account that the way

recipes/ecb.rcp

@@ -1,6 +1,7 @@
 (:name ecb
        :description "Emacs Code Browser"
        :type github
-       :pkgname "alexott/ecb"
+       :pkgname "ecb-org/ecb"
        :depends (cedet)
+       :minimum-emacs-version "29"
        :build `(("make" "CEDET=../cedet" ,(concat "EMACS=" (shell-quote-argument el-get-emacs)))))

recipes/mu4e.rcp

@@ -12,6 +12,8 @@
                           (el-get-package-directory 'mu4e))))
        :build `(("./autogen.sh")
                 ("make"))
+       :build/berkeley-unix `(("./autogen.sh")
+                              ("gmake"))
        :load-path "build/mu4e"
        :info "build/mu4e/mu4e.info"
        )

recipes/ws-butler.rcp

@@ -1,5 +1,4 @@
 (:name ws-butler
-       :description "Unobtrusively trim extraneous white-space *ONLY* in lines edited.
-"
-       :type github
-       :pkgname "lewang/ws-butler")
+       :description "Unobtrusively trim extraneous white-space *ONLY* in lines edited."
+       :type elpa
+       :repo ("nongnu" . "https://elpa.nongnu.org/nongnu/"))

test/el-get-tests.el

@@ -1,6 +1,8 @@
 (require 'el-get)
 (require 'ert nil t)
 
+(el-get-register-method-alias :test :builtin)
+
 (eval-when-compile
   (require 'cl-lib)
   (unless (featurep 'ert)
@@ -35,6 +37,7 @@ error.
 Following variables are bound to temporal values:
 * `user-emacs-directory'
 * `package-user-dir'
+* `load-path'
 * `el-get-dir'
 * `el-get-status-file'
 * `el-get-status-cache'
@@ -43,6 +46,7 @@ Following variables are bound to temporal values:
   `(let* ((user-emacs-directory
            (make-temp-file "emacs.d.el-get-testing" 'dir "/"))
           (package-user-dir (locate-user-emacs-file "elpa"))
+          (load-path load-path)
           (el-get-dir (mapconcat #'file-name-as-directory
                                  `(,user-emacs-directory "el-get") ""))
           (el-get-status-file (concat el-get-dir ".status.el"))
@@ -128,6 +132,71 @@ Following variables are bound to temporal values:
                                             el-get-test-files-dir))
      (el-get 'sync (mapcar 'el-get-source-name el-get-sources)))))
 
+(ert-deftest el-get-update-load-path ()
+  "Check the `load-path' is updated."
+  (el-get-with-temp-home
+   (let* ((recipe-a (list :name 'a :type 'test :compile nil
+                          :non-updatable 1
+                          :build '(progn (make-directory "test-load-path1" t) nil)
+                          :load-path "test-load-path1"))
+          (el-get-sources (list recipe-a))
+          (el-get-default-process-sync t))
+     (el-get 'sync 'a)
+     (should (member (expand-file-name
+                      "test-load-path1" (el-get-package-directory 'a))
+                     load-path))
+     (plist-put recipe-a :load-path "test-load-path2")
+     (plist-put recipe-a :build '(progn (make-directory "test-load-path2" t) nil))
+     (el-get-update 'a)
+     (should (member (expand-file-name
+                      "test-load-path2" (el-get-package-directory 'a))
+                     load-path))
+     (plist-put recipe-a :load-path "test-load-path3")
+     (plist-put recipe-a :non-updatable 3) ; Needs reinstall to change.
+     (plist-put recipe-a :build '(progn (make-directory "test-load-path3" t) nil))
+     (el-get-update 'a)
+     (should (member (expand-file-name
+                      "test-load-path3" (el-get-package-directory 'a))
+                     load-path)))))
+
+(ert-deftest el-get-update-rcp-file-load-path ()
+  "Check the `load-path' is updated."
+  :expected-result :failed
+  (el-get-with-temp-home
+   (let* ((rcpdir (expand-file-name "~/.emacs.d/el-get-user-recipes/"))
+          (el-get-recipe-path (cons rcpdir el-get-recipe-path))
+          (recipe-a (list :name 'a :type 'test :compile nil
+                          :non-updatable 1
+                          :build '(progn (make-directory "test-load-path1" t) nil)
+                          :load-path "test-load-path1"))
+          (el-get-default-process-sync t))
+     (make-directory rcpdir t)
+     (with-temp-file (expand-file-name "a.rcp" rcpdir)
+       (pp recipe-a (current-buffer)))
+     (el-get 'sync 'a)
+     (should (member (expand-file-name
+                      "test-load-path1" (el-get-package-directory 'a))
+                     load-path))
+
+     (plist-put recipe-a :load-path "test-load-path2")
+     (plist-put recipe-a :build '(progn (make-directory "test-load-path2" t) nil))
+     (with-temp-file (expand-file-name "a.rcp" rcpdir)
+       (pp recipe-a (current-buffer)))
+     (el-get-update 'a)
+     (should (member (expand-file-name
+                      "test-load-path2" (el-get-package-directory 'a))
+                     load-path))
+
+     (plist-put recipe-a :load-path "test-load-path3")
+     (plist-put recipe-a :non-updatable 3) ; Needs reinstall to change.
+     (plist-put recipe-a :build '(progn (make-directory "test-load-path3" t) nil))
+     (with-temp-file (expand-file-name "a.rcp" rcpdir)
+       (pp recipe-a (current-buffer)))
+     (el-get-update 'a)
+     (should (member (expand-file-name
+                      "test-load-path3" (el-get-package-directory 'a))
+                     load-path)))))
+
 (ert-deftest el-get-elpa-feature ()
   "`:features' option should work for ELPA type recipe."
   :expected-result :failed