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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2018-04-14 19:32:05 +02:00
parent 2a315ab59d 1a1e47198f
commit cc9233c1f4
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-eww.el
View File

@ -140,13 +140,13 @@ the structure of the Org file."
;; concat `org-mode' style url to `return-content'. ;; concat `org-mode' style url to `return-content'.
(setq return-content (setq return-content
(concat return-content (concat return-content
(if (stringp link-location) (if (org-string-nw-p link-location)
;; hint: link-location is different for form-elements. ;; Hint: link-location is different
;; for form-elements.
(org-make-link-string link-location link-title) (org-make-link-string link-location link-title)
link-title)))) link-title))))
(goto-char temp-position) ; reset point before jump next anchor (goto-char temp-position) ; reset point before jump next anchor
(setq out-bound t) ; for break out `while' loop (setq out-bound t))) ; for break out `while' loop
))
;; Add the rest until end of the region to be copied. ;; Add the rest until end of the region to be copied.
(when (< (point) transform-end) (when (< (point) transform-end)
(setq return-content (setq return-content

17
lisp/org-w3m.el
View File

@ -76,13 +76,13 @@ so that it can be yanked into an Org buffer with links working correctly."
(message "Transforming links...") (message "Transforming links...")
(save-excursion (save-excursion
(goto-char transform-start) (goto-char transform-start)
(while (and (not out-bound) ; still inside region to copy (while (and (not out-bound) ; still inside region to copy
(not (org-w3m-no-next-link-p))) ; no next link current buffer (not (org-w3m-no-next-link-p))) ; no next link current buffer
;; store current point before jump next anchor ;; store current point before jump next anchor
(setq temp-position (point)) (setq temp-position (point))
;; move to next anchor when current point is not at anchor ;; move to next anchor when current point is not at anchor
(or (get-text-property (point) 'w3m-href-anchor) (org-w3m-get-next-link-start)) (or (get-text-property (point) 'w3m-href-anchor) (org-w3m-get-next-link-start))
(if (<= (point) transform-end) ; if point is inside transform bound (if (<= (point) transform-end) ; if point is inside transform bound
(progn (progn
;; get content between two links. ;; get content between two links.
(if (> (point) temp-position) (if (> (point) temp-position)
@ -95,12 +95,13 @@ so that it can be yanked into an Org buffer with links working correctly."
(setq link-title (buffer-substring (point) (setq link-title (buffer-substring (point)
(org-w3m-get-anchor-end))) (org-w3m-get-anchor-end)))
;; concat Org style url to `return-content'. ;; concat Org style url to `return-content'.
(setq return-content (concat return-content (setq return-content
(org-make-link-string (concat return-content
link-location link-title)))) (if (org-string-nw-p link-location)
(goto-char temp-position) ; reset point before jump next anchor (org-make-link-string link-location link-title)
(setq out-bound t) ; for break out `while' loop link-title))))
)) (goto-char temp-position) ; reset point before jump next anchor
(setq out-bound t))) ; for break out `while' loop
;; add the rest until end of the region to be copied ;; add the rest until end of the region to be copied
(if (< (point) transform-end) (if (< (point) transform-end)
(setq return-content (setq return-content