Re: [O] [PATCH] Consistently use `org-mac-paste-applescript-links' in org-mac-links

[Alan Schmitt]

On 2015-09-08 17:50, Nicolas Goaziou  writes:

> Hello,
>
> Alan Schmitt  writes:
>
>> I do not know how to write the changelog when the same change happens
>> over many different functions. Please tell me if I need to change the
>> commit message.
>
> [...]
>
>>
>> * contrib/lisp/org-mac-link.el (org-mac-firefox-get-frontmost-url):
>> Replace the handling of AppleScript results code with
>> `org-mac-paste-applescript-links'.
>> (org-mac-vimperator-get-frontmost-url): Replace the handling of
>> AppleScript results code with `org-mac-paste-applescript-links'.
>> (org-mac-chrome-get-frontmost-url): Replace the handling of AppleScript
>> results code with `org-mac-paste-applescript-links'.
>> (org-mac-skim-get-page): Replace the handling of AppleScript results
>> code with `org-mac-paste-applescript-links'.
>> (org-mac-outlook-message-get-links): Replace the handling of AppleScript
>> results code with `org-mac-paste-applescript-links'.
>> (org-mac-devonthink-get-links): Replace the handling of AppleScript
>> results code with `org-mac-paste-applescript-links'.
>
> IMO, it should be
>
> * contrib/lisp/org-mac-link.el (org-mac-firefox-get-frontmost-url)
> (org-mac-vimperator-get-frontmost-url)
> (org-mac-chrome-get-frontmost-url)
> ...
> (org-mac-devonthink-get-links): Replace the handling of AppleScript
> results code with `org-mac-paste-applescript-links'.

Here is a patch with fixed message. I can push it myself if you want.

Best,

Alan

From 83201ef720c0cc67acf01cc15c2929beaaa5c7f0 Mon Sep 17 00:00:00 2001
From: Alan Schmitt 
Date: Tue, 8 Sep 2015 10:03:56 +0200
Subject: [PATCH] org-mac-link.el: Factorize code

* contrib/lisp/org-mac-link.el (org-mac-firefox-get-frontmost-url)
(org-mac-vimperator-get-frontmost-url)
(org-mac-chrome-get-frontmost-url)
(org-mac-skim-get-page)
(org-mac-outlook-message-get-links)
(org-mac-devonthink-get-links): Replace the handling of AppleScript
results code with `org-mac-paste-applescript-links'.

This fixes some bugs where links would have a dangling quote at the end.
---
 contrib/lisp/org-mac-link.el | 93 
 1 file changed, 16 insertions(+), 77 deletions(-)

diff --git a/contrib/lisp/org-mac-link.el b/contrib/lisp/org-mac-link.el
index c991dfa..5e0f891 100644
--- a/contrib/lisp/org-mac-link.el
+++ b/contrib/lisp/org-mac-link.el
@@ -1,6 +1,6 @@
 ;;; org-mac-link.el --- Insert org-mode links to items selected in various Mac apps
 ;;
-;; Copyright (c) 2010-2014 Free Software Foundation, Inc.
+;; Copyright (c) 2010-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: Anthony Lander 
 ;;  John Wiegley 
@@ -18,6 +18,10 @@
 ;; Author: Mike McLean 
 ;; Add support for Microsoft Outlook for Mac as Org mode links
 ;;
+;; Version: 1.3
+;; Author: Alan Schmitt 
+;; Consistently use `org-mac-paste-applescript-links'
+;; 
 ;; This file is not part of GNU Emacs.
 ;;
 ;; This program is free software; you can redistribute it and/or modify
@@ -299,15 +303,7 @@ The links are of the form ::split::."
 (defun org-mac-firefox-get-frontmost-url ()
   (interactive)
   (message "Applescript: Getting Firefox url...")
-  (let* ((url-and-title (org-as-mac-firefox-get-frontmost-url))
- (split-link (split-string url-and-title "::split::"))
- (URL (car split-link))
- (description (cadr split-link))
- (org-link))
-(when (not (string= URL ""))
-  (setq org-link (org-make-link-string URL description)))
-(kill-new org-link)
-org-link))
+  (org-mac-paste-applescript-links (org-as-mac-firefox-get-frontmost-url)))
 
 (defun org-mac-firefox-insert-frontmost-url ()
   (interactive)
@@ -345,15 +341,7 @@ The links are of the form ::split::."
 (defun org-mac-vimperator-get-frontmost-url ()
   (interactive)
   (message "Applescript: Getting Vimperator url...")
-  (let* ((url-and-title (org-as-mac-vimperator-get-frontmost-url))
- (split-link (split-string url-and-title "::split::"))
- (URL (car split-link))
- (description (cadr split-link))
- (org-link))
-(when (not (string= URL ""))
-  (setq org-link (org-make-link-string URL description)))
-(kill-new org-link)
-org-link))
+  (org-mac-paste-applescript-links (org-as-mac-vimperator-get-frontmost-url)))
 
 (defun org-mac-vimperator-insert-frontmost-url ()
   (interactive)
@@ -383,15 +371,7 @@ The links are of the form ::split::."
 (defun org-mac-chrome-get-frontmost-url ()
   (interactive)
   (message "Applescript: Getting Chrome url...")
-  (let* ((url-and-title (org-as-mac-chrome-get-frontmost-url))
- (split-link (split-string url-and-title "::split::"))
- (URL (car split-link))
- (description (cadr split-link))
- (org-link))
-(when (not (string= URL ""))
-  (setq org-link (org-make-link-string URL 

Re: [O] [PATCH] Consistently use `org-mac-paste-applescript-links' in org-mac-links

[Nicolas Goaziou]

Alan Schmitt  writes:

> Here is a patch with fixed message. I can push it myself if you want.

Please be my guest. Thank you.


Regards,

Re: [O] [PATCH] Consistently use `org-mac-paste-applescript-links' in org-mac-links

[Alan Schmitt]

On 2015-09-09 13:38, Nicolas Goaziou  writes:

> Alan Schmitt  writes:
>
>> Here is a patch with fixed message. I can push it myself if you want.
>
> Please be my guest. Thank you.

Pushed.

Alan

-- 
OpenPGP Key ID : 040D0A3B4ED2E5C7
Last week athmospheric CO₂ average (Updated September 6, 2015, Mauna Loa Obs.):
377.86 ppm


signature.asc
Description: PGP signature

[O] [PATCH] Consistently use `org-mac-paste-applescript-links' in org-mac-links

[Alan Schmitt]

Hello,

The attached patch simplifies the code in org-mac-links to always use
`org-mac-paste-applescript-links' when parsing the results returned from
AppleScript. As a side effect, it gets rid of the bug where the link or
description would have an extra quote at the end.

I do not know how to write the changelog when the same change happens
over many different functions. Please tell me if I need to change the
commit message.

Alan

From 64385400360dea961cf8497db75738d583c177a8 Mon Sep 17 00:00:00 2001
From: Alan Schmitt 
Date: Tue, 8 Sep 2015 10:03:56 +0200
Subject: [PATCH] org-mac-link.el: Consistently use
 `org-mac-paste-applescript-links'

* contrib/lisp/org-mac-link.el (org-mac-firefox-get-frontmost-url):
Replace the handling of AppleScript results code with
`org-mac-paste-applescript-links'.
(org-mac-vimperator-get-frontmost-url): Replace the handling of
AppleScript results code with `org-mac-paste-applescript-links'.
(org-mac-chrome-get-frontmost-url): Replace the handling of AppleScript
results code with `org-mac-paste-applescript-links'.
(org-mac-skim-get-page): Replace the handling of AppleScript results
code with `org-mac-paste-applescript-links'.
(org-mac-outlook-message-get-links): Replace the handling of AppleScript
results code with `org-mac-paste-applescript-links'.
(org-mac-devonthink-get-links): Replace the handling of AppleScript
results code with `org-mac-paste-applescript-links'.

This fixes some bugs where links would have a dangling quote at the end.
---
 contrib/lisp/org-mac-link.el | 93 
 1 file changed, 16 insertions(+), 77 deletions(-)

diff --git a/contrib/lisp/org-mac-link.el b/contrib/lisp/org-mac-link.el
index c991dfa..5e0f891 100644
--- a/contrib/lisp/org-mac-link.el
+++ b/contrib/lisp/org-mac-link.el
@@ -1,6 +1,6 @@
 ;;; org-mac-link.el --- Insert org-mode links to items selected in various Mac apps
 ;;
-;; Copyright (c) 2010-2014 Free Software Foundation, Inc.
+;; Copyright (c) 2010-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: Anthony Lander 
 ;;  John Wiegley 
@@ -18,6 +18,10 @@
 ;; Author: Mike McLean 
 ;; Add support for Microsoft Outlook for Mac as Org mode links
 ;;
+;; Version: 1.3
+;; Author: Alan Schmitt 
+;; Consistently use `org-mac-paste-applescript-links'
+;; 
 ;; This file is not part of GNU Emacs.
 ;;
 ;; This program is free software; you can redistribute it and/or modify
@@ -299,15 +303,7 @@ The links are of the form ::split::."
 (defun org-mac-firefox-get-frontmost-url ()
   (interactive)
   (message "Applescript: Getting Firefox url...")
-  (let* ((url-and-title (org-as-mac-firefox-get-frontmost-url))
- (split-link (split-string url-and-title "::split::"))
- (URL (car split-link))
- (description (cadr split-link))
- (org-link))
-(when (not (string= URL ""))
-  (setq org-link (org-make-link-string URL description)))
-(kill-new org-link)
-org-link))
+  (org-mac-paste-applescript-links (org-as-mac-firefox-get-frontmost-url)))
 
 (defun org-mac-firefox-insert-frontmost-url ()
   (interactive)
@@ -345,15 +341,7 @@ The links are of the form ::split::."
 (defun org-mac-vimperator-get-frontmost-url ()
   (interactive)
   (message "Applescript: Getting Vimperator url...")
-  (let* ((url-and-title (org-as-mac-vimperator-get-frontmost-url))
- (split-link (split-string url-and-title "::split::"))
- (URL (car split-link))
- (description (cadr split-link))
- (org-link))
-(when (not (string= URL ""))
-  (setq org-link (org-make-link-string URL description)))
-(kill-new org-link)
-org-link))
+  (org-mac-paste-applescript-links (org-as-mac-vimperator-get-frontmost-url)))
 
 (defun org-mac-vimperator-insert-frontmost-url ()
   (interactive)
@@ -383,15 +371,7 @@ The links are of the form ::split::."
 (defun org-mac-chrome-get-frontmost-url ()
   (interactive)
   (message "Applescript: Getting Chrome url...")
-  (let* ((url-and-title (org-as-mac-chrome-get-frontmost-url))
- (split-link (split-string url-and-title "::split::"))
- (URL (car split-link))
- (description (cadr split-link))
- (org-link))
-(when (not (string= URL ""))
-  (setq org-link (org-make-link-string URL description)))
-(kill-new org-link)
-org-link))
+  (org-mac-paste-applescript-links (org-as-mac-chrome-get-frontmost-url)))
 
 (defun org-mac-chrome-insert-frontmost-url ()
   (interactive)
@@ -557,15 +537,7 @@ The links are of the form ::split::."
 (defun org-mac-skim-get-page ()
   (interactive)
   (message "Applescript: Getting Skim page link...")
-  (let* ((link-and-descr (as-get-skim-page-link))
- (split-link (split-string link-and-descr "::split::"))
- (link (car split-link))
- (description (cadr split-link))
- (org-link))
-(when (not (string= 

Re: [O] [PATCH] Consistently use `org-mac-paste-applescript-links' in org-mac-links

[Nicolas Goaziou]

Hello,

Alan Schmitt  writes:

> I do not know how to write the changelog when the same change happens
> over many different functions. Please tell me if I need to change the
> commit message.

[...]

>
> * contrib/lisp/org-mac-link.el (org-mac-firefox-get-frontmost-url):
> Replace the handling of AppleScript results code with
> `org-mac-paste-applescript-links'.
> (org-mac-vimperator-get-frontmost-url): Replace the handling of
> AppleScript results code with `org-mac-paste-applescript-links'.
> (org-mac-chrome-get-frontmost-url): Replace the handling of AppleScript
> results code with `org-mac-paste-applescript-links'.
> (org-mac-skim-get-page): Replace the handling of AppleScript results
> code with `org-mac-paste-applescript-links'.
> (org-mac-outlook-message-get-links): Replace the handling of AppleScript
> results code with `org-mac-paste-applescript-links'.
> (org-mac-devonthink-get-links): Replace the handling of AppleScript
> results code with `org-mac-paste-applescript-links'.

IMO, it should be

* contrib/lisp/org-mac-link.el (org-mac-firefox-get-frontmost-url)
(org-mac-vimperator-get-frontmost-url)
(org-mac-chrome-get-frontmost-url)
...
(org-mac-devonthink-get-links): Replace the handling of AppleScript
results code with `org-mac-paste-applescript-links'.

Regards,

-- 
Nicolas Goaziou