From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: [Accepted] Allow user to limit amount of context stored in file link search strings Date: Mon, 6 Dec 2010 10:06:01 +0100 (CET) Message-ID: <20101206090601.7CD2389D750@u016822.science.uva.nl> References: <87y6843wiu.fsf@fastmail.fm> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=42260 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPX1J-00055n-M0 for emacs-orgmode@gnu.org; Mon, 06 Dec 2010 04:06:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPX1H-0001KB-S8 for emacs-orgmode@gnu.org; Mon, 06 Dec 2010 04:06:05 -0500 Received: from u016822.science.uva.nl ([146.50.39.34]:52419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPX1H-0001K2-J5 for emacs-orgmode@gnu.org; Mon, 06 Dec 2010 04:06:03 -0500 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 Patch 440 (http://patchwork.newartisans.com/patch/440/) is now "Accepted". Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87y6843wiu.fsf%40fastmail.fm%3E Here is the original message containing the patch: > Content-Type: text/plain; charset="utf-8" > MIME-Version: 1.0 > Content-Transfer-Encoding: 7bit > Subject: [Orgmode] Allow user to limit amount of context stored in file link > search strings > Date: Sun, 05 Dec 2010 23:24:13 -0000 > From: Matt Lundin > X-Patchwork-Id: 440 > Message-Id: <87y6843wiu.fsf@fastmail.fm> > To: Org Mode > > * lisp/org.el: (org-make-heading-search-string) Optionally limit > number of lines stored in file link search strings. > (org-context-in-file-links) Add option to set to integer specifying > number of lines. > > --- > lisp/org.el | 19 +++++++++++++++---- > 1 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/lisp/org.el b/lisp/org.el > index 66514a2..2d769be 100644 > --- a/lisp/org.el > +++ b/lisp/org.el > @@ -1385,12 +1385,15 @@ nil Never use an ID to make a link, instead link using a text search for > (defcustom org-context-in-file-links t > "Non-nil means file links from `org-store-link' contain context. > A search string will be added to the file name with :: as separator and > -used to find the context when the link is activated by the command > -`org-open-at-point'. > +used to find the context when the link is activated by the command > +`org-open-at-point'. When this option is t, the entire active region > +will be placed in the search string of the file link. If set to a > +positive integer, only the first n lines of context will be stored. > + > Using a prefix arg to the command \\[org-store-link] (`org-store-link') > negates this setting for the duration of the command." > :group 'org-link-store > - :type 'boolean) > + :type '(choice boolean integer)) > > (defcustom org-keep-stored-link-after-insertion nil > "Non-nil means keep link in list for entire session. > @@ -8501,7 +8504,8 @@ according to FMT (default from `org-email-link-description-format')." > (defun org-make-org-heading-search-string (&optional string heading) > "Make search string for STRING or current headline." > (interactive) > - (let ((s (or string (org-get-heading)))) > + (let ((s (or string (org-get-heading))) > + (lines org-context-in-file-links)) > (unless (and string (not heading)) > ;; We are using a headline, clean up garbage in there. > (if (string-match org-todo-regexp s) > @@ -8515,6 +8519,13 @@ according to FMT (default from `org-email-link-description-format')." > (while (string-match org-ts-regexp s) > (setq s (replace-match "" t t s)))) > (or string (setq s (concat "*" s))) ; Add * for headlines > + (when (and string (integerp lines) (> lines 0)) > + (let ((slines (org-split-string s "\n"))) > + (when (< lines (length slines)) > + (setq s (mapconcat > + 'identity > + (reverse (nthcdr (- (length slines) lines) > + (reverse slines))) "\n"))))) > (mapconcat 'identity (org-split-string s "[ \t]+") " "))) > > (defun org-make-link (&rest strings) >