[PATCH] emacs: stash bugfix

[PATCH] emacs: stash bugfix

[Mark Walters]

Currently an attempt to stash a non-existent field (eg cc when not
present) throws an error. Catch this case and give the user a warning
message.

---
While messing around with notmuch-pick key bindings I found the
following bug. The easiest way I have found to trigger it is cc
(stash-cc) in show mode on a message with no cc header.

Best wishes

Mark

 emacs/notmuch-lib.el |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 1d0ec17..c7d8e02 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -183,8 +183,11 @@ user-friendly queries."
 
 (defun notmuch-common-do-stash (text)
   "Common function to stash text in kill ring, and display in minibuffer."
-  (kill-new text)
-  (message "Stashed: %s" text))
+  (if text
+      (progn
+	(kill-new text)
+	(message "Stashed: %s" text))
+    (message "Warning: Nothing to stash!")))
 
 ;;
 
-- 
1.7.9.1

Re: [PATCH] emacs: stash bugfix

[Tomi Ollila]

On Sun, Dec 02 2012, Mark Walters <markwalters1009@gmail.com> wrote:

> Currently an attempt to stash a non-existent field (eg cc when not
> present) throws an error. Catch this case and give the user a warning
> message.
>
> ---

LGTM.

Tomi


> While messing around with notmuch-pick key bindings I found the
> following bug. The easiest way I have found to trigger it is cc
> (stash-cc) in show mode on a message with no cc header.
>
> Best wishes
>
> Mark
>
>  emacs/notmuch-lib.el |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
> index 1d0ec17..c7d8e02 100644
> --- a/emacs/notmuch-lib.el
> +++ b/emacs/notmuch-lib.el
> @@ -183,8 +183,11 @@ user-friendly queries."
>  
>  (defun notmuch-common-do-stash (text)
>    "Common function to stash text in kill ring, and display in minibuffer."
> -  (kill-new text)
> -  (message "Stashed: %s" text))
> +  (if text
> +      (progn
> +	(kill-new text)
> +	(message "Stashed: %s" text))
> +    (message "Warning: Nothing to stash!")))
>  
>  ;;
>  
> -- 
> 1.7.9.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] emacs: stash bugfix

[Austin Clements]

Quoth Mark Walters on Dec 02 at 10:11 am:
> Currently an attempt to stash a non-existent field (eg cc when not
> present) throws an error. Catch this case and give the user a warning
> message.
> 
> ---
> While messing around with notmuch-pick key bindings I found the
> following bug. The easiest way I have found to trigger it is cc
> (stash-cc) in show mode on a message with no cc header.
> 
> Best wishes
> 
> Mark
> 
>  emacs/notmuch-lib.el |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
> index 1d0ec17..c7d8e02 100644
> --- a/emacs/notmuch-lib.el
> +++ b/emacs/notmuch-lib.el
> @@ -183,8 +183,11 @@ user-friendly queries."
>  
>  (defun notmuch-common-do-stash (text)
>    "Common function to stash text in kill ring, and display in minibuffer."
> -  (kill-new text)
> -  (message "Stashed: %s" text))
> +  (if text
> +      (progn
> +	(kill-new text)
> +	(message "Stashed: %s" text))
> +    (message "Warning: Nothing to stash!")))

Without the unnecessary "Warning:" bit of the message, LGTM.

Re: [PATCH] emacs: stash bugfix

[Mark Walters]

On Mon, 03 Dec 2012, Austin Clements <amdragon@MIT.EDU> wrote:
> Quoth Mark Walters on Dec 02 at 10:11 am:
>> Currently an attempt to stash a non-existent field (eg cc when not
>> present) throws an error. Catch this case and give the user a warning
>> message.
>> 
>> ---
>> While messing around with notmuch-pick key bindings I found the
>> following bug. The easiest way I have found to trigger it is cc
>> (stash-cc) in show mode on a message with no cc header.
>> 
>> Best wishes
>> 
>> Mark
>> 
>>  emacs/notmuch-lib.el |    7 +++++--
>>  1 files changed, 5 insertions(+), 2 deletions(-)
>> 
>> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
>> index 1d0ec17..c7d8e02 100644
>> --- a/emacs/notmuch-lib.el
>> +++ b/emacs/notmuch-lib.el
>> @@ -183,8 +183,11 @@ user-friendly queries."
>>  
>>  (defun notmuch-common-do-stash (text)
>>    "Common function to stash text in kill ring, and display in minibuffer."
>> -  (kill-new text)
>> -  (message "Stashed: %s" text))
>> +  (if text
>> +      (progn
>> +	(kill-new text)
>> +	(message "Stashed: %s" text))
>> +    (message "Warning: Nothing to stash!")))
>
> Without the unnecessary "Warning:" bit of the message, LGTM.

I am obviously happy to remove the "warning": however do you think
stashing a non-existent thing should empty the kill-ring? I am a little
worried about someone stashing something, not noticing the "nothing to
stash" and then pasting some random thing somewhere (eg something
private into irc).

Best wishes

Mark

Re: [PATCH] emacs: stash bugfix

[Austin Clements]

Quoth Mark Walters on Dec 03 at  9:27 am:
> 
> On Mon, 03 Dec 2012, Austin Clements <amdragon@MIT.EDU> wrote:
> > Quoth Mark Walters on Dec 02 at 10:11 am:
> >> Currently an attempt to stash a non-existent field (eg cc when not
> >> present) throws an error. Catch this case and give the user a warning
> >> message.
> >> 
> >> ---
> >> While messing around with notmuch-pick key bindings I found the
> >> following bug. The easiest way I have found to trigger it is cc
> >> (stash-cc) in show mode on a message with no cc header.
> >> 
> >> Best wishes
> >> 
> >> Mark
> >> 
> >>  emacs/notmuch-lib.el |    7 +++++--
> >>  1 files changed, 5 insertions(+), 2 deletions(-)
> >> 
> >> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
> >> index 1d0ec17..c7d8e02 100644
> >> --- a/emacs/notmuch-lib.el
> >> +++ b/emacs/notmuch-lib.el
> >> @@ -183,8 +183,11 @@ user-friendly queries."
> >>  
> >>  (defun notmuch-common-do-stash (text)
> >>    "Common function to stash text in kill ring, and display in minibuffer."
> >> -  (kill-new text)
> >> -  (message "Stashed: %s" text))
> >> +  (if text
> >> +      (progn
> >> +	(kill-new text)
> >> +	(message "Stashed: %s" text))
> >> +    (message "Warning: Nothing to stash!")))
> >
> > Without the unnecessary "Warning:" bit of the message, LGTM.
> 
> I am obviously happy to remove the "warning": however do you think
> stashing a non-existent thing should empty the kill-ring? I am a little
> worried about someone stashing something, not noticing the "nothing to
> stash" and then pasting some random thing somewhere (eg something
> private into irc).

Mm, interesting.  I don't think you want to empty the kill-ring
because there may be useful things earlier in it.  You could clear out
the window system selection directly, but that's probably flaky and
doesn't help if you're copying around within Emacs.  What about
(kill-new "")?  Then the function would always put something on the
kill-ring (and clipboard/selection/whatever) but it would be harmless
if there was nothing to stash.

[PATCH v2] emacs: stash bugfix

[Mark Walters]

Currently an attempt to stash a non-existent field (eg cc when not
present) throws an error. Catch this case and give the user a warning
message.
---

This fixes the comment and stashes an empty string in the
case there is nothing to stash (both suggested by Austin).


 emacs/notmuch-lib.el |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 1d0ec17..5c44867 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -183,8 +183,14 @@ user-friendly queries."
 
 (defun notmuch-common-do-stash (text)
   "Common function to stash text in kill ring, and display in minibuffer."
-  (kill-new text)
-  (message "Stashed: %s" text))
+  (if text
+      (progn
+	(kill-new text)
+	(message "Stashed: %s" text))
+    ;; There is nothing to stash so stash an empty string so the user
+    ;; doesn't accidentally paste something else somewhere.
+    (kill-new "")
+    (message "Nothing to stash!")))
 
 ;;
 
-- 
1.7.9.1

Re: [PATCH v2] emacs: stash bugfix

[Austin Clements]

LGTM.

On Wed, 05 Dec 2012, Mark Walters <markwalters1009@gmail.com> wrote:
> Currently an attempt to stash a non-existent field (eg cc when not
> present) throws an error. Catch this case and give the user a warning
> message.
> ---
>
> This fixes the comment and stashes an empty string in the
> case there is nothing to stash (both suggested by Austin).
>
>
>  emacs/notmuch-lib.el |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
> index 1d0ec17..5c44867 100644
> --- a/emacs/notmuch-lib.el
> +++ b/emacs/notmuch-lib.el
> @@ -183,8 +183,14 @@ user-friendly queries."
>  
>  (defun notmuch-common-do-stash (text)
>    "Common function to stash text in kill ring, and display in minibuffer."
> -  (kill-new text)
> -  (message "Stashed: %s" text))
> +  (if text
> +      (progn
> +	(kill-new text)
> +	(message "Stashed: %s" text))
> +    ;; There is nothing to stash so stash an empty string so the user
> +    ;; doesn't accidentally paste something else somewhere.
> +    (kill-new "")
> +    (message "Nothing to stash!")))
>  
>  ;;
>  
> -- 
> 1.7.9.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH v2] emacs: stash bugfix

[David Bremner]

Mark Walters <markwalters1009@gmail.com> writes:

> Currently an attempt to stash a non-existent field (eg cc when not
> present) throws an error. Catch this case and give the user a warning
> message.

pushed,

d