From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Wahl Subject: [PATCH] Kill in eww and keep the links for org Date: Tue, 07 Oct 2014 12:11:34 +0200 Message-ID: <84fvf01961.fsf@tm6592.fritz.box> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbRkH-0002L1-U4 for emacs-orgmode@gnu.org; Tue, 07 Oct 2014 06:11:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XbRkB-0001If-RG for emacs-orgmode@gnu.org; Tue, 07 Oct 2014 06:11:53 -0400 Received: from plane.gmane.org ([80.91.229.3]:60073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbRkB-0001IX-HB for emacs-orgmode@gnu.org; Tue, 07 Oct 2014 06:11:47 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XbRkA-0005P9-Aa for emacs-orgmode@gnu.org; Tue, 07 Oct 2014 12:11:46 +0200 Received: from stgt-4d02d400.pool.mediaways.net ([77.2.212.0]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Oct 2014 12:11:46 +0200 Received: from marcowahlsoft by stgt-4d02d400.pool.mediaways.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Oct 2014 12:11:46 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Hi, to kill in a w3m-buffer and yank into an org-mode-buffer by keeping the links is a long known feature in org-module org-w3m. The patch below provides this functionality for eww. Note that the code is very similar to the code for the w3m case. What do you think? Shall I try to push the code? Ciao, Marco --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-org-eww.el-Special-kill-in-eww-for-Org-for-keeping-t.patch Content-Description: patch: copy from eww to org and keep the links >From 5f03c47861a828b7a75d890e05121c028a003296 Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Thu, 2 Oct 2014 23:09:11 +0200 Subject: [PATCH] org-eww.el: Special kill in eww for Org for keeping the links * contrib/lisp/org-eww.el(org-eww-copy-for-org-mode): Realization of the kill. (org-eww-goto-next-url-property-change, org-eww-no-next-link-p, org-eww-url-below-point, org-eww-url-below-point-p): Auxiliaries for accessing a eww buffer The code has emerged from the very similar org-w3m.el. --- contrib/lisp/org-eww.el | 107 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 101 insertions(+), 6 deletions(-) diff --git a/contrib/lisp/org-eww.el b/contrib/lisp/org-eww.el index c25057d..3aae37a 100644 --- a/contrib/lisp/org-eww.el +++ b/contrib/lisp/org-eww.el @@ -1,4 +1,4 @@ -;;; org-eww.el --- Storing link in eww-mode for Org-mode +;;; org-eww.el --- Store url and kill from eww-mode for Org ;; Copyright (C) 2014 Free Software Foundation, Inc. @@ -27,17 +27,25 @@ ;; When this module is active `org-store-link' (often on key C-c l) in ;; a eww buffer stores a link to the current url of the eww buffer. -;; `org-eww-store-link' below is almost the same as -;; `org-w3m-store-link' of the org-w3m module. +;; In an eww buffer function `org-eww-copy-for-org-mode' kills either +;; a region or the whole buffer if no region is set and transforms the +;; text on the fly so that it can be pasted into an org-mode buffer +;; with hot links. -;; Hint: There are further features in module org-w3m which might be -;; interesting for org-eww also. +;; C-c C-x C-w and C-c C-x M-w trigger `org-eww-copy-for-org-mode'. + +;; Hint: A lot of code of this module comes from module org-w3m which +;; has been written by Andy Steward. Thanks! + +;; Potential: Since the code for w3m and eww is so similar one could +;; try to refactor. ;;; Code: - (require 'org) + +;; Store Org-link in eww-mode buffer (add-hook 'org-store-link-functions 'org-eww-store-link) (defun org-eww-store-link () "Store a link to the url of a eww buffer." @@ -49,6 +57,93 @@ :description (or eww-current-title eww-current-url)))) +;; Some auxiliary functions concerning links in eww buffers +(defun org-eww-goto-next-url-property-change () + "Move cursor to the start of next link if exists. Else no +move. Return point." + (goto-char + (or (next-single-property-change (point) 'shr-url) + (point)))) + +(defun org-eww-no-next-link-p () + "Whether there is no next link after the cursor. +Return t if there is no next link; otherwise, return nil." + (save-excursion + (equal (point) (org-eww-goto-next-url-property-change)))) + +(defun org-eww-url-below-point-p () + "Return t if below point there is a url; otherwise, return nil." + (not (eq nil (org-eww-url-below-point)))) + +(defun org-eww-url-below-point () + "Return the url below point if there is an url; otherwise, return nil." + (get-text-property (point) 'shr-url)) + + +(defun org-eww-copy-for-org-mode () + "Copy current buffer content or active region with `org-mode' style links. +This will encode `link-title' and `link-location' with +`org-make-link-string', and insert the transformed test into the kill ring, +so that it can be yanked into an Org-mode buffer with links working correctly." + (interactive) + (let* ((regionp (org-region-active-p)) + (transform-start (point-min)) + (transform-end (point-max)) + return-content + link-location link-title + temp-position out-bound) + (when regionp + (setq transform-start (region-beginning)) + (setq transform-end (region-end)) + ;; Deactivate mark if current mark is activate. + (if (fboundp 'deactivate-mark) (deactivate-mark))) + (message "Transforming links...") + (save-excursion + (goto-char transform-start) + (while (and (not out-bound) ; still inside region to copy + (not (org-eww-no-next-link-p))) ; there is a next link + ;; store current point before jump next anchor + (setq temp-position (point)) + ;; move to next anchor when current point is not at anchor + (or (org-eww-url-below-point-p) + (org-eww-goto-next-url-property-change)) + (assert (org-eww-url-below-point-p) t + "program logic error: point must have an url below but it hasn't") + (if (<= (point) transform-end) ; if point is inside transform bound + (progn + ;; get content between two links. + (if (> (point) temp-position) + (setq return-content (concat return-content + (buffer-substring + temp-position (point))))) + ;; get link location at current point. + (setq link-location (org-eww-url-below-point)) + ;; get link title at current point. + (setq link-title + (buffer-substring + (point) + (org-eww-goto-next-url-property-change))) + ;; concat `org-mode' style url to `return-content'. + (setq return-content (concat return-content + (org-make-link-string + link-location 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 + (if (< (point) transform-end) + (setq return-content + (concat return-content + (buffer-substring (point) transform-end)))) + (org-kill-new return-content) + (message "Transforming links...done, use C-y to insert text into Org-mode file")))) + + +;; Additional keys for eww-mode +(define-key eww-mode-map "\C-c\C-x\M-w" 'org-eww-copy-for-org-mode) +(define-key eww-mode-map "\C-c\C-x\C-w" 'org-eww-copy-for-org-mode) + + (provide 'org-eww) ;;; org-eww.el ends here -- 2.1.2 --=-=-= Content-Type: text/plain -- http://www.wahlzone.de PGP: 0x0A3AE6F2 --=-=-=--