emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bernt Hansen <bernt@norang.ca>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Wash output of org-encrypt-entry, take 3
Date: Sun, 20 Mar 2011 17:10:49 -0400	[thread overview]
Message-ID: <8739mhebvq.fsf@norang.ca> (raw)
In-Reply-To: <87bp182hiw.fsf@wanadoo.es> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Fri, 18 Mar 2011 23:25:11 +0100")

Óscar Fuentes <ofv@wanadoo.es> writes:

> With a gpg executable with default settings, org-encrypt-entry produces
> output like this:
>
>  -----BEGIN PGP MESSAGE-----
>  Version: GnuPG v1.4.10 (GNU/Linux)
>
>  jA0EAwMCBWZVym6QMPVgyTxreTb1AEL3uTO+qCh2lR9/Qxk4nEMpPr9/RwNk95Gb
>  slUra9X+N+qSWghEHvvxY0Ol8Yw9Ko4n7JVhHFs=
>  =E4vw
>  -----END PGP MESSAGE-----
>
> The first line (Version:...) can change from machine to machine and over
> time (as gpg is updated with a new version.) This is problematic when
> the file is stored under version control, because as you decrypt and
> encrypt an entry that line will change and create differences among the
> file on the workspace and the file stored on VC.
>
> Second, the empty line just wastes space and it is plain ugly once we
> remove the first one with the Version text.
>
> Finally, on some systems (mostly Windows) depending on how your Emacs
> and gpg are configured, ^M characters may appear at the end of every
> line of gpg output once it is inserted on the Emacs buffer. This happens
> when the buffer uses Unix line-endings but gpg uses DOS line-endings.
>
> The patch removes all that junk from the encrypted text just before it
> is inserted on the buffer.
>
> I'm assuming that the transformations made by this patch are
> uncontroversial and desirable. If anyone actually prefers to keep that
> noise on his encrypted org entries, an alternative implementation that
> uses a configurable list of regexps is trivial to implement, but then
> every user would have to do some job for achieving the same result.

<patch snipped>

Other than the typo in the docstring this patch seems to work as
advertised with my minimal testing on GNU Emacs 23.2.1
(i486-pc-linux-gnu, GTK+ Version 2.20.0) of 2010-12-11 on raven,
modified by Debian

Regards,
-- 
Bernt

  parent reply	other threads:[~2011-03-20 21:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-18 22:25 [PATCH] Wash output of org-encrypt-entry, take 3 Óscar Fuentes
2011-03-20 20:34 ` Bernt Hansen
2011-03-20 21:10 ` Bernt Hansen [this message]
2011-03-21 13:54 ` Julien Danjou
2011-04-10 20:08   ` David Maus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8739mhebvq.fsf@norang.ca \
    --to=bernt@norang.ca \
    --cc=emacs-orgmode@gnu.org \
    --cc=ofv@wanadoo.es \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).