branch: externals/ergoemacs-mode commit 34c2099ab620acc52dfdc93191567eabb4d971e0 Author: Walter Landry <wlan...@caltech.edu> Commit: Walter Landry <wlan...@caltech.edu>
Remove ergoemacs-autoload --- ergoemacs-macros.el | 36 ------------------------------------ ergoemacs-themes.el | 20 -------------------- 2 files changed, 56 deletions(-) diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el index 2c13591..e50c1c9 100644 --- a/ergoemacs-macros.el +++ b/ergoemacs-macros.el @@ -439,42 +439,6 @@ on the definition: ,(when (plist-get (nth 0 kb) :ergoemacs-require) `(ergoemacs-require ',(intern (plist-get (nth 0 kb) :name))))))) -(defmacro ergoemacs-autoload (name &rest keys-and-body) - "Defines a required package named NAME. - -KEYS-AND-BODY will be processed by -`ergoemacs-theme-component--parse-keys-and-body'. - -The documentation of the supported keys are in -`ergoemacs-theme-component'. - -The NAME will be assumed to be the :package-name keyword. - -By default, this package also set the :ergoemacs-require to nil, -deferring the ergoemacs theme component until it is required by -the user by either `ergoemacs-require' or turning it on/off in an -ergoemacs-mode theme. To turn off this feature, you can -specify :ergoemacs-require t in the body of the -`ergoemacs-autoload' macro." - (declare (indent 2)) - (let ((kb (make-symbol "body-and-plist")) - (plist (make-symbol "plist")) - (body (make-symbol "body")) - (doc (make-symbol "doc"))) - (setq kb (ergoemacs-theme-component--parse-keys-and-body keys-and-body nil t) - plist (nth 0 kb) - body (nth 1 kb)) - (when (equal (car body) '()) - (setq body (cdr body))) - (setq doc (if (stringp (car body)) (pop body) (symbol-name name))) - (unless (plist-get plist :package-name) - (setq plist (plist-put plist :package-name name))) - (macroexpand-all - `(ergoemacs-theme-component ,name () - ,doc - ,@plist - ,@body)))) - (defvar ergoemacs-theme-components--modified-plist nil "Modified plist.") diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el index bdf8a48..9338770 100644 --- a/ergoemacs-themes.el +++ b/ergoemacs-themes.el @@ -1736,26 +1736,6 @@ "Switch major modes by clicking mode-name." (setq ergoemacs-swap-major-modes-when-clicking-major-mode-name t)) - -(ergoemacs-autoload multiple-cursors - "Multiple Cursors" - :bind (("M-*" mc/mark-next-like-this) - ("M-&" mc/edit-lines)) - :ensure t) - -(ergoemacs-autoload avy - "Avy" - :bind ("M-," 'avy-goto-word-or-subword-1) - :ensure t) - -(ergoemacs-autoload expand-region - "Expand Region" - :bind (("M-8" er/expand-region) - ("M-9" er/contract-region) - ("M-*". er/mark-inside-quotes)) - :ensure t) - - (ergoemacs-theme standard () "Standard Ergoemacs Theme" :components '(copy