emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Addition of default-description parameter to org-insert-link
@ 2011-10-26 16:47 Yuri Lenskiy
  2011-10-26 17:04 ` [Accepted] " Bastien Guerry
  0 siblings, 1 reply; 2+ messages in thread
From: Yuri Lenskiy @ 2011-10-26 16:47 UTC (permalink / raw)
  To: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 187 bytes --]

This patch, against the stable 7.7 branch version of org.el, adds a
default-description argument to org-insert-link that, if non-nil, will
become the default description.

- Yuri Lenskiy

[-- Attachment #1.2: Type: text/html, Size: 197 bytes --]

[-- Attachment #2: org.el.diff --]
[-- Type: text/plain, Size: 1506 bytes --]

diff --git a/lisp/org.el b/lisp/org.el
index c29ef11..bf6daab 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8854,7 +8854,7 @@ This command can be called in any mode to insert a link in Org-mode syntax."
   (org-load-modules-maybe)
   (org-run-like-in-org-mode 'org-insert-link))
 
-(defun org-insert-link (&optional complete-file link-location)
+(defun org-insert-link (&optional complete-file link-location default-description)
   "Insert a link.  At the prompt, enter the link.
 
 Completion can be used to insert any of the link protocol prefixes like
@@ -8890,7 +8890,10 @@ called with the link target, and the result will be the default
 link description.
 
 If the LINK-LOCATION parameter is non-nil, this value will be
-used as the link location instead of reading one interactively."
+used as the link location instead of reading one interactively.
+
+If the DEFAULT-DESCRIPTION parameter is non-nil, this value will
+be used as the default description."
   (interactive "P")
   (let* ((wcf (current-window-configuration))
 	 (region (if (org-region-active-p)
@@ -9020,6 +9023,7 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
     (if org-make-link-description-function
 	(setq desc (funcall org-make-link-description-function link desc)))
 
+    (if default-description (setq desc default-description))
     (setq desc (read-string "Description: " desc))
     (unless (string-match "\\S-" desc) (setq desc nil))
     (if remove (apply 'delete-region remove))

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Accepted] Addition of default-description parameter to org-insert-link
  2011-10-26 16:47 [PATCH] Addition of default-description parameter to org-insert-link Yuri Lenskiy
@ 2011-10-26 17:04 ` Bastien Guerry
  0 siblings, 0 replies; 2+ messages in thread
From: Bastien Guerry @ 2011-10-26 17:04 UTC (permalink / raw)
  To: emacs-orgmode

Patch 1010 (http://patchwork.newartisans.com/patch/1010/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3CCABAjAKc0XK4ZJX6Cw%3DPhWAq24EmYNwSzbDVu378XUa4JMbEr_g%40mail.gmail.com%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: [O] Addition of default-description parameter to org-insert-link
> Date: Wed, 26 Oct 2011 21:47:46 -0000
> From: Yuri Lenskiy <lenskiy@mit.edu>
> X-Patchwork-Id: 1010
> Message-Id: <CABAjAKc0XK4ZJX6Cw=PhWAq24EmYNwSzbDVu378XUa4JMbEr_g@mail.gmail.com>
> To: emacs-orgmode@gnu.org
> 
> This patch, against the stable 7.7 branch version of org.el, adds a
> default-description argument to org-insert-link that, if non-nil, will
> become the default description.
> 
> - Yuri Lenskiy
> 
> 
> diff --git a/lisp/org.el b/lisp/org.el
> index c29ef11..bf6daab 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -8854,7 +8854,7 @@ This command can be called in any mode to insert a link in Org-mode syntax."
>    (org-load-modules-maybe)
>    (org-run-like-in-org-mode 'org-insert-link))
>  
> -(defun org-insert-link (&optional complete-file link-location)
> +(defun org-insert-link (&optional complete-file link-location default-description)
>    "Insert a link.  At the prompt, enter the link.
>  
>  Completion can be used to insert any of the link protocol prefixes like
> @@ -8890,7 +8890,10 @@ called with the link target, and the result will be the default
>  link description.
>  
>  If the LINK-LOCATION parameter is non-nil, this value will be
> -used as the link location instead of reading one interactively."
> +used as the link location instead of reading one interactively.
> +
> +If the DEFAULT-DESCRIPTION parameter is non-nil, this value will
> +be used as the default description."
>    (interactive "P")
>    (let* ((wcf (current-window-configuration))
>  	 (region (if (org-region-active-p)
> @@ -9020,6 +9023,7 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
>      (if org-make-link-description-function
>  	(setq desc (funcall org-make-link-description-function link desc)))
>  
> +    (if default-description (setq desc default-description))
>      (setq desc (read-string "Description: " desc))
>      (unless (string-match "\\S-" desc) (setq desc nil))
>      (if remove (apply 'delete-region remove))
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-26 17:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-26 16:47 [PATCH] Addition of default-description parameter to org-insert-link Yuri Lenskiy
2011-10-26 17:04 ` [Accepted] " Bastien Guerry

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).