diff --git a/lisp/consult-jinx.el b/lisp/consult-jinx.el deleted file mode 100644 index d156cac..0000000 --- a/lisp/consult-jinx.el +++ /dev/null @@ -1,81 +0,0 @@ -;;; consult-jinx.el --- Jinx configuration with consult-jinx -*- lexical-binding: t -*- - -;;; Commentary: -;; Jinx spell-checker configuration with consult-jinx menu - -;;; Code: - -(require 'jinx) -(require 'consult) - -(defvar consult-jinx--narrow - '((?m . "Misspelled")) - "Narrow keys for consult-jinx.") - -(defface consult-jinx-line-number-prefix - '((t :inherit line-number)) - "Face used for line numbers of misspellings from current line onwards.") - -(defface consult-jinx-line-number-wrapped - '((t :inherit consult-jinx-line-number-prefix :inherit warning :weight normal)) - "Face used for line numbers of misspellings before current line.") - -(defun consult-jinx--candidates () - "Return jinx misspellings as candidates list for consult." - (consult--forbid-minibuffer) - (unless jinx-mode - (user-error "Jinx mode not enabled in current buffer")) - (let* ((curr-line (line-number-at-pos (point))) - (overlays (jinx--force-overlays (point-min) (point-max) :check t)) - default-cand candidates) - (unless overlays - (user-error "No misspellings")) - (let* ((line-width (length (number-to-string (line-number-at-pos (point-max))))) - (word-width (apply #'max (mapcar - (lambda (ov) - (- (overlay-end ov) (overlay-start ov))) - overlays)))) - (dolist (ov overlays) - (let* ((start (overlay-start ov)) - (end (overlay-end ov)) - (line (line-number-at-pos start)) - (word (buffer-substring-no-properties start end)) - (line-str (propertize (format (format "%%%dd" line-width) line) - 'face (if (< line curr-line) - 'consult-jinx-line-number-wrapped - 'consult-jinx-line-number-prefix)))) - (push (propertize - (format (format "%%s %%-%ds" word-width) - line-str - (propertize word 'face 'error)) - 'consult--candidate (list (set-marker (make-marker) start) (cons 0 (- end start))) - 'consult--type ?m) - candidates) - (when (and (not default-cand) (>= line curr-line)) - (setq default-cand candidates))))) - (nreverse - (if default-cand - (let ((before (cdr default-cand))) - (setcdr default-cand nil) - (nconc before candidates)) - candidates)))) - -;;;###autoload -(defun consult-jinx () - "Jump to a jinx misspelled word." - (interactive) - (consult--read - (consult--with-increased-gc (consult-jinx--candidates)) - :prompt "Jinx misspelling: " - :category 'consult-jinx-misspelling - :history t - :require-match t - :sort nil - :narrow (consult--type-narrow consult-jinx--narrow) - :group (consult--type-group consult-jinx--narrow) - :lookup #'consult--lookup-candidate - :state (consult--jump-state))) - -(provide 'consult-jinx) - -;;; consult-jinx.el ends here diff --git a/lisp/fix-theme-colors.el b/lisp/fix-theme-colors.el deleted file mode 100644 index 028cb37..0000000 --- a/lisp/fix-theme-colors.el +++ /dev/null @@ -1,241 +0,0 @@ -#!/usr/bin/env emacs --script -;;; fix-theme-colors.el --- Fix invalid color names and properties in Emacs themes - -;; This scipt is AI generated. -;; This script fixes common issues in color-theme files: -;; 1. Space-separated color names (e.g., "deep sky blue" -> "DeepSkyBlue") -;; 2. Invalid color names (e.g., "PaleYellow" -> "LightYellow") -;; 3. Negative line-width values in :box properties -;; 4. Removes compiled .elc files to force reload of fixed sources - -(require 'cl-lib) - -(defvar theme-fixes-space - '(("deep sky blue" . "DeepSkyBlue") - ("spring green" . "SpringGreen") - ("light blue" . "LightBlue") - ("lime green" . "LimeGreen") - ("dark green" . "DarkGreen") - ("dim gray" . "DimGray") - ("forest green" . "ForestGreen") - ("light gray" . "LightGray") - ("light pink" . "LightPink") - ("medium purple" . "MediumPurple") - ("pale green" . "PaleGreen") - ("medium aquamarine" . "MediumAquamarine") - ("powder blue" . "PowderBlue") - ("dark olive green" . "DarkOliveGreen") - ("dark slate blue" . "DarkSlateBlue") - ("dark slate grey" . "DarkSlateGrey") - ("dark turquoise" . "DarkTurquoise") - ("dark violet" . "DarkViolet") - ("deep pink" . "DeepPink") - ("dodger blue" . "DodgerBlue") - ("floral white" . "FloralWhite") - ("ghost white" . "GhostWhite") - ("green yellow" . "GreenYellow") - ("hot pink" . "HotPink") - ("indian red" . "IndianRed") - ("lavender blush" . "LavenderBlush") - ("lawn green" . "LawnGreen") - ("lemon chiffon" . "LemonChiffon") - ("light coral" . "LightCoral") - ("light cyan" . "LightCyan") - ("light goldenrod" . "LightGoldenrod") - ("light goldenrod yellow" . "LightGoldenrodYellow") - ("light salmon" . "LightSalmon") - ("light sea green" . "LightSeaGreen") - ("light sky blue" . "LightSkyBlue") - ("light slate blue" . "LightSlateBlue") - ("light slate gray" . "LightSlateGray") - ("light steel blue" . "LightSteelBlue") - ("light yellow" . "LightYellow") - ("medium blue" . "MediumBlue") - ("medium orchid" . "MediumOrchid") - ("medium sea green" . "MediumSeaGreen") - ("medium slate blue" . "MediumSlateBlue") - ("medium spring green" . "MediumSpringGreen") - ("medium turquoise" . "MediumTurquoise") - ("medium violet red" . "MediumVioletRed") - ("midnight blue" . "MidnightBlue") - ("mint cream" . "MintCream") - ("misty rose" . "MistyRose") - ("navajo white" . "NavajoWhite") - ("navy blue" . "NavyBlue") - ("old lace" . "OldLace") - ("olive drab" . "OliveDrab") - ("orange red" . "OrangeRed") - ("pale goldenrod" . "PaleGoldenrod") - ("pale turquoise" . "PaleTurquoise") - ("pale violet red" . "PaleVioletRed") - ("papaya whip" . "PapayaWhip") - ("peach puff" . "PeachPuff") - ("rosy brown" . "RosyBrown") - ("royal blue" . "RoyalBlue") - ("saddle brown" . "SaddleBrown") - ("sandy brown" . "SandyBrown") - ("sea green" . "SeaGreen") - ("sky blue" . "SkyBlue") - ("slate blue" . "SlateBlue") - ("slate gray" . "SlateGray") - ("spring green" . "SpringGreen") - ("steel blue" . "SteelBlue") - ("white smoke" . "WhiteSmoke") - ("yellow green" . "YellowGreen") - ("antique white" . "AntiqueWhite") - ("blanched almond" . "BlanchedAlmond") - ("blue violet" . "BlueViolet") - ("burlywood" . "Burlywood") - ("cadet blue" . "CadetBlue") - ("chartreuse" . "Chartreuse") - ("chocolate" . "Chocolate") - ("cornflower blue" . "CornflowerBlue") - ("cornsilk" . "Cornsilk") - ("dark blue" . "DarkBlue") - ("dark cyan" . "DarkCyan") - ("dark goldenrod" . "DarkGoldenrod") - ("dark gray" . "DarkGray") - ("dark grey" . "DarkGrey") - ("dark khaki" . "DarkKhaki") - ("dark magenta" . "DarkMagenta") - ("dark orange" . "DarkOrange") - ("dark orchid" . "DarkOrchid") - ("dark red" . "DarkRed") - ("dark salmon" . "DarkSalmon") - ("dark sea green" . "DarkSeaGreen")) - "Mapping of space-separated color names to CamelCase.") - -(defvar theme-fixes-invalid - '(("PaleYellow" . "LightYellow") - ("Blue-Eshell" . "DeepSkyBlue")) - "Mapping of invalid color names to valid alternatives.") - -(defvar theme-fixes-box - '((":style none" . ":style nil") - (":line-width -1" . ":line-width 1")) - "Fixes for invalid :box properties.") - -(defvar theme-fixes-box-family - '((":family \"helv\"" . "") - (":family \"outline-lucida console\"" . "")) - "Remove invalid :family property inside :box.") - -(defun fix-theme-file (filepath) - "Fix all issues in a single theme file." - (message "Processing: %s" filepath) - (let ((content (with-temp-buffer - (insert-file-contents filepath) - (buffer-string))) - (changes 0)) - - ;; Fix space-separated colors - (dolist (fix theme-fixes-space) - (let ((old-color (car fix)) - (new-color (cdr fix)) - (case-fold-search nil)) - (when (string-match (regexp-quote (format "\"%s\"" old-color)) content) - (setq content (replace-regexp-in-string - (regexp-quote (format "\"%s\"" old-color)) - (format "\"%s\"" new-color) - content)) - (setq changes (1+ changes))))) - - ;; Fix invalid colors - (dolist (fix theme-fixes-invalid) - (let ((old-color (car fix)) - (new-color (cdr fix)) - (case-fold-search nil)) - (when (string-match (regexp-quote (format "\"%s\"" old-color)) content) - (setq content (replace-regexp-in-string - (regexp-quote (format "\"%s\"" old-color)) - (format "\"%s\"" new-color) - content)) - (setq changes (1+ changes))))) - - ;; Fix :box properties - (dolist (fix theme-fixes-box) - (let ((old-prop (car fix)) - (new-prop (cdr fix))) - (when (string-match (regexp-quote old-prop) content) - (setq content (replace-regexp-in-string - (regexp-quote old-prop) - new-prop - content)) - (setq changes (1+ changes))))) - - ;; Fix :family inside :box (invalid property) - (dolist (fix theme-fixes-box-family) - (let ((old-prop (car fix)) - (new-prop (cdr fix))) - (when (string-match (regexp-quote old-prop) content) - (setq content (replace-regexp-in-string - (regexp-quote old-prop) - new-prop - content)) - (setq changes (1+ changes))))) - - (with-temp-file filepath - (insert content)) - (message " Fixed %d issue(s)" changes) - changes)) - -(defun fix-all-themes (themes-dir) - "Fix all theme files in THEMES-DIR." - (let ((theme-files (directory-files themes-dir t "\\-theme\\.el$")) - (total-changes 0)) - (dolist (file theme-files) - (setq total-changes (+ total-changes (fix-theme-file file)))) - (message "\nTotal issues fixed across all themes: %d" total-changes))) - -(defun remove-compiled-themes (build-dir) - "Remove all compiled .elc theme files to force reload of sources." - (let ((elc-files (directory-files build-dir t "\\-theme\\.elc$")) - (count 0)) - (dolist (file elc-files) - (delete-file file) - (setq count (1+ count))) - (message "Removed %d compiled theme files (.elc)" count))) - -;;;###autoload -(defun fix-theme-colors () - "Fix invalid color names and properties in Emacs themes. -This function can be called interactively or from Lisp." - (interactive) - (let* ((themes-dir (expand-file-name "~/.emacs.d/straight/repos/replace-colorthemes/")) - (build-dir (expand-file-name "~/.emacs.d/straight/build/color-theme-modern/"))) - - (message "=== Fixing theme files ===\n") - - ;; Fix source files - (if (file-directory-p themes-dir) - (progn - (message "Processing source files in: %s" themes-dir) - (fix-all-themes themes-dir)) - (message "WARNING: Source themes directory not found: %s" themes-dir)) - - (message "\n") - - ;; Fix build files (these are what Emacs actually loads) - (if (file-directory-p build-dir) - (progn - (message "Processing build files in: %s" build-dir) - (fix-all-themes build-dir) - (remove-compiled-themes build-dir)) - (message "WARNING: Build themes directory not found: %s" build-dir)) - - (message "\n=== Done! ===") - (message "Restart Emacs to load fixed themes."))) - -;; When run as a script (--script), execute the function -(when noninteractive - (fix-theme-colors)) - -;;;###autoload -(defun fix-theme-colors-add-to-load-path () - "Add the directory containing this file to load-path." - (interactive) - (add-to-list 'load-path (file-name-directory load-file-name)) - (message "Added %s to load-path" (file-name-directory load-file-name))) - -(provide 'fix-theme-colors) -;;; fix-theme-colors.el ends here diff --git a/lisp/init-package.el b/lisp/init-package.el index 7843446..4fce504 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -57,9 +57,8 @@ (modify-syntax-entry (+ start i) "_" jinx--syntax-table)))))) (use-package consult-jinx - :after jinx - :demand t - :straight nil)) + :straight + (:host github :repo "Andsy10/consult-jinx"))) ;; eat，终端 (unless *is-windows*