Use 'esh-module-autoload' for Eshell modules' defgroups

This will let modules define their own, regular autoloads, independent
of the core Eshell machinery for defining modules.

* lisp/eshell/em-alias.el (em-alias):
* lisp/eshell/em-banner.el (em-banner):
* lisp/eshell/em-basic.el (em-basic):
* lisp/eshell/em-cmpl.el (em-cmpl):
* lisp/eshell/em-dirs.el (em-dirs):
* lisp/eshell/em-elecslash.el (em-elecslash):
* lisp/eshell/em-extpipe.el:
* lisp/eshell/em-glob.el (em-glob):
* lisp/eshell/em-hist.el (em-hist):
* lisp/eshell/em-ls.el (em-ls):
* lisp/eshell/em-pred.el (em-pred):
* lisp/eshell/em-prompt.el (em-prompt):
* lisp/eshell/em-rebind.el (em-rebind):
* lisp/eshell/em-script.el (em-script):
* lisp/eshell/em-smart.el (em-smart):
* lisp/eshell/em-term.el (em-term):
* lisp/eshell/em-tramp.el (em-tramp):
* lisp/eshell/em-unix.el (em-unix):
* lisp/eshell/em-xtra.el (em-xtra): Use 'esh-module-autoload'.

* lisp/eshell/esh-module.el ("esh-module-loaddefs"): Load this instead
of "esh-groups".

* .gitignore: Change esh-groups.el to esh-module-loaddefs.el

(cherry picked from commit 4c924a53334035dc4089b24174012b54c020631b)

diff --git a/.gitignore b/.gitignore
index 41505faee928b12e22d47df59cb88e0b9b60f755..ae27a2444fe9a8040ae5f01cf4c42611c4bc3d51 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -128,7 +128,7 @@ lisp/cedet/semantic/wisent/js-wy.el
 lisp/cedet/semantic/wisent/python-wy.el
 lisp/cedet/srecode/srt-wy.el
 lisp/cedet/semantic/grammar-wy.el
-lisp/eshell/esh-groups.el
+lisp/eshell/esh-module-loaddefs.el
 lisp/finder-inf.el
 lisp/leim/ja-dic/
 leim/small-ja-dic-option

diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 832e14418d06844f246836d1dc960a73f0500394..d12b382d885e79c24ff60f7222058d671c22cc24 100644 (file)
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -92,7 +92,7 @@
 
 (require 'esh-mode)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-alias nil
   "Command aliases allow for easy definition of alternate commands."
@@ -268,9 +268,4 @@ These are all the command aliases which begin with NAME."
                     (eshell-parse-command alias))))))))))
 
 (provide 'em-alias)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-alias.el ends here

diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index e6dcbb244751c909a6b20292bfdc87c3436fffef..626624c7bfe2ff6f371ab7f9fcf30b384861e231 100644 (file)
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -44,7 +44,7 @@
 (require 'esh-util)
 (require 'esh-mode)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-banner nil
   "This sample module displays a welcome banner at login.
@@ -82,9 +82,4 @@ This can be any sexp, and should end with at least two newlines."
       (eshell-interactive-print msg))))
 
 (provide 'em-banner)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-banner.el ends here

diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index 6ec53ef941263ad5fd0b9ee325cb09d2c980c444..82cddd7385f295dbe4bc3cb611a93490b8c6d6a3 100644 (file)
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -58,7 +58,7 @@
 (require 'esh-opt)
 (require 'esh-util)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-basic nil
   "The \"basic\" code provides a set of convenience functions which
@@ -225,9 +225,4 @@ are:
   (while (pcomplete-here '("error" "form" "process"))))
 
 (provide 'em-basic)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-basic.el ends here

diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 201beb5071d617d27d52a54b954dacfccf6543f1..4c79f7b187a85978fe8ccf8208f7095e6deaa91f 100644 (file)
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -76,7 +76,7 @@
 
 (eval-when-compile (require 'cl-lib))
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-cmpl nil
   "This module provides a programmable completion function bound to
@@ -518,9 +518,4 @@ to writing a completion function."
 (define-obsolete-function-alias 'eshell-pcomplete #'completion-at-point "27.1")
 
 (provide 'em-cmpl)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-cmpl.el ends here

diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 07063afc28638e56dcba82c9c2230df7210a1b12..a3d1a349540e32f3022b3d9362f88c55e39ff104 100644 (file)
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -47,7 +47,7 @@
 (require 'ring)
 (require 'esh-opt)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-dirs nil
   "Directory navigation involves changing directories, examining the
@@ -599,9 +599,4 @@ in the minibuffer:
                         'no-message))))))))
 
 (provide 'em-dirs)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-dirs.el ends here

diff --git a/lisp/eshell/em-elecslash.el b/lisp/eshell/em-elecslash.el
index 93eadcfe1ffc326d2931721fbeffb36e640ed4f0..60f2c6e4039ad2fcc2aa695798a365e65203d4a4 100644 (file)
--- a/lisp/eshell/em-elecslash.el
+++ b/lisp/eshell/em-elecslash.el
@@ -32,7 +32,7 @@
 (require 'esh-mode)
 
 ;; This makes us an option when customizing `eshell-modules-list'.
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-elecslash nil
   "Electric forward slash in remote Eshells.
@@ -108,9 +108,4 @@ insertion."
         (insert "/")))))
 
 (provide 'em-elecslash)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; esh-elecslash.el ends here

diff --git a/lisp/eshell/em-extpipe.el b/lisp/eshell/em-extpipe.el
index 057eead929743b68c1e5ad69e4d871087cb6d9df..4c92653a3a352609c4aecb18785798e076a15f2d 100644 (file)
--- a/lisp/eshell/em-extpipe.el
+++ b/lisp/eshell/em-extpipe.el
@@ -36,7 +36,7 @@
 
 (eval-when-compile (require 'files-x))
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-extpipe nil
   "Native shell pipelines.

diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 89a40151d003813bc93a31bfdf1a7c0508e470a8..36e4f90aed2c1d2a362b95c50d96a135ab361503 100644 (file)
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -53,7 +53,7 @@
 (require 'esh-module)
 (require 'esh-util)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-glob nil
   "This module provides extended globbing syntax, similar what is used
@@ -417,9 +417,4 @@ directories and files."
         (eshell-glob-entries rdir globs only-dirs)))))
 
 (provide 'em-glob)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-glob.el ends here

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 2749749bb93b8868e3c833e86b4a02db9083e630..8865cc745a332a5877ff9c9af408b7e8ed627946 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -60,7 +60,7 @@
 (require 'esh-opt)
 (require 'esh-mode)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-hist nil
   "This module provides command history management."
@@ -1067,9 +1067,4 @@ If N is negative, search backwards for the -Nth previous match."
   (remove-hook 'kill-emacs-hook 'eshell-save-some-history))
 
 (provide 'em-hist)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-hist.el ends here

diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 62ad7ff72a1c514412b9eeeee95038eb2d8bffbd..82d4b01393f7778250f2786bf45a33fe280fab3e 100644 (file)
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -32,7 +32,7 @@
 (require 'esh-proc)
 (require 'esh-cmd)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-ls nil
   "This module implements the \"ls\" utility fully in Lisp.
@@ -956,9 +956,4 @@ to use, and each member of which is the width of that column
   (eshell-ls-disable-in-dired))
 
 (provide 'em-ls)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-ls.el ends here

diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index c3997dc72c3ff8bc13a9c40f4772a57fa6843492..0be262641eaaf82911fd8e60f59340835ff25d84 100644 (file)
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -48,7 +48,7 @@
 
 (require 'esh-mode)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-pred nil
   "This module allows for predicates to be applied to globbing
@@ -576,9 +576,4 @@ If INVERT-P is non-nil, include only members not matching a regexp."
        lst))))
 
 (provide 'em-pred)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-pred.el ends here

diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 3662c1fa8950b6a6deaccdba42d481a15ddfd422..b6556d29544635361cbea9540a7b9e98ff022c8c 100644 (file)
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -29,7 +29,7 @@
 (require 'esh-mode)
 (require 'text-property-search)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-prompt nil
   "This module provides command prompts, and navigation between them,
@@ -231,9 +231,4 @@ first (see `move-beginning-of-line' for more information)."
     (move-beginning-of-line arg)))
 
 (provide 'em-prompt)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-prompt.el ends here

diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index c6ee1a329b6439cd37da1943906427ba022ab49a..aad65f66f412009a1098f0773ffa04be1b8fca69 100644 (file)
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -25,7 +25,7 @@
 
 (require 'esh-mode)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-rebind nil
   "This module allows for special keybindings that only take effect
@@ -250,9 +250,4 @@ input."
       (eshell-delete-backward-char (- arg)))))
 
 (provide 'em-rebind)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-rebind.el ends here

diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 066063c4cc298157d12db3c6fd94f5190030f46c..254a11ea1144ef205844f74dc0d600f88117c54e 100644 (file)
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -25,7 +25,7 @@
 
 (require 'esh-mode)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-script nil
   "This module allows for the execution of files containing Eshell
@@ -115,9 +115,4 @@ Comments begin with `#'."
 (put 'eshell/. 'eshell-no-numeric-conversions t)
 
 (provide 'em-script)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-script.el ends here

diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 91fe02e5545c1d40c90c2528542a536c54e97fc8..670b956476d934cadbe40c855a6537a089362772 100644 (file)
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -70,7 +70,7 @@
 
 (require 'esh-mode)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-smart nil
   "This module combines the facility of normal, modern shells with
@@ -303,9 +303,4 @@ and the end of the buffer are still visible."
   (remove-hook 'window-configuration-change-hook #'eshell-smart-scroll))
 
 (provide 'em-smart)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-smart.el ends here

diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 8f29e2d85090aeaf95b65462a1f51884d6d63d48..2f8c06a0baa0928f2ee601d4b8c146abbbe14d14 100644 (file)
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -36,7 +36,7 @@
 (require 'esh-ext)
 (require 'term)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-term nil
   "This module causes visual commands (e.g., `vi') to be executed by
@@ -330,9 +330,4 @@ the buffer."
 ;  (use-local-map term-old-mode-map))
 
 (provide 'em-term)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-term.el ends here

diff --git a/lisp/eshell/em-tramp.el b/lisp/eshell/em-tramp.el
index efb37225651272b5570137218b653e76f6dbc852..cfc8a47327e3644e09bde531f558468ea6b2490e 100644 (file)
--- a/lisp/eshell/em-tramp.el
+++ b/lisp/eshell/em-tramp.el
@@ -35,7 +35,7 @@
 
 ;; There are no items in this custom group, but eshell modules (ab)use
 ;; custom groups.
-;;;###autoload
+;;;###esh-module-autoload
 (progn
  (defgroup eshell-tramp nil
    "This module defines commands that use Tramp in a way that is
@@ -152,9 +152,4 @@ Execute a COMMAND as the superuser or another USER.")
 (put 'eshell/doas 'eshell-no-numeric-conversions t)
 
 (provide 'em-tramp)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-tramp.el ends here

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 855efa26033738374293dba19f35ff78f2df370c..7f976d226811e32b59e47e1942ebe1ab147eedad 100644 (file)
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -38,7 +38,7 @@
 (require 'esh-mode)
 (require 'pcomplete)
 
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-unix nil
   "This module defines many of the more common UNIX utilities as
@@ -1096,9 +1096,4 @@ Show wall-clock time elapsed during execution of COMMAND.")
 (define-obsolete-function-alias 'eshell-diff-quit #'ignore "30.1")
 
 (provide 'em-unix)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-unix.el ends here

diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index a62073e2183327092689c7b173028b505d77456e..0a032395fd308462f0fdd81f6265a5a00d197234 100644 (file)
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -28,7 +28,7 @@
 
 ;; There are no items in this custom group, but eshell modules (ab)use
 ;; custom groups.
-;;;###autoload
+;;;###esh-module-autoload
 (progn
 (defgroup eshell-xtra nil
   "This module defines some extra alias functions which are entirely
@@ -85,9 +85,4 @@ naturally accessible within Emacs."
 (defalias 'eshell/gf #'find-grep-dired)
 
 (provide 'em-xtra)
-
-;; Local Variables:
-;; generated-autoload-file: "esh-groups.el"
-;; End:
-
 ;;; em-xtra.el ends here

diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 88221638e16fa1465ca9533c611361da81f12e7d..db808f8597ad0696207d17321e3c4e08bc6bd0f9 100644 (file)
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -38,7 +38,7 @@ customizing the variable `eshell-modules-list'."
 ;; `eshell-modules-list'.  We use "(progn (defgroup ..." in each file
 ;; to force the autoloader into including the entire defgroup, rather
 ;; than an abbreviated version.
-(load "esh-groups" nil 'nomessage)
+(load "esh-module-loaddefs" nil 'nomessage)
 
 ;;; User Variables: