From: Andreas Gerler Date: Wed, 21 May 2025 12:53:49 +0000 (+0200) Subject: update outliner-minor-faces X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=b03d9869aaca3ced351d5f8a3bc65dad96038946;p=emacsconfig.git update outliner-minor-faces --- diff --git a/elpa/outline-minor-faces-20241202.1859/outline-minor-faces-pkg.el b/elpa/outline-minor-faces-20241202.1859/outline-minor-faces-pkg.el deleted file mode 100644 index 462dacfc..00000000 --- a/elpa/outline-minor-faces-20241202.1859/outline-minor-faces-pkg.el +++ /dev/null @@ -1,11 +0,0 @@ -;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "outline-minor-faces" "20241202.1859" - "Highlight only section headings." - '((emacs "26.1") - (compat "30.0.0.0")) - :url "https://github.com/tarsius/outline-minor-faces" - :commit "41de0cd1633c610d5097ce3bf7d9dd18ca8371bf" - :revdesc "41de0cd1633c" - :keywords '("faces" "outlines") - :authors '(("Jonas Bernoulli" . "emacs.outline-minor-faces@jonas.bernoulli.dev")) - :maintainers '(("Jonas Bernoulli" . "emacs.outline-minor-faces@jonas.bernoulli.dev"))) diff --git a/elpa/outline-minor-faces-20241202.1859/outline-minor-faces.el b/elpa/outline-minor-faces-20241202.1859/outline-minor-faces.el deleted file mode 100644 index 9ac28b97..00000000 --- a/elpa/outline-minor-faces-20241202.1859/outline-minor-faces.el +++ /dev/null @@ -1,228 +0,0 @@ -;;; outline-minor-faces.el --- Highlight only section headings -*- lexical-binding:t -*- - -;; Copyright (C) 2018-2024 Jonas Bernoulli - -;; Author: Jonas Bernoulli -;; Homepage: https://github.com/tarsius/outline-minor-faces -;; Keywords: faces outlines - -;; Package-Version: 20241202.1859 -;; Package-Revision: 41de0cd1633c -;; Package-Requires: ((emacs "26.1") (compat "30.0.0.0")) - -;; SPDX-License-Identifier: GPL-3.0-or-later - -;; This file is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published -;; by the Free Software Foundation, either version 3 of the License, -;; or (at your option) any later version. -;; -;; This file is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this file. If not, see . - -;;; Commentary: - -;; This package teaches `outline-minor-mode' to highlight section -;; headings, *without* also highlighting top-level s-expressions. - -;; To highlight only section headings forgo setting the built-in -;; `outline-minor-mode-highlight' to `append', or another non-nil -;; value. Instead enable the equivalent feature provided by this -;; package: -;; -;; (use-package outline-minor-faces -;; :after outline -;; :config (add-hook 'outline-minor-mode-hook -;; #'outline-minor-faces-mode)) - -;; For non-lisp major modes the highlighting provided by this package -;; and by the built-in support is essentially the same, i.e., the first -;; lines of top-level expressions *are* highlighted. - -;; This package also defines separate faces for use in the minor mode. -;; These faces are what gave this package its name, but nowadays they -;; inherit from the built-in faces by default, and are preserved mostly -;; for historic reasons, i.e., to avoid having to rename this package. - -;; To further improve the appearance of collapsed sections, check out -;; the `backline' package. - -;;; Code: - -(require 'compat) -(require 'outline) - -(defface outline-minor-0 - `((((class color) (background light)) - ,@(and (>= emacs-major-version 27) '(:extend t)) - :weight bold - :background "light grey") - (((class color) (background dark)) - ,@(and (>= emacs-major-version 27) '(:extend t)) - :weight bold - :background "grey20")) - "Face that other `outline-minor-N' faces inherit from." - :group 'outlines) - -(defface outline-minor-1 - '((t (:inherit (outline-minor-0 outline-1)))) - "Level 1 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-2 - '((t (:inherit (outline-minor-0 outline-2)))) - "Level 2 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-3 - '((t (:inherit (outline-minor-0 outline-3)))) - "Level 3 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-4 - '((t (:inherit (outline-minor-0 outline-4)))) - "Level 4 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-5 - '((t (:inherit (outline-minor-0 outline-5)))) - "Level 5 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-6 - '((t (:inherit (outline-minor-0 outline-6)))) - "Level 6 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-7 - '((t (:inherit (outline-minor-0 outline-7)))) - "Level 7 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-8 - '((t (:inherit (outline-minor-0 outline-8)))) - "Level 8 headings in `outline-minor-mode'." - :group 'outlines) - -(defface outline-minor-file-local-prop-line - '((t (:inherit (font-lock-comment-face outline-minor-1) :weight normal))) - "Face used for file-local variables settings on the -*- line." - :group 'outlines) - -(defvar outline-minor-faces - [outline-minor-1 outline-minor-2 outline-minor-3 outline-minor-4 - outline-minor-5 outline-minor-6 outline-minor-7 outline-minor-8]) - -(defvar outline-minor-faces--lisp-modes - '(lisp-data-mode - lisp-mode - emacs-lisp-mode - clojure-mode - scheme-mode)) - -(defvar-local outline-minor-faces--top-level nil) - -(defvar-local outline-minor-faces-regexp nil - "Regular expression to match the complete line of a heading. -If this is nil, then a regular expression based on -`outline-regexp' is used. The value of that variable cannot -be used directly because it is only supposed to match the -beginning of a heading.") - -(defun outline-minor-faces--syntactic-matcher (regexp) - "Return a matcher that matches REGEXP only outside of strings. - -Returns REGEXP directly for modes where `font-lock-keywords-only' -is non-nil because Font Lock does not mark strings and comments -for those modes, and the matcher will not know what is/is not a -string." - (if font-lock-keywords-only - regexp - (lambda (limit) - (and (re-search-forward regexp limit t) - (not (nth 3 (syntax-ppss (match-beginning 0)))))))) - -(defvar outline-minor-faces--font-lock-keywords - '((eval . (list (outline-minor-faces--syntactic-matcher - (or outline-minor-faces-regexp - (concat - "^\\(?:" - (cond - ((not (apply #'derived-mode-p - outline-minor-faces--lisp-modes)) - outline-regexp) - ;; `emacs-lisp-mode' Emacs >= 29 - ((string-suffix-p "\\(autoload\\)\\)" outline-regexp) - ";;;\\(;* [^ \t\n]\\)") - ;; `emacs-lisp-mode' Emacs <= 28 - ((string-suffix-p "\|###autoload\\)\\|(" outline-regexp) - (concat (substring outline-regexp 0 -18) "\\)")) - ;; `scheme-mode' - ((string-suffix-p "\\|(...." outline-regexp) - (substring outline-regexp 0 -7)) - ;; `lisp-data-mode', `lisp-mode' et al. - ((string-suffix-p "\\|(" outline-regexp) - (substring outline-regexp 0 -3)) - (t outline-regexp)) - "\\).*\n?"))) - 0 '(outline-minor-faces--get-face) t)) - ("-\\*-.*-\\*-" 0 'outline-minor-file-local-prop-line t))) - -;;;###autoload -(define-minor-mode outline-minor-faces-mode - "Minor mode that adds heading faces for `outline-minor-mode'." - :lighter "" - (unless arg - ;; Toggle both modes together due to - ;; (add-hook 'outline-minor-mode-hook 'outline-minor-faces-mode). - (setq outline-minor-faces-mode outline-minor-mode)) - (if outline-minor-faces-mode - (font-lock-add-keywords nil outline-minor-faces--font-lock-keywords t) - (font-lock-remove-keywords nil outline-minor-faces--font-lock-keywords)) - (when font-lock-mode - (save-restriction - (widen) - (font-lock-flush) - (font-lock-ensure)))) - -(defun outline-minor-faces--get-face () - (save-excursion - (goto-char (match-beginning 0)) - (let* ((level (outline-minor-faces--level)) - (index (- level (outline-minor-faces--top-level)))) - (when (< index 0) - (setq outline-minor-faces--top-level nil) - (setq index (- level (outline-minor-faces--top-level)))) - (aref outline-minor-faces - (% index (length outline-minor-faces)))))) - -(defun outline-minor-faces--level () - (save-excursion - (and (if (bound-and-true-p outline-search-function) - (funcall outline-search-function nil nil nil t) - (beginning-of-line) - (looking-at outline-regexp)) - (funcall outline-level)))) - -(defun outline-minor-faces--top-level () - (or outline-minor-faces--top-level - (save-excursion - (save-restriction - (widen) - (goto-char (point-min)) - (let ((min (or (outline-minor-faces--level) 1000))) - (while (outline-next-heading) - (setq min (min min (outline-minor-faces--level)))) - (setq outline-minor-faces--top-level min)))))) - -;;; _ -(provide 'outline-minor-faces) -;; Local Variables: -;; indent-tabs-mode: nil -;; End: -;;; outline-minor-faces.el ends here diff --git a/elpa/outline-minor-faces-20250514.1243/outline-minor-faces-autoloads.el b/elpa/outline-minor-faces-20250514.1243/outline-minor-faces-autoloads.el new file mode 100644 index 00000000..b1b8d7f0 --- /dev/null +++ b/elpa/outline-minor-faces-20250514.1243/outline-minor-faces-autoloads.el @@ -0,0 +1,46 @@ +;;; outline-minor-faces-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + +;;; Code: + +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + + + +;;; Generated autoloads from outline-minor-faces.el + +(autoload 'outline-minor-faces-mode "outline-minor-faces" "\ +Minor mode that adds heading faces for `outline-minor-mode'. + +This is a minor mode. If called interactively, toggle the `Outline +minor-Faces mode' mode. If the prefix argument is positive, enable the +mode, and if it is zero or negative, disable the mode. + +If called from Lisp, toggle the mode if ARG is `toggle'. Enable the +mode if ARG is nil, omitted, or is a positive number. Disable the mode +if ARG is a negative number. + +To check whether the minor mode is enabled in the current buffer, +evaluate the variable `outline-minor-faces-mode'. + +The mode's hook is called both when the mode is enabled and when it is +disabled. + +(fn &optional ARG)" t) +(register-definition-prefixes "outline-minor-faces" '("outline-minor-faces")) + +;;; End of scraped data + +(provide 'outline-minor-faces-autoloads) + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; no-native-compile: t +;; coding: utf-8-emacs-unix +;; End: + +;;; outline-minor-faces-autoloads.el ends here diff --git a/elpa/outline-minor-faces-20250514.1243/outline-minor-faces-pkg.el b/elpa/outline-minor-faces-20250514.1243/outline-minor-faces-pkg.el new file mode 100644 index 00000000..e1793253 --- /dev/null +++ b/elpa/outline-minor-faces-20250514.1243/outline-minor-faces-pkg.el @@ -0,0 +1,11 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "outline-minor-faces" "20250514.1243" + "Highlight only section headings." + '((emacs "26.1") + (compat "30.0.1.0")) + :url "https://github.com/tarsius/outline-minor-faces" + :commit "a1ef3834f9f643cf1f65c5424691514169f8bf31" + :revdesc "a1ef3834f9f6" + :keywords '("faces" "outlines") + :authors '(("Jonas Bernoulli" . "emacs.outline-minor-faces@jonas.bernoulli.dev")) + :maintainers '(("Jonas Bernoulli" . "emacs.outline-minor-faces@jonas.bernoulli.dev"))) diff --git a/elpa/outline-minor-faces-20250514.1243/outline-minor-faces.el b/elpa/outline-minor-faces-20250514.1243/outline-minor-faces.el new file mode 100644 index 00000000..c4280bda --- /dev/null +++ b/elpa/outline-minor-faces-20250514.1243/outline-minor-faces.el @@ -0,0 +1,238 @@ +;;; outline-minor-faces.el --- Highlight only section headings -*- lexical-binding:t -*- + +;; Copyright (C) 2018-2025 Jonas Bernoulli + +;; Author: Jonas Bernoulli +;; Homepage: https://github.com/tarsius/outline-minor-faces +;; Keywords: faces outlines + +;; Package-Version: 20250514.1243 +;; Package-Revision: a1ef3834f9f6 +;; Package-Requires: ((emacs "26.1") (compat "30.0.1.0")) + +;; SPDX-License-Identifier: GPL-3.0-or-later + +;; This file is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation, either version 3 of the License, +;; or (at your option) any later version. +;; +;; This file is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this file. If not, see . + +;;; Commentary: + +;; This package teaches `outline-minor-mode' to highlight section +;; headings, *without* also highlighting top-level s-expressions. + +;; To highlight only section headings forgo setting the built-in +;; `outline-minor-mode-highlight' to `append', or another non-nil +;; value. Instead enable the equivalent feature provided by this +;; package: +;; +;; (use-package outline-minor-faces +;; :after outline +;; :config (add-hook 'outline-minor-mode-hook +;; #'outline-minor-faces-mode)) + +;; For non-lisp major modes the highlighting provided by this package +;; and by the built-in support is essentially the same, i.e., the first +;; lines of top-level expressions *are* highlighted. + +;; This package also defines separate faces for use in the minor mode. +;; These faces are what gave this package its name, but nowadays they +;; inherit from the built-in faces by default, and are preserved mostly +;; for historic reasons, i.e., to avoid having to rename this package. + +;; To further improve the appearance of collapsed sections, check out +;; the `backline' package. + +;;; Code: + +(require 'compat) +(require 'outline) + +(defface outline-minor-0 + `((((class color) (background light)) + ,@(and (>= emacs-major-version 27) '(:extend t)) + :weight bold + :background "light grey") + (((class color) (background dark)) + ,@(and (>= emacs-major-version 27) '(:extend t)) + :weight bold + :background "grey20")) + "Face that other `outline-minor-N' faces inherit from." + :group 'outlines) + +(defface outline-minor-1 + '((t (:inherit (outline-minor-0 outline-1)))) + "Level 1 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-2 + '((t (:inherit (outline-minor-0 outline-2)))) + "Level 2 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-3 + '((t (:inherit (outline-minor-0 outline-3)))) + "Level 3 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-4 + '((t (:inherit (outline-minor-0 outline-4)))) + "Level 4 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-5 + '((t (:inherit (outline-minor-0 outline-5)))) + "Level 5 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-6 + '((t (:inherit (outline-minor-0 outline-6)))) + "Level 6 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-7 + '((t (:inherit (outline-minor-0 outline-7)))) + "Level 7 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-8 + '((t (:inherit (outline-minor-0 outline-8)))) + "Level 8 headings in `outline-minor-mode'." + :group 'outlines) + +(defface outline-minor-file-local-prop-line + '((t (:inherit (font-lock-comment-face outline-minor-1) :weight normal))) + "Face used for file-local variables settings on the -*- line." + :group 'outlines) + +(defvar outline-minor-faces + [outline-minor-1 outline-minor-2 outline-minor-3 outline-minor-4 + outline-minor-5 outline-minor-6 outline-minor-7 outline-minor-8]) + +(defvar outline-minor-faces--lisp-modes + '(lisp-data-mode + lisp-mode + emacs-lisp-mode + clojure-mode + scheme-mode)) + +(defvar-local outline-minor-faces--top-level nil) + +(defvar-local outline-minor-faces-regexp nil + "Regular expression to match the complete line of a heading. +If this is nil, then a regular expression based on +`outline-regexp' is used. The value of that variable cannot +be used directly because it is only supposed to match the +beginning of a heading.") + +(defun outline-minor-faces--syntactic-matcher (regexp) + "Return a matcher that matches REGEXP only outside of strings. + +Returns REGEXP directly for modes where `font-lock-keywords-only' +is non-nil because Font Lock does not mark strings and comments +for those modes, and the matcher will not know what is/is not a +string." + (cond + ;; Assume that if a mode defines such a function, it likely is + ;; benefitial to use it. We know that `elisp-outline-search' + ;; (added in Emacs 31) is unnecessary here though. It's purpose + ;; is to avoid matching parens at the bol inside strings, but we + ;; don't even try to match parens at all, so that's not relevant. + ((and outline-search-function + (not (eq outline-search-function 'elisp-outline-search))) + #'ignore) + (font-lock-keywords-only regexp) + ((lambda (limit) + (and (re-search-forward regexp limit t) + (not (nth 3 (syntax-ppss (match-beginning 0))))))))) + +(defvar outline-minor-faces--font-lock-keywords + '((eval . (list (outline-minor-faces--syntactic-matcher + (or outline-minor-faces-regexp + (concat + "^\\(?:" + (cond + ((not (apply #'derived-mode-p + outline-minor-faces--lisp-modes)) + outline-regexp) + ;; `emacs-lisp-mode' Emacs >= 29 + ((string-suffix-p "\\(autoload\\)\\)" outline-regexp) + ";;;\\(;* [^ \t\n]\\)") + ;; `emacs-lisp-mode' Emacs <= 28 + ((string-suffix-p "\|###autoload\\)\\|(" outline-regexp) + (concat (substring outline-regexp 0 -18) "\\)")) + ;; `scheme-mode' + ((string-suffix-p "\\|(...." outline-regexp) + (substring outline-regexp 0 -7)) + ;; `lisp-data-mode', `lisp-mode' et al. + ((string-suffix-p "\\|(" outline-regexp) + (substring outline-regexp 0 -3)) + (t outline-regexp)) + "\\).*\n?"))) + 0 '(outline-minor-faces--get-face) t)) + ("-\\*-.*-\\*-" 0 'outline-minor-file-local-prop-line t))) + +;;;###autoload +(define-minor-mode outline-minor-faces-mode + "Minor mode that adds heading faces for `outline-minor-mode'." + :lighter "" + (unless arg + ;; Toggle both modes together due to + ;; (add-hook 'outline-minor-mode-hook 'outline-minor-faces-mode). + (setq outline-minor-faces-mode outline-minor-mode)) + (if outline-minor-faces-mode + (font-lock-add-keywords nil outline-minor-faces--font-lock-keywords t) + (font-lock-remove-keywords nil outline-minor-faces--font-lock-keywords)) + (when font-lock-mode + (save-restriction + (widen) + (font-lock-flush) + (font-lock-ensure)))) + +(defun outline-minor-faces--get-face () + (save-excursion + (goto-char (match-beginning 0)) + (let* ((level (outline-minor-faces--level)) + (index (- level (outline-minor-faces--top-level)))) + (when (< index 0) + (setq outline-minor-faces--top-level nil) + (setq index (- level (outline-minor-faces--top-level)))) + (aref outline-minor-faces + (% index (length outline-minor-faces)))))) + +(defun outline-minor-faces--level () + (save-excursion + (and (if-let ((fn (bound-and-true-p outline-search-function)) + ;; See `outline-minor-faces--syntactic-matcher'. + ((not (eq fn 'elisp-outline-search)))) + (funcall fn nil nil nil t) + (beginning-of-line) + (looking-at outline-regexp)) + (funcall outline-level)))) + +(defun outline-minor-faces--top-level () + (or outline-minor-faces--top-level + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (let ((min (or (outline-minor-faces--level) 1000))) + (while (outline-next-heading) + (setq min (min min (outline-minor-faces--level)))) + (setq outline-minor-faces--top-level min)))))) + +;;; _ +(provide 'outline-minor-faces) +;; Local Variables: +;; indent-tabs-mode: nil +;; End: +;;; outline-minor-faces.el ends here