Skip to content

Commit

Permalink
Merge pull request #26 from kickingvegas/merge-development-to-main-20…
Browse files Browse the repository at this point in the history
…240728_200918

Merge development to main 20240728_200918
  • Loading branch information
kickingvegas authored Jul 29, 2024
2 parents d722632 + 25d0209 commit 111e67a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 8 deletions.
17 changes: 13 additions & 4 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ An umbrella package to support a single installation point for all Casual porcel
- [[https://github.com/kickingvegas/casual-info][Casual Info]] - a Transient porcelain for Info.
- [[https://github.com/kickingvegas/casual-calc][Casual Calc]] - a Transient porcelain for Calc.
- [[https://github.com/kickingvegas/casual-ibuffer][Casual IBuffer]] - a Transient porcelain for IBuffer.
- [[https://github.com/kickingvegas/casual-re-builder][Casual RE-Builder]] - a Transient porcelain for RE-Builder.
- [[https://github.com/kickingvegas/casual-re-builder][Casual RE-Builder]] - a Transient porcelain for RE-Builder.
- [[https://github.com/kickingvegas/casual-bookmarks][Casual Bookmarks]] - a Transient porcelain for the bookmark list.
- [[https://github.com/kickingvegas/casual-avy][Casual Avy]] - a Transient porcelain for Avy.

* Requirements
Expand All @@ -26,8 +27,9 @@ It is highly recommended that a deep reading of the install procedure for each p
- [[https://github.com/kickingvegas/casual-info?tab=readme-ov-file#install][Casual Info]]
- [[https://github.com/kickingvegas/casual-calc?tab=readme-ov-file#install][Casual Calc]]
- [[https://github.com/kickingvegas/casual-ibuffer?tab=readme-ov-file#install][Casual IBuffer]]
- [[https://github.com/kickingvegas/casual-re-builder?tab=readme-ov-file#install][Casual RE-Builder]]
- [[https://github.com/kickingvegas/casual-avy?tab=readme-ov-file#install][Casual Avy]]
- [[https://github.com/kickingvegas/casual-re-builder?tab=readme-ov-file#install][Casual RE-Builder]]
- [[https://github.com/kickingvegas/casual-bookmarks?tab=readme-ov-file#install][Casual Bookmarks]]
- [[https://github.com/kickingvegas/casual-avy?tab=readme-ov-file#install][Casual Avy]]

** TL;DR
Impatient readers can use the following code to put into their Emacs initialization file to immediately use Casual Suite.
Expand All @@ -45,6 +47,7 @@ The following lines illustrate an installation of the Casual Suite with no custo
(keymap-set Info-mode-map "C-o" #'casual-info-tmenu)
(keymap-set reb-mode-map "C-o" #'casual-re-builder-tmenu)
(keymap-set reb-lisp-mode-map "C-o" #'casual-re-builder-tmenu)
(keymap-set bookmark-bmenu-mode-map "C-o" #'casual-bookmarks-tmenu)
(keymap-global-set "M-g" #'casual-avy-tmenu)
#+end_src

Expand Down Expand Up @@ -85,6 +88,12 @@ For an alternate install using ~use-package~:
:ensure t
:bind (:map reb-mode-map
("C-o" . casual-re-builder-tmenu)))

(require 'bookmarks)
(use-package casual-bookmarks
:ensure t
:bind (:map bookmark-bmenu-mode-map
("C-o" . casual-bookmarks-tmenu)))
#+end_src

* Sponsorship
Expand All @@ -93,4 +102,4 @@ If you enjoy using Casual Suite, consider making a modest financial contribution
[[https://www.buymeacoffee.com/kickingvegas][file:docs/images/default-yellow.png]]

* Acknowledgments
A heartfelt thanks to all the contributors to Calc, Dired, Info, I-Search, Info, IBuffer, RE-Builder, Avy, and [[https://github.com/magit/transient][Transient]]. Casual Suite would not be possible without your efforts.
A heartfelt thanks to all the contributors to Calc, Dired, Info, I-Search, Info, IBuffer, RE-Builder, Bookmarks, Avy, and [[https://github.com/magit/transient][Transient]]. Casual Suite would not be possible without your efforts.
4 changes: 3 additions & 1 deletion lisp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ EMACS_CONFIG_DIR=$(HOME)/.config/emacs
AVY_DIR=$(EMACS_CONFIG_DIR)/elpa/avy-20230420.404
EMACS_ELPA_DIR=$(EMACS_CONFIG_DIR)/elpa
PACKAGE_PATHS=-L $(AVY_DIR) \
-L $(EMACS_ELPA_DIR)/compat-29.1.4.5 \
-L $(EMACS_ELPA_DIR)/compat-30.0.0.0 \
-L $(EMACS_ELPA_DIR)/seq-2.24 \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(CASUAL_LIB_LISP_DIR) \
Expand All @@ -46,6 +46,8 @@ PACKAGE_PATHS=-L $(AVY_DIR) \
-L $(CASUAL_BASE_DIR)/casual-info/lisp \
-L $(CASUAL_BASE_DIR)/casual-dired/lisp \
-L $(CASUAL_BASE_DIR)/casual-ibuffer/lisp \
-L $(CASUAL_BASE_DIR)/casual-re-builder/lisp \
-L $(CASUAL_BASE_DIR)/casual-bookmarks/lisp \
-L $(CASUAL_BASE_DIR)/casual-isearch

.PHONY: tests compile regression
Expand Down
2 changes: 1 addition & 1 deletion lisp/casual-suite-version.el
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

;;; Code:

(defconst casual-suite-version "1.3.0"
(defconst casual-suite-version "1.4.0"
"Casual Suite Version.")

(defun casual-suite-version ()
Expand Down
8 changes: 6 additions & 2 deletions lisp/casual-suite.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
;; Author: Charles Choi <[email protected]>
;; URL: https://github.com/kickingvegas/casual-suite
;; Keywords: tools
;; Version: 1.3.0
;; Package-Requires: ((emacs "29.1") (casual-calc "1.9.0") (casual-isearch "1.7.0") (casual-dired "1.4.0") (casual-ibuffer "1.0.1") (casual-avy "1.2.0") (casual-info "1.2.0") (casual-re-builder "1.0.2"))
;; Version: 1.4.0
;; Package-Requires: ((emacs "29.1") (casual-calc "1.9.0") (casual-isearch "1.7.0") (casual-dired "1.4.0") (casual-ibuffer "1.0.1") (casual-avy "1.2.0") (casual-info "1.2.0") (casual-re-builder "1.0.2") (casual-bookmarks "1.0.0"))

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
Expand All @@ -26,6 +26,7 @@
;; An umbrella package to support a single installation point for all Casual
;; porcelains. Included are porcelains for the following packages:

;; - Bookmarks (casual-bookmarks)
;; - Calc (casual-calc)
;; - Dired (casual-dired)
;; - I-Search (casual-isearch)
Expand Down Expand Up @@ -53,6 +54,7 @@
;; (keymap-global-set "M-g" #'casual-avy-tmenu)
;; (keymap-set reb-mode-map "C-o" #'casual-re-builder-tmenu)
;; (keymap-set reb-lisp-mode-map "C-o" #'casual-re-builder-tmenu)
;; (keymap-set bookmark-bmenu-mode-map "C-o" #'casual-bookmarks-tmenu)

;;; Code:

Expand All @@ -63,13 +65,15 @@
(require 'casual-info)
(require 'casual-re-builder)
(require 'casual-avy)
(require 'casual-bookmarks)

(defun casual-suite-about-suite ()
"Casual Suite is a collection of all Casual porcelains.
This is an umbrella package that collects all the Casual packages.
Included are porcelains for the following packages:
- Bookmarks (casual-bookmarks)
- Calc (casual-calc)
- Dired (casual-dired)
- I-Search (casual-isearch)
Expand Down

0 comments on commit 111e67a

Please sign in to comment.