From 2c425059773db12e08f5c163fddb0b19e4516403 Mon Sep 17 00:00:00 2001 From: Charles Choi Date: Sun, 8 Sep 2024 15:10:21 -0700 Subject: [PATCH 1/2] Add Casual Symbol Overlay - Add package casual-symbol-overlay --- README.org | 4 ++++ lisp/Makefile | 30 ++++++++++++++++-------------- lisp/casual-suite.el | 6 +++++- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/README.org b/README.org index fb33b6a..2a1a84c 100644 --- a/README.org +++ b/README.org @@ -12,11 +12,13 @@ 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. * Requirements Casual Suite requires usage of - Emacs ≥ 29.1 - Avy ≥ 0.5.0 +- Symbol Overlay ≥ 4.2 - Casual Lib ≥ 1.1.0 Casual Suite has been verified with the following configuration. @@ -37,6 +39,7 @@ 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]] ** 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~) @@ -63,6 +66,7 @@ The following lines illustrate an installation of the Casual Suite with no custo (keymap-set bookmark-bmenu-mode-map "C-o" #'casual-bookmarks-tmenu) (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) #+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. diff --git a/lisp/Makefile b/lisp/Makefile index 2714fba..9e1e0f1 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -36,20 +36,22 @@ CASUAL_LIB_TEST_INCLUDES=$(CASUAL_LIB_DIR)/tests/casual-lib-test-utils.el 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-30.0.0.0 \ --L $(EMACS_ELPA_DIR)/seq-2.24 \ --L $(EMACS_ELPA_DIR)/transient-current \ --L $(CASUAL_LIB_LISP_DIR) \ --L $(CASUAL_BASE_DIR)/casual-calc/lisp \ --L $(CASUAL_BASE_DIR)/casual-avy/lisp \ --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-agenda/lisp \ --L $(CASUAL_BASE_DIR)/casual-isearch/lisp +PACKAGE_PATHS=-L $(AVY_DIR) \ +-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) \ +-L $(EMACS_ELPA_DIR)/symbol-overlay-20240311.1207 \ +-L $(CASUAL_BASE_DIR)/casual-calc/lisp \ +-L $(CASUAL_BASE_DIR)/casual-avy/lisp \ +-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-agenda/lisp \ +-L $(CASUAL_BASE_DIR)/casual-isearch/lisp \ +-L $(CASUAL_BASE_DIR)/casual-symbol-overlay/lisp .PHONY: tests compile regression diff --git a/lisp/casual-suite.el b/lisp/casual-suite.el index 5fae2ef..b198183 100644 --- a/lisp/casual-suite.el +++ b/lisp/casual-suite.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/kickingvegas/casual-suite ;; Keywords: tools ;; Version: 1.5.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")) +;; 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")) ;; 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 @@ -35,6 +35,7 @@ ;; - RE-Builder (casual-re-builder) ;; - Org Agenda (casual-agenda) ;; - Avy (casual-avy) +;; - Symbol Overlay (casual-symbol-overlay) ;; INSTALLATION @@ -57,6 +58,7 @@ ;; (keymap-set reb-lisp-mode-map "C-o" #'casual-re-builder-tmenu) ;; (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) ;; 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 @@ -75,6 +77,7 @@ (require 'casual-avy) (require 'casual-bookmarks) (require 'casual-agenda) +(require 'casual-symbol-overlay) (defun casual-suite-about-suite () "Casual Suite is a collection of all Casual user interfaces. @@ -91,6 +94,7 @@ Included are user interfaces for the following packages: - RE-Builder (casual-re-builder) - Org Agenda (casual-agenda) - Avy (casual-avy) +- Symbol Overlay (casual-symbol-overlay) Learn more about using Casual Suite at our discussion group on GitHub. Any questions or comments about it should be made there. From 39115f960cfb98d41925ec01ffdfec29d25cac3b Mon Sep 17 00:00:00 2001 From: Charles Choi Date: Sun, 8 Sep 2024 15:21:11 -0700 Subject: [PATCH 2/2] Bump version to 1.6.0 --- lisp/casual-suite-version.el | 2 +- lisp/casual-suite.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/casual-suite-version.el b/lisp/casual-suite-version.el index ea14241..c24c3d3 100644 --- a/lisp/casual-suite-version.el +++ b/lisp/casual-suite-version.el @@ -22,7 +22,7 @@ ;;; Code: -(defconst casual-suite-version "1.5.0" +(defconst casual-suite-version "1.6.0" "Casual Suite Version.") (defun casual-suite-version () diff --git a/lisp/casual-suite.el b/lisp/casual-suite.el index b198183..673cf6d 100644 --- a/lisp/casual-suite.el +++ b/lisp/casual-suite.el @@ -5,7 +5,7 @@ ;; Author: Charles Choi ;; URL: https://github.com/kickingvegas/casual-suite ;; Keywords: tools -;; Version: 1.5.0 +;; 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")) ;; This program is free software; you can redistribute it and/or modify