From: ShengHuo ZHU Date: Wed, 20 Dec 2000 03:05:26 +0000 (+0000) Subject: 2000-12-19 22:00:00 ShengHuo ZHU X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=bc5d7ac31602246c35c746201a5fdc5feb930220;p=gnus 2000-12-19 22:00:00 ShengHuo ZHU * gpg.el (defalias): Use eval-and-compile. (gpg-command-all-arglist): Suggest by Jeff Senn . --- diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 5e19f99f5..647125a8f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2000-12-19 22:00:00 ShengHuo ZHU + + * gpg.el (defalias): Use eval-and-compile. + (gpg-command-all-arglist): Suggest by Jeff Senn . + 2000-12-15 00:00:00 ShengHuo ZHU * gpg.el (gpg-command-alist): Alist may not be defined. diff --git a/contrib/gpg.el b/contrib/gpg.el index b96762885..b6ce0dd7e 100644 --- a/contrib/gpg.el +++ b/contrib/gpg.el @@ -7,7 +7,7 @@ ;; Keywords: crypto ;; Created: 2000-04-15 -;; $Id: gpg.el,v 1.7 2000/12/15 04:50:15 zsh Exp $ +;; $Id: gpg.el,v 1.8 2000/12/15 05:26:35 zsh Exp $ ;; This file is NOT (yet?) part of GNU Emacs. @@ -112,10 +112,11 @@ (eval-when-compile (require 'cl)) -(defalias 'gpg-point-at-eol - (if (fboundp 'point-at-eol) - 'point-at-eol - 'line-end-position)) +(eval-and-compile + (defalias 'gpg-point-at-eol + (if (fboundp 'point-at-eol) + 'point-at-eol + 'line-end-position))) ;;;; Customization: @@ -237,6 +238,12 @@ for `gpg-2comp' if you don't have this script, but you'll lose PGP :type 'gpg-command-alist :group 'gpg-options) +(defcustom gpg-command-all-arglist + nil + "List of arguments to add to all GPG commands." + :tag "All command args" + :group 'gpg-options) + (defcustom gpg-command-flag-textmode "--textmode" "The flag to indicate canonical text mode to GnuPG." :tag "Text mode flag" @@ -543,7 +550,7 @@ it are replaced by SUBSTITUTIONS. SUBSTITIONS is a list of (SYMBOL . SEXP) pairs, where SEXP is either a string (which is inserted literally), a list of strings (which are inserted as well), or nil, which means to insert nothing." - (let (arglist) + (let ((arglist (copy-list gpg-command-all-arglist))) (while template (let* ((templ (pop template)) (repl (assoc templ substitutions))