Multiple uploads with sieve-manage-mode (unexpected behavior)

Multiple uploads with sieve-manage-mode (unexpected behavior)

[Michael Welsh Duggan]

I have run into the following small niggling problem with
sieve-manage-mode.  If you select the active sieve script, edit it, and
then upload it (with `C-c C-c'), everything works as expected.  But
let's say that we find we find a bug in our updated script.  So, we go
back to the sieve-manage buffer, and select the script again, edit the
result, and then upload the fixed script with `C-c C-c' again.  If you
do this, you will find that the uploaded script will not be the active
sieve script.  Why?

Actually, it took me longer than it should have to figure out what was
happening here.  Let's say, for sake of argument, that the name of the
active sieve script is "sieve.siv".  After the first upload, the
"sieve.siv" buffer is buried.  When you select the active script in the
sieve manager again, the sieve-edit-script function uses
generate-new-buffer to create the buffer name.  In this case, since the
original "sieve.siv" buffer was buried, it will create a new buffer
called "sieve.siv<2>".  When this gets uploaded (with `C-c C-c'), it
gets added as a new script called "sieve.siv<2>", which is not active by
default (because there is already an active script).  Expected behavior
would have been to replace the existing active "sieve.siv" script.

Now, I am not certain what the appropriate remedy should be.  One would
be to re-use the original buffer with the same name (perhaps asking
whether that is appropriate beforehand).  Another would be to save the
sieve script name in a buffer-local variable, and only use the buffer
name if this variable is nil.  No matter what solution is chosen,
though, something should be modified, as the current behavior is
unexpected, and it is not necessarily immediate obvious what is
happening incorrectly.

-- 
Michael Welsh Duggan
(md5i@md5i.com)

Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Lars Magne Ingebrigtsen]

Michael Welsh Duggan <md5i@md5i.com> writes:

> Another would be to save the sieve script name in a buffer-local
> variable, and only use the buffer name if this variable is nil.

I think that sounds like the right solution.  I don't use sieve, so I
can't really test this.  Could you send a patch that does this?  (And do
you have FSF copyright assignment papers on file?)

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Michael Welsh Duggan]

[-- Attachment #1: Type: text/plain, Size: 955 bytes --]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> Michael Welsh Duggan <md5i@md5i.com> writes:
>
>> Another would be to save the sieve script name in a buffer-local
>> variable, and only use the buffer name if this variable is nil.
>
> I think that sounds like the right solution.  I don't use sieve, so I
> can't really test this.  Could you send a patch that does this?  (And do
> you have FSF copyright assignment papers on file?)

Patch attached.  My copyright assignment existed (would have been for
md5i@cs.cmu.edu), but I do not recall if it was for my current employer.
I used to work for the Carnegie Mellon University Language Technologies
Institute, and now I work for the Carnegie Mellon University Software
Engineering Institute.  If my assignment was for Carnegie Mellon
University, we're fine, otherwise I need new papers.

On the other hand, the patch (minus Changelog) is less than 10 lines, so
it could be considered a tiny addition.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 2848 bytes --]

From c2df5ef11741398a6465c65d60cdb8a6aec8d160 Mon Sep 17 00:00:00 2001
From: Michael Welsh Duggan <md5i@md5i.com>
Date: Mon, 3 Jan 2011 22:44:00 -0500
Subject: [PATCH] Add sieve-buffer-script-name.

---
 lisp/ChangeLog |    8 ++++++++
 lisp/sieve.el  |   15 ++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 075833e..3d93dd8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-04  Michael Welsh Duggan  <md5i@md5i.com>
+
+	* sieve.el (sieve-buffer-script-name): New variable.
+	(sieve-edit-script): Set sieve-buffer-script-name to the
+	name of the sieve script.  Use substitute-command-keys.
+	(sieve-upload): Use sieve-buffer-script-name if set.  Use
+	substitute-command-keys.
+
 2011-01-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* mm-view.el (mml-smime): Require.
diff --git a/lisp/sieve.el b/lisp/sieve.el
index ca181c2..2bc042e 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -1,6 +1,7 @@
 ;;; sieve.el --- Utilities to manage sieve scripts
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
@@ -98,6 +99,7 @@ require \"fileinto\";
 
 (defvar sieve-manage-buffer nil)
 (defvar sieve-buffer-header-end nil)
+(defvar sieve-buffer-script-name nil)
 
 ;; Sieve-manage mode:
 
@@ -204,7 +206,9 @@ require \"fileinto\";
       (switch-to-buffer (get-buffer-create "template.siv"))
       (insert sieve-template))
     (sieve-mode)
-    (message "Press C-c C-l to upload script to server.")))
+    (set (make-local-variable 'sieve-buffer-script-name) name)
+    (message "%s" (substitute-command-keys
+                   "Press \\[sieve-upload] to upload script to server."))))
 
 (defmacro sieve-change-region (&rest body)
   "Turns off sieve-region before executing BODY, then re-enables it after.
@@ -363,14 +367,15 @@ Server  : " server ":" (or port "2000") "
 (defun sieve-upload (&optional name)
   (interactive)
   (unless name
-    (setq name (buffer-name)))
+    (setq name (or sieve-buffer-script-name (buffer-name))))
   (when (or (get-buffer sieve-buffer) (call-interactively 'sieve-manage))
     (let ((script (buffer-string)) err)
       (with-current-buffer (get-buffer sieve-buffer)
 	(setq err (sieve-manage-putscript name script sieve-manage-buffer))
 	(if (sieve-manage-ok-p err)
-	    (message (concat
-		      "Sieve upload done.  Use `C-c RET' to manage scripts."))
+	    (message "%s"
+             (substitute-command-keys
+              "Sieve upload done.  Use \\[sieve-manage] to manage scripts."))
 	  (message "Sieve upload failed: %s" (nth 2 err)))))))
 
 ;;;###autoload
-- 
1.7.2.3


[-- Attachment #3: Type: text/plain, Size: 42 bytes --]


-- 
Michael Welsh Duggan
(md5i@md5i.com)

Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Lars Magne Ingebrigtsen]

Michael Welsh Duggan <md5i@md5i.com> writes:

> Patch attached.  My copyright assignment existed (would have been for
> md5i@cs.cmu.edu), but I do not recall if it was for my current employer.
> I used to work for the Carnegie Mellon University Language Technologies
> Institute, and now I work for the Carnegie Mellon University Software
> Engineering Institute.  If my assignment was for Carnegie Mellon
> University, we're fine, otherwise I need new papers.

I've Cc'd this to copyright-clerk@fsf.org to get a clarification.

Does Michael Welsh Duggan, working for Carnegie Mellon University
Software Engineering Institute, have copyright assignment papers on file
for Emacs and/or Gnus?

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Michael Welsh Duggan]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> Michael Welsh Duggan <md5i@md5i.com> writes:
>
>> Patch attached.  My copyright assignment existed (would have been for
>> md5i@cs.cmu.edu), but I do not recall if it was for my current employer.
>> I used to work for the Carnegie Mellon University Language Technologies
>> Institute, and now I work for the Carnegie Mellon University Software
>> Engineering Institute.  If my assignment was for Carnegie Mellon
>> University, we're fine, otherwise I need new papers.
>
> I've Cc'd this to copyright-clerk@fsf.org to get a clarification.
>
> Does Michael Welsh Duggan, working for Carnegie Mellon University
> Software Engineering Institute, have copyright assignment papers on file
> for Emacs and/or Gnus?

Any word on this?

-- 
Michael Welsh Duggan
(md5i@md5i.com)

Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Lars Ingebrigtsen]

Michael Welsh Duggan <md5i@md5i.com> writes:

> Any word on this?

I haven't heard back from the copyright clerk.  Could you try inquiring?

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Julien Danjou]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

On Tue, Jan 25 2011, Lars Ingebrigtsen wrote:

> I haven't heard back from the copyright clerk.  Could you try
> inquiring?

Lars, seeing the size of the patch, that could be a tiny change anyhow,
couldn't it?

-- 
Julien Danjou
❱ http://julien.danjou.info

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Lars Ingebrigtsen]

Julien Danjou <julien@danjou.info> writes:

> Lars, seeing the size of the patch, that could be a tiny change anyhow,
> couldn't it?

Yes, but he has other tiny changes in (I think), so it might push the
size over the limit...

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

[gnu.org #657185] Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Donald R Robertson III via RT]

> [larsi@gnus.org - Tue Jan 11 14:42:13 2011]:
> 
> Michael Welsh Duggan <md5i@md5i.com> writes:
> 
> > Patch attached.  My copyright assignment existed (would have been for
> > md5i@cs.cmu.edu), but I do not recall if it was for my current employer.
> > I used to work for the Carnegie Mellon University Language Technologies
> > Institute, and now I work for the Carnegie Mellon University Software
> > Engineering Institute.  If my assignment was for Carnegie Mellon
> > University, we're fine, otherwise I need new papers.
> 
> I've Cc'd this to copyright-clerk@fsf.org to get a clarification.
> 
> Does Michael Welsh Duggan, working for Carnegie Mellon University
> Software Engineering Institute, have copyright assignment papers on file
> for Emacs and/or Gnus?

I am sorry, it appears that I have overlooked this request. We do have an assignment for Michael, but his 
disclaimer on file is for Schenley Park Research, Inc. If he is employed to do programming at Carnegie Mellon now, 
then we should get an updated disclaimer. I have included a copy of our disclaimer form at the bottom of this 
email. Just print it out, have it sign, and send us a scanned copy. It shouldn't be too much of an issue getting 
the disclaimer, I hope, as Carnegie Mellon has signed several in recent years.

> 
> 
> 
-- 
Sincerely,

Donald R. Robertson, III, J.D.
Assignment Administrator
Free Software Foundation
51 Franklin Street, Fifth Floor
Boston, MA 02110
Phone +1-617-542-5942 
Fax +1-617-542-2652

---


If you are employed to do programming (even at a university), or have
made an agreement with your employer or school saying it owns programs
you write, then you and we need a signed piece of paper from your
employer disclaiming rights to the program.

Here is a disclaimer your employer can sign to cover your future
changes to GNU software, as well as your past changes.

The disclaimer should be signed by a vice president or general manager
of the company.  If you can't get at them, anyone else authorized to
issue licenses for software produced there will do.

Much of this disclaimer consists of a description of which kinds of
work it applies to.  This description is just a suggestion--your
employer can replace it with any description that says clearly which
kinds of work they want to disclaim and which kinds they don't.
Paragraph (b) is optional; they can delete it if they wish.

If your employer says they do have a claim that could conflict with
the use of the program, then please put us in touch with a suitable
representative of the company, so that we can negotiate what to do
about it.  Send a note about the issue to the company representative
and to assign@gnu.org.

IMPORTANT: When you talk to your employer, *no matter what
instructions they have given you*, don't fail to show them the sample
disclaimer below, or a disclaimer with the details filled in for your
specific case.  Companies are usually willing to sign a disclaimer
without any fuss.  If you make your request less specific, you may
cloud the issue and cause a long and unnecessary delay.

Please keep a copy of the employer's signed disclaimer, and snail the
original to us at

Attn:

Assignment Administrator
Free Software foundation
51 Franklin Street, Fifth Floor
Boston, MA 02110




                   EMPLOYER DISCLAIMER OF RIGHTS

   We agree that software and other authored works of the 'Released
Category' (defined below), made by our employee/consultant,
_______________________, prior to the date of this document, and for
_____ years thereafter, are freely assignable by said
employee/consultant to Free Software Foundation (FSF) for distribution
and sharing under its free software policies.  We disclaim any status
as the author or owner of such works; we do not consider them as works
made for hire for us.

   The Released Category comprises

(a) changes and enhancements to software already (as of the time such
change or enhancement is made) freely circulating under stated terms
permitting public redistribution, whether in the public domain, or
under the FSF's GNU General Public License, or under the FSF's GNU
Lesser General Public License (a.k.a. the GNU Library General Public
License), or under other such terms; and

(b) operating system components for operating systems providing
substantially the same functionality as portions of UNIX, BSD,
Microsoft Windows, or other popular operating systems.

The Released Category excludes ______________________ [if 'none',
please so state; thank you--FSF].

   We affirm that we will do nothing in the future to undermine this
release.  If we have or acquire hereafter any patent or interface
copyright or other proprietary interest dominating the works, or
the programs to which these works constitute changes and enhancements,
or use of those programs, then the Free Software Foundation and the
general public will be permanently and irrevocably licensed to use,
in these works and in the programs they enhance, without royalty or
limitation, the subject matter of the dominating interest.

   We make no warranty as to the quality of the material or as to
the presence or absence of rights therein of any other party, and we
do not purport to disclaim, release or grant any rights other than our
own.

   Given as a sealed instrument this ___ day of ______, 20__.    

             
 signed:___________________________,

        ___________________________ (please print your name)

	___________________________ (title)

        ___________________________ (company name),

Re: [gnu.org #657185] Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Michael Welsh Duggan]

"Donald R Robertson III via RT" <copyright-clerk@fsf.org> writes:

>> [larsi@gnus.org - Tue Jan 11 14:42:13 2011]:
>> 
>> Michael Welsh Duggan <md5i@md5i.com> writes:
>> 
>> > Patch attached.  My copyright assignment existed (would have been for
>> > md5i@cs.cmu.edu), but I do not recall if it was for my current employer.
>> > I used to work for the Carnegie Mellon University Language Technologies
>> > Institute, and now I work for the Carnegie Mellon University Software
>> > Engineering Institute.  If my assignment was for Carnegie Mellon
>> > University, we're fine, otherwise I need new papers.
>> 
>> I've Cc'd this to copyright-clerk@fsf.org to get a clarification.
>> 
>> Does Michael Welsh Duggan, working for Carnegie Mellon University
>> Software Engineering Institute, have copyright assignment papers on file
>> for Emacs and/or Gnus?
>
> I am sorry, it appears that I have overlooked this request. We do have
> an assignment for Michael, but his disclaimer on file is for Schenley
> Park Research, Inc. If he is employed to do programming at Carnegie
> Mellon now, then we should get an updated disclaimer. I have included
> a copy of our disclaimer form at the bottom of this email. Just print
> it out, have it sign, and send us a scanned copy. It shouldn't be too
> much of an issue getting the disclaimer, I hope, as Carnegie Mellon
> has signed several in recent years.

Longer ago that I had thought.  Unfortunately, I have been unable to get
a broad disclaimer from CMU.  They are only willing to sign specific
disclaimers for specific pieces of work.  The piece I was going to
contribute has since been rewritten by someone else (thankfully), but I
am sad that it will be difficult for me to submit further code due the
policy I am running into.

-- 
Michael Welsh Duggan
(md5i@md5i.com)

[gnu.org #657185] Re: Multiple uploads with sieve-manage-mode (unexpected behavior)

[Donald R Robertson III via RT]

> [md5i@md5i.com - Thu Apr 07 18:24:41 2011]:
> 
> "Donald R Robertson III via RT" <copyright-clerk@fsf.org> writes:
> 
> >> [larsi@gnus.org - Tue Jan 11 14:42:13 2011]:
> >>
> >> Michael Welsh Duggan <md5i@md5i.com> writes:
> >>
> >> > Patch attached.  My copyright assignment existed (would have been
> for
> >> > md5i@cs.cmu.edu), but I do not recall if it was for my current
> employer.
> >> > I used to work for the Carnegie Mellon University Language
> Technologies
> >> > Institute, and now I work for the Carnegie Mellon University
> Software
> >> > Engineering Institute.  If my assignment was for Carnegie Mellon
> >> > University, we're fine, otherwise I need new papers.
> >>
> >> I've Cc'd this to copyright-clerk@fsf.org to get a clarification.
> >>
> >> Does Michael Welsh Duggan, working for Carnegie Mellon University
> >> Software Engineering Institute, have copyright assignment papers on
> file
> >> for Emacs and/or Gnus?
> >
> > I am sorry, it appears that I have overlooked this request. We do
> have
> > an assignment for Michael, but his disclaimer on file is for
> Schenley
> > Park Research, Inc. If he is employed to do programming at Carnegie
> > Mellon now, then we should get an updated disclaimer. I have
> included
> > a copy of our disclaimer form at the bottom of this email. Just
> print
> > it out, have it sign, and send us a scanned copy. It shouldn't be
> too
> > much of an issue getting the disclaimer, I hope, as Carnegie Mellon
> > has signed several in recent years.
> 
> Longer ago that I had thought.  Unfortunately, I have been unable to
> get
> a broad disclaimer from CMU.  They are only willing to sign specific
> disclaimers for specific pieces of work.  The piece I was going to
> contribute has since been rewritten by someone else (thankfully), but
> I
> am sad that it will be difficult for me to submit further code due the
> policy I am running into.

I am surprised to hear that. We have many disclaimers and assignments from the university from 
over the years, so it is disappointing to hear that they have changed course. Please let me know 
if there is anything I could do to help smooth the situation over. Thank you for your time.

> 
> 
> 
-- 
Sincerely,

Donald R. Robertson, III, J.D.
Assignment Administrator
Free Software Foundation
51 Franklin Street, Fifth Floor
Boston, MA 02110
Phone +1-617-542-5942 
Fax +1-617-542-2652

---