From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH 4/9] Fix link display in imenus and the refile interface Date: Sun, 21 Sep 2008 08:25:14 +0200 Message-ID: References: <20080920210101.19759.15959.stgit@nyarlathotep.internal.mohorovi.cc> <20080920210901.19759.78844.stgit@nyarlathotep.internal.mohorovi.cc> Mime-Version: 1.0 (Apple Message framework v929.2) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KhINw-0002i5-25 for emacs-orgmode@gnu.org; Sun, 21 Sep 2008 02:25:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KhINq-0002hs-Gx for emacs-orgmode@gnu.org; Sun, 21 Sep 2008 02:25:30 -0400 Received: from [199.232.76.173] (port=37543 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KhINq-0002hp-AJ for emacs-orgmode@gnu.org; Sun, 21 Sep 2008 02:25:26 -0400 Received: from pony.ic.uva.nl ([145.18.40.181]:33441) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KhINp-0001fC-EU for emacs-orgmode@gnu.org; Sun, 21 Sep 2008 02:25:26 -0400 In-Reply-To: <20080920210901.19759.78844.stgit@nyarlathotep.internal.mohorovi.cc> 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: James TD Smith Cc: org-mode list Hi James, I am not accepting this particular patch in its current form. It does not work for links to do not have a description part. Also, it relies on replace-regexp-in-string, which does not exist in XEmacs I believe. I am still thinking about %< patch (patch 7/9), need to test is a bit. All the rest goes in for 6.08, thank you very much. - Carsten On Sep 20, 2008, at 11:09 PM, James TD Smith wrote: > Replace links with their descriptions in when generating the items > for imenus > and the refile interface. > --- > > lisp/ChangeLog | 4 ++++ > lisp/org.el | 8 +++++++- > 2 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/lisp/ChangeLog b/lisp/ChangeLog > index 3896ddf..b52700d 100755 > --- a/lisp/ChangeLog > +++ b/lisp/ChangeLog > @@ -1,5 +1,9 @@ > 2008-09-20 James TD Smith > > + * org.el (org-get-refile-targets): Replace links with their > + descriptions > + (org-imenu-get-tree): Replace links with their descriptions > + > * org-agenda.el (org-agenda-get-closed): show durations of clocked > items as well as the start and end times. > > diff --git a/lisp/org.el b/lisp/org.el > index cdbe7bb..99b62d0 100644 > --- a/lisp/org.el > +++ b/lisp/org.el > @@ -7866,7 +7866,10 @@ on the system \"/user@host:\"." > (while (re-search-forward descre nil t) > (goto-char (point-at-bol)) > (when (looking-at org-complex-heading-regexp) > - (setq txt (match-string 4) > + (setq txt (save-match-data > + (replace-regexp-in-string > + org-bracket-link-analytic-regexp "\\5" > + (match-string 4))) > re (concat "^" (regexp-quote > (buffer-substring (match-beginning 1) > (match-end 4))))) > @@ -14673,6 +14676,9 @@ Show the heading too, if it is currently > invisible." > (looking-at org-complex-heading-regexp) > (setq head (org-match-string-no-properties 4) > m (org-imenu-new-marker)) > + (setq head (replace-regexp-in-string > + org-bracket-link-analytic-regexp > + "\\5" head)) > (org-add-props head nil 'org-imenu-marker m 'org-imenu t) > (if (>= level last-level) > (push (cons head m) (aref subs level)) > > > > _______________________________________________ > Emacs-orgmode mailing list > Remember: use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode