Skip to content

Commit

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

Merge development to main 20240922_150850
  • Loading branch information
kickingvegas authored Sep 22, 2024
2 parents 29a8f3e + eb3de18 commit 8a62af5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
12 changes: 10 additions & 2 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ An umbrella package to support a single installation point for all Casual user i
- [[https://github.com/kickingvegas/casual-bookmarks][Casual Bookmarks]] - a Transient user interface for the bookmark list.
- [[https://github.com/kickingvegas/casual-agenda][Casual Agenda]] - a Transient user interface for Org Agenda.
- [[https://github.com/kickingvegas/casual-avy][Casual Avy]] - a Transient user interface for Avy.
- [[https://github.com/kickingvegas/casual-symbol-overlay][Casual Symbol Overlay]] - a Transient user interface for Symbol Overlay.
- [[https://github.com/kickingvegas/casual-symbol-overlay][Casual Symbol Overlay]] - a Transient user interface for Symbol Overlay.
- [[https://github.com/kickingvegas/casual-editkit][Casual EditKit]] - a Transient user interface library for Emacs editing commands.


* Requirements
Casual Suite requires usage of
Expand All @@ -39,7 +41,8 @@ It is highly recommended that a deep reading of the install procedure for each u
- [[https://github.com/kickingvegas/casual-bookmarks?tab=readme-ov-file#install][Casual Bookmarks]]
- [[https://github.com/kickingvegas/casual-agenda?tab=readme-ov-file#install][Casual Agenda]]
- [[https://github.com/kickingvegas/casual-avy?tab=readme-ov-file#install][Casual Avy]]
- [[https://github.com/kickingvegas/casual-symbol-overlay?tab=readme-ov-file#install][Casual Symbol Overlay]]
- [[https://github.com/kickingvegas/casual-symbol-overlay?tab=readme-ov-file#install][Casual Symbol Overlay]]
- [[https://github.com/kickingvegas/casual-editkit?tab=readme-ov-file#install][Casual EditKit]]

** A Note on Package Dependencies
Casual Suite requires Casual Lib which in turn requires a recent installation of Transient 0.6.0+ from either [[https://elpa.gnu.org/packages/transient.html][ELPA]] or [[https://melpa.org/#/transient][MELPA]]. As an older version of Transient is built-in to the Emacs release, the package manager ~package.el~ will /not/ update this package unless the customizable variable ~package-install-upgrade-built-in~ is set to ~t~. Set this variable and proceed with installing Casual Suite. Alternately invoking ~package-install~ with a prefix (~C-u~) will temporarily coerce the update of the built-in package. (example: ~C-u M-x package-install~ ~casual-suite~)
Expand Down Expand Up @@ -67,6 +70,7 @@ The following lines illustrate an installation of the Casual Suite with no custo
(keymap-set org-agenda-mode-map "C-o" #'casual-agenda-tmenu)
(keymap-global-set "M-g" #'casual-avy-tmenu)
(keymap-set symbol-overlay-map "C-o" #'casual-symbol-overlay-tmenu)
(keymap-global-set "C-o" #'casual-editkit-main-tmenu)
#+end_src

For users who prefer ~use-package~, it is highly recommended that ~casual-suite~ be installed via ~package.el~ or some equivalent package manager and /not/ through ~use-package~. As ~casual-suite~ is an umbrella install package, installing it with ~:ensure t~ alongside individual configurations of the Casual user interfaces that also install using ~:ensure t~ can lead to undesired order-dependent behavior.
Expand Down Expand Up @@ -141,6 +145,10 @@ The following minimal configuration code using ~use-package~ for configuring eac
("C-o" . casual-agenda-tmenu)
("M-j" . org-agenda-clock-goto) ; optional
("J" . bookmark-jump))) ; optional

(use-package casual-editkit
:ensure nil
:bind (("C-o" . casual-editkit-main-tmenu)))
#+end_src

* Sponsorship
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.6.0"
(defconst casual-suite-version "1.7.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 <kickingvegas@gmail.com>
;; URL: https://github.com/kickingvegas/casual-suite
;; Keywords: tools
;; Version: 1.6.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") (casual-agenda "1.0.1") (casual-symbol-overlay "1.0.1"))
;; Version: 1.7.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") (casual-agenda "1.0.1") (casual-symbol-overlay "1.0.1") (casual-editkit "1.0.5"))

;; 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 Down Expand Up @@ -36,6 +36,7 @@
;; - Org Agenda (casual-agenda)
;; - Avy (casual-avy)
;; - Symbol Overlay (casual-symbol-overlay)
;; - EditKit (casual-editkit)

;; INSTALLATION

Expand All @@ -59,6 +60,7 @@
;; (keymap-set bookmark-bmenu-mode-map "C-o" #'casual-bookmarks-tmenu)
;; (keymap-set org-agenda-mode-map "C-o" #'casual-agenda-tmenu)
;; (keymap-set symbol-overlay-map "C-o" #'casual-symbol-overlay-tmenu)
;; (keymap-global-set "C-o" #'casual-editkit-main-tmenu)

;; NOTE: This package requires `casual-lib' which in turn requires an update of
;; the built-in package `transient' ≥ 0.6.0. Please customize the variable
Expand All @@ -78,6 +80,7 @@
(require 'casual-bookmarks)
(require 'casual-agenda)
(require 'casual-symbol-overlay)
(require 'casual-editkit)

(defun casual-suite-about-suite ()
"Casual Suite is a collection of all Casual user interfaces.
Expand All @@ -95,6 +98,7 @@ Included are user interfaces for the following packages:
- Org Agenda (casual-agenda)
- Avy (casual-avy)
- Symbol Overlay (casual-symbol-overlay)
- EditKit (casual-editkit)
Learn more about using Casual Suite at our discussion group on GitHub.
Any questions or comments about it should be made there.
Expand Down

0 comments on commit 8a62af5

Please sign in to comment.