From 0e33d1b9c124bdc1f6fe4a186078318da887e386 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 5 Jan 2011 11:47:59 +0900 Subject: [PATCH] Fix argument passing when rot13-string is defined as macro. --- lisp/ChangeLog | 5 +++++ lisp/netrc.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 586e706..a6a9d96 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-05 Daiki Ueno + + * netrc.el (netrc-parse): Take care of the arg of rot13-string in case + that it is defined as a macro. + 2011-01-03 Lars Magne Ingebrigtsen * flow-fill.el (fill-flowed-encode): Do encoding citation-aware. diff --git a/lisp/netrc.el b/lisp/netrc.el index 989470b..ab4c0d8 100644 --- a/lisp/netrc.el +++ b/lisp/netrc.el @@ -69,9 +69,11 @@ (insert-file-contents file) (when (string-match "\\.gpg\\'" file) (setq netrc-cache (cons (nth 5 (file-attributes file)) - (rot13-string - (base64-encode-string - (buffer-string))))))) + (buffer-string))) + ;; Store the contents of the file heavily encrypted in memory. + (setcdr netrc-cache (rot13-string + (base64-encode-string + (cdr netrc-cache)))))) (goto-char (point-min)) ;; Go through the file, line by line. (while (not (eobp)) -- 1.7.3.4