From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Maus Subject: [PATCH] * lisp/org-w3m.el: Get text property directly, not using macro `w3m-anchor'. Date: Sat, 22 May 2010 16:29:19 +0200 Message-ID: <1274538559-13584-2-git-send-email-dmaus@ictsoc.de> References: <1274538559-13584-1-git-send-email-dmaus@ictsoc.de> Return-path: Received: from [140.186.70.92] (port=59910 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFpiS-00066P-I7 for emacs-orgmode@gnu.org; Sat, 22 May 2010 10:30:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFpiM-0003i8-CJ for emacs-orgmode@gnu.org; Sat, 22 May 2010 10:30:15 -0400 Received: from mysql1.xlhost.de ([213.202.242.106]:50951) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFpiM-0003i2-0Z for emacs-orgmode@gnu.org; Sat, 22 May 2010 10:30:10 -0400 In-Reply-To: <1274538559-13584-1-git-send-email-dmaus@ictsoc.de> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --- lisp/ChangeLog | 4 ++++ lisp/org-w3m.el | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8653197..b3a3529 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-05-22 David Maus + * org-w3m.el (org-w3m-copy-for-org-mode) + (org-w3m-get-next-link-start, org-w3m-get-prev-link-start): + Get text property directly, not using macro `w3m-anchor'. + * org.el (org-clone-subtree-with-time-shift): Remove duplicate code preparing the clone. diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el index 7108794..7ae96f8 100644 --- a/lisp/org-w3m.el +++ b/lisp/org-w3m.el @@ -41,7 +41,7 @@ ;; (require 'org) -(declare-function w3m-anchor "ext:w3m-util" (position)) + (defun org-w3m-copy-for-org-mode () "Copy current buffer content or active region with `org-mode' style links. @@ -68,7 +68,7 @@ so that it can be yanked into an Org-mode buffer with links working correctly." ;; store current point before jump next anchor (setq temp-position (point)) ;; move to next anchor when current point is not at anchor - (or (w3m-anchor (point)) (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 (progn ;; get content between two links. @@ -77,7 +77,7 @@ so that it can be yanked into an Org-mode buffer with links working correctly." (buffer-substring temp-position (point))))) ;; get link location at current point. - (setq link-location (w3m-anchor (point))) + (setq link-location (get-text-property (point) 'w3m-href-anchor)) ;; get link title at current point. (setq link-title (buffer-substring (point) (org-w3m-get-anchor-end))) @@ -115,7 +115,7 @@ so that it can be yanked into an Org-mode buffer with links working correctly." (while (next-single-property-change (point) 'w3m-anchor-sequence) ;; jump to next anchor (goto-char (next-single-property-change (point) 'w3m-anchor-sequence)) - (when (w3m-anchor (point)) + (when (get-text-property (point) 'w3m-href-anchor) ;; return point when current is valid link (throw 'reach nil)))) (point)) @@ -126,7 +126,7 @@ so that it can be yanked into an Org-mode buffer with links working correctly." (while (previous-single-property-change (point) 'w3m-anchor-sequence) ;; jump to previous anchor (goto-char (previous-single-property-change (point) 'w3m-anchor-sequence)) - (when (w3m-anchor (point)) + (when (get-text-property (point) 'w3m-href-anchor) ;; return point when current is valid link (throw 'reach nil)))) (point)) -- 1.7.1