branch: externals/org-remark
commit f679d00c0a523ba0c2e5f1b5cc44ea38968a50e6
Author: Noboru Ota <m...@nobiot.com>
Commit: Noboru Ota <m...@nobiot.com>
refactor(line): loading and renaming the el file
---
org-remark-line-highlighter.el | 130 -----------------------------------------
org-remark.el | 2 -
2 files changed, 132 deletions(-)
diff --git a/org-remark-line-highlighter.el b/org-remark-line-highlighter.el
deleted file mode 100644
index c81c4e1982..0000000000
--- a/org-remark-line-highlighter.el
+++ /dev/null
@@ -1,130 +0,0 @@
-;;; org-remark-line.el --- Enable Org-roam to highlight a line -*-
lexical-binding: t; -*-
-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
-
-;; Author: Noboru Ota <m...@nobiot.com>
-;; URL: https://github.com/nobiot/org-remark
-;; Created: 01 August 2023
-;; Last modified: 02 August 2023
-;; Package-Requires: ((emacs "27.1") (org "9.4"))
-;; Keywords: org-mode, annotation, note-taking, marginal-notes, wp
-
-;; This file is not part of GNU Emacs.
-
-;; 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
-;; the Free Software Foundation, either version 3 of the License, or (at
-;; your option) any later version.
-
-;; This program 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 program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-;;(require 'org-remark)
-
-(defface org-remark-line-highlighter
- '((((class color) (min-colors 88) (background light))
- :foreground "#e2d980")
- (((class color) (min-colors 88) (background dark))
- :foreground "#e2d980")
- (t
- :inherit highlight))
- "Face for the default line highlighter pen.")
-
-(defvar org-remark-line-icon "*")
-
-(defvar org-remark-line-ellipsis "…")
-
-(defun org-remark-line-pos-bol (pos)
- "Return the beginning of the line position for POS."
- (save-excursion
- (goto-char pos)
- (pos-bol)))
-
-(defun org-remark-line-highlight-p (highlight)
- "Return t if HIGHLIGHT is one for the line.
-HIGHLIGHT is an overlay."
- (string= "line" (overlay-get highlight 'org-remark-type)))
-
-(defun org-remark-line-find (&optional point)
- "Return the line-highight (overlay) of the current line.
-When POINT is passed, one for the line it belongs to. If there
-are multiple line-hilights, return the car of the list returned
-by `overlays-in'."
- (let* ((point (or point (point)))
- (bol (org-remark-line-pos-bol point))
- (highlights (overlays-in bol bol)))
- (seq-find #'org-remark-line-highlight-p highlights)))
-
-;; Depth is deeper than the default one for range highlight. This is to
-;; prioritize it over line-highlight when the fomer is at point and yet
-;; on the same line of another line-highlight.
-(add-hook 'org-remark-find-dwim-functions #'org-remark-line-find 80)
-
-(add-hook 'window-size-change-functions
- #'(lambda (&rest args)
- (set-window-margins nil 2)))
-
-;;;###autoload
-(defun org-remark-mark-line (beg end &optional id mode)
- (interactive (org-remark-beg-end 'line))
- (org-remark-highlight-mark beg end id mode ;; LINE line function different
- ;; LINE needs to be the suffix of a
- ;; function: `org-remark-mark-'
- "line" nil ;; LINE important to put
- ;; the suffix of the label
- ;; to call this correct function
- (list 'org-remark-type 'line)))
-
-(cl-defmethod org-remark-beg-end ((org-remark-type (eql 'line)))
- (let ((bol (org-remark-line-pos-bol (point))))
- (list bol bol)))
-
-(cl-defmethod org-remark-highlight-mark-overlay (ov face (org-remark-type (eql
'line)))
- (org-remark-line-highlight-overlay-put ov face) ;; LINE
- (overlay-put ov 'insert-in-front-hooks (list
'org-remark-line-highlight-modified)))
-
-(defun org-remark-line-highlight-overlay-put (ov face)
- (let* ((face (or face 'org-remark-line-highlighter))
- (left-margin (or (car (window-margins))
- ;; when nil = no margin, set to 1
- (progn (set-window-margins nil 2)
- 2)))
- (spaces (- left-margin 2))
- (string (with-temp-buffer (insert-char ?\s spaces)
- (insert org-remark-line-icon)
- (buffer-string))))
- (overlay-put ov 'before-string (propertize "! " 'display
- `((margin left-margin)
- ,(propertize string 'face
face))))
- ov))
-
-(defun org-remark-line-highlight-modified (ov after-p beg end &optional length)
- "This is good! Move the overlay to follow the point when ENTER in the line."
- (when after-p
- (save-excursion (goto-char beg)
- (when (looking-at "\n")
- (move-overlay ov (1+ beg) (1+ beg))))))
-
-(cl-defmethod org-remark-highlight-headline-text (ov (org-remark-type (eql
'line)))
- "Return the first x characters of the line.
-If the line is shorter than x, then up to the newline char."
- (let ((line-text (buffer-substring-no-properties
- (overlay-start ov) (pos-eol))))
- (if (or (eq line-text nil)
- (string= line-text ""))
- "Empty line highlight"
- (setq line-text (string-trim-left line-text))
- (if (length< line-text 40) line-text
- (concat (substring line-text 0 39) org-remark-line-ellipsis)))))
-
-(provide 'org-remark-line)
-;;; org-remark-line.el ends here
diff --git a/org-remark.el b/org-remark.el
index 46991f41ed..437649b00d 100644
--- a/org-remark.el
+++ b/org-remark.el
@@ -1663,8 +1663,6 @@ Return t if S1 and S2 are an identical string."
(replace-regexp-in-string "[\n ]" "" s1)
(replace-regexp-in-string "[\n ]" "" s2)))
-(load-file "~/src/org-remark/org-remark-line-highlighter.el")
-
;;;; Footer
