[elpa] externals/org-transclusion 6006cf90ab 2/3: intrnl: apply patch from Stefan Monnier & add package-version

[ELPA Syncer]

branch: externals/org-transclusion
commit 6006cf90ab68df60529e606c8727017b8c992593
Author: Noboru Ota <me@nobiot.com>
Commit: Noboru Ota <me@nobiot.com>

    intrnl: apply patch from Stefan Monnier & add package-version
---
 org-transclusion-src-lines.el |  9 ++++---
 org-transclusion.el           | 56 ++++++++++++++++---------------------------
 2 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/org-transclusion-src-lines.el b/org-transclusion-src-lines.el
index 075c8b1b58..98725b4c39 100644
--- a/org-transclusion-src-lines.el
+++ b/org-transclusion-src-lines.el
@@ -17,7 +17,7 @@
 
 ;; Author: Noboru Ota <me@nobiot.com>
 ;; Created: 24 May 2021
-;; Last modified: 4 December 2021
+;; Last modified: 28 December 2021
 
 ;;; Commentary:
 ;;  This is an extension to `org-transclusion'.  When active, it adds features
@@ -220,12 +220,11 @@ This function is meant to be used as an extension for 
function
 `org-transclusion-keyword-plist-to-string'.  Add it to the
 abnormal hook
 `org-transclusion-keyword-plist-to-string-functions'."
-  (let ((string nil)
-        (lines (plist-get plist :lines))
+  (let ((lines (plist-get plist :lines))
         (src (plist-get plist :src))
         (rest (plist-get plist :rest))
-       (end (plist-get plist :end)))
-    (concat string
+        (end (plist-get plist :end)))
+    (concat
      (when lines (format ":lines %s" lines))
      (when src (format " :src %s" src))
      (when rest (format " :rest \"%s\"" rest))
diff --git a/org-transclusion.el b/org-transclusion.el
index fe384890f2..9034f55891 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -53,7 +53,8 @@
   "Insert text contents by way of link references."
   :group 'org
   :prefix "org-transclusion-"
-  :link '(url-link :tag "Github" "https://github.com/nobiot/org-transclusion";))
+  :link '(url-link :tag "Github" "https://github.com/nobiot/org-transclusion";)
+  :package-version "1.0.0")
 
 (defun org-transclusion-set-extensions (var value)
   "Set VAR to VALUE and `org-transclusion-load-extensions-maybe'.
@@ -62,10 +63,9 @@ Intended for :set property for `customize'."
   (when (featurep 'org-transclusion)
     (org-transclusion-load-extensions-maybe 'force)))
 
-(defcustom org-transclusion-extensions '(org-transclusion-src-lines)
+ (defcustom org-transclusion-extensions '(org-transclusion-src-lines)
   "Extensions to be loaded with org-transclusion.el."
-  :group 'org-transclusion
-  :set 'org-transclusion-set-extensions
+  :set #'org-transclusion-set-extensions
   :type
   '(set :greedy t
         (const :tag "src-lines: Add :src and :lines for non-Org files" 
org-transclusion-src-lines)
@@ -77,37 +77,32 @@ Intended for :set property for `customize'."
 (defcustom org-transclusion-add-all-on-activate t
   "Define whether to add all the transclusions on activation.
 When non-nil, automatically add all on `org-transclusion-activate'."
-  :type 'boolean
-  :group 'org-transclusion)
+  :type 'boolean)
 
 (defcustom org-transclusion-exclude-elements (list 'property-drawer)
   "Define the Org elements that are excluded from transcluded copies.
 It is a list of elements to be filtered out.
 Refer to variable `org-element-all-elements' for names of elements accepted."
-  :type '(repeat symbol)
-  :group 'org-transclusion)
+  :type '(repeat symbol))
 
 (defcustom org-transclusion-include-first-section t
   "Define whether or not transclusion for Org files includes \"first section\".
 If t, the section before the first headline is
 transcluded. Default is t."
-  :type 'boolean
-  :group 'org-transclusion)
+  :type 'boolean)
 
 (defcustom org-transclusion-open-source-display-action-list '(nil . nil)
   "Action list used to open source buffer to display.
 
 See `display-buffer' for example options."
   :type display-buffer--action-custom-type
-  :risky t
-  :group 'org-transclusion)
+  :risky t)
 
 (defcustom org-transclusion-mode-lighter
   " OT"
   "Mode-line indicator for minor-mode variable `org-transclusion-mode'."
   :type '(choice (const :tag "No lighter" "") string)
-  :safe 'stringp
-  :group 'org-transclusion)
+  :safe 'stringp)
 
 ;;;; Faces
 
@@ -115,54 +110,43 @@ See `display-buffer' for example options."
   '((((class color) (min-colors 88) (background light)))
     (((class color) (min-colors 88) (background dark)))
     (t ))
-  "Face for source region's fringe being transcluded in another buffer."
-  :group 'org-transclusion)
-
-(defface org-transclusion-source
+  "Face for source region's fringe being transcluded in another buffer.")
+ (defface org-transclusion-source
   '((((class color) (min-colors 88) (background light))
      :background "#ebf6fa" :extend t)
     (((class color) (min-colors 88) (background dark))
      :background "#041529" :extend t)
     (t
      :foreground "darkgray"))
-  "Face for source region being transcluded in another buffer."
-  :group 'org-transclusion)
-
-(defface org-transclusion-source-edit
+  "Face for source region being transcluded in another buffer.")
+ (defface org-transclusion-source-edit
   '((((class color) (min-colors 88) (background light))
      :background "#fff3da" :extend t)
     (((class color) (min-colors 88) (background dark))
      :background "#221000" :extend t)
     (t
      :background "chocolate4" :extend t))
-  "Face for element in the source being edited by another buffer."
-  :group 'org-transclusion)
-
-(defface org-transclusion-fringe
+  "Face for element in the source being edited by another buffer.")
+ (defface org-transclusion-fringe
   '((((class color) (min-colors 88) (background light)))
     (((class color) (min-colors 88) (background dark)))
     (t ))
-  "Face for transcluded region's fringe in the transcluding buffer."
-  :group 'org-transclusion)
-
-(defface org-transclusion
+  "Face for transcluded region's fringe in the transcluding buffer.")
+ (defface org-transclusion
   '((((class color) (min-colors 88) (background light))
      :background "#ebf6fa" :extend t)
     (((class color) (min-colors 88) (background dark))
      :background "#041529" :extend t)
     (t ))
-  "Face for transcluded region in the transcluding buffer."
-  :group 'org-transclusion)
-
-(defface org-transclusion-edit
+  "Face for transcluded region in the transcluding buffer.")
+ (defface org-transclusion-edit
   '((((class color) (min-colors 88) (background light))
      :background "#ebf6fa" :extend t)
     (((class color) (min-colors 88) (background dark))
      :background "#041529" :extend t)
     (t
      :background "forest green" :extend t))
-  "Face for element in the transcluding buffer in the edit mode."
-  :group 'org-transclusion)
+  "Face for element in the transcluding buffer in the edit mode.")
 
 ;;;; Variables