ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ol-info: Use org function instead of subr-x 

* lisp/org-macs.el (org-unbracket-string): Handle empty suffix string.
* lisp/ol-info.el (org-info--link-file-node):
(org-info-description-as-command): Use `org-trim' and
`org-unbracket-string' instead of `string-trim' and
`string-remove-prefix' from the subr-x package.
This commit is contained in:
Max Nikulin 2022-08-31 09:21:47 +07:00 committed by Ihor Radchenko
parent 1b647b00d0
commit 76a5f30034
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ol-info.el
View File

@ -30,7 +30,6 @@
;;; Code:
(require 'subr-x) ; `string-trim', `string-remove-prefix'
(require 'org-macs)
(org-assert-version)
@ -78,11 +77,11 @@ File may be a virtual one, see `Info-virtual-files'."
'("dir" . "Top")
(string-match "\\`\\([^#:]*\\)\\(?:[#:]:?\\(.*\\)\\)?\\'" path)
(let* ((node (match-string 2 path))
;; Do not reorder, `string-trim' modifies match.
(file (string-trim (match-string 1 path))))
;; Do not reorder, `org-trim' modifies match.
(file (org-trim (match-string 1 path))))
(cons
(if (org-string-nw-p file) file "dir")
(if (org-string-nw-p node) (string-trim node) "Top")))))
(if (org-string-nw-p node) (org-trim node) "Top")))))
(defun org-info-description-as-command (link desc)
"Info link description that can be pasted as command.
@ -106,7 +105,7 @@ If LINK is not an info link then DESC is returned."
(need-file-node (and (not (org-string-nw-p desc))
(string-prefix-p prefix link))))
(pcase (and need-file-node
(org-info--link-file-node (string-remove-prefix prefix link)))
(org-info--link-file-node (org-unbracket-string prefix "" link)))
;; Unlike (info "dir"), "info dir" shell command opens "(coreutils)dir invocation".
(`("dir" . "Top") "info \"(dir)\"")
(`(,file . "Top") (format "info %s" file))

3
lisp/org-macs.el
View File

@ -1101,7 +1101,8 @@ removed. Return the new string. If STRING is nil, return nil."
(and string
(if (and (string-prefix-p pre string)
(string-suffix-p post string))
(substring string (length pre) (- (length post)))
(substring string (length pre)
(and (not (string-equal "" post)) (- (length post))))
string)))
(defun org-strip-quotes (string)