Fix definition of buffer-local complex

countvajhula · Jul 22, 2024 · 10e3157 · 10e3157
1 parent e038009
commit 10e3157
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 41 deletions.
diff --git a/rigpa-buffer-mode.el b/rigpa-buffer-mode.el
@@ -36,7 +36,6 @@
 (require 's)
 (require 'dynaring)
 (require 'buffer-ring)
-(require 'rigpa-local)
 
 (defconst rigpa-buffer-ring-name-prefix "rigpa-buffer-ring")
 

diff --git a/rigpa-local.el b/rigpa-local.el
diff --git a/rigpa-mode-mode.el b/rigpa-mode-mode.el
@@ -31,7 +31,6 @@
 (require 'chimera)
 (require 'rigpa-text-parsers)
 (require 'rigpa-meta)
-(require 'rigpa-local)
 
 (evil-define-state mode
   "Mode state."

diff --git a/rigpa-tower-mode.el b/rigpa-tower-mode.el
@@ -30,7 +30,6 @@
 (require 'hydra)
 (require 'rigpa-mode-mode)
 (require 'rigpa-types)
-(require 'rigpa-local)
 
 ;; make these buffer-local first before abstracting "state"
 (defvar rigpa--current-tower-index 0)

diff --git a/rigpa.el b/rigpa.el
@@ -47,7 +47,6 @@
 (require 'chimera)
 (require 'ht)
 (require 'rigpa-custom)
-(require 'rigpa-local)
 (require 'rigpa-char-mode)
 (require 'rigpa-word-mode)
 (require 'rigpa-line-mode)
@@ -368,7 +367,11 @@ and simply toggles whether the menu is visible or not."
          :default "meta-tower"
          :members (list rigpa-meta-tower-mode-tower)))
 
-  (defvar-local rigpa--complex rigpa-general-complex))
+  ;; the editing complex to use in a buffer
+  ;; by default this is general complex unless a more tailored one
+  ;; has been set (e.g. via major mode hook)
+  (setq rigpa--complex rigpa-general-complex)
+  (make-variable-buffer-local 'rigpa--complex))
 
 (defun rigpa--provide-editing-structures ()
   "Register editing structures so they're used in relevant major modes."