Commit graph

36 commits

Author SHA1 Message Date
Glenn Morris
3175b53533 Remove trivial duplication in epg-config
* lisp/epg-config.el (epg-config--program-alist):
Use epg-gpg-minimum-version.
2017-03-11 17:22:56 -08:00
Glenn Morris
cce29d942d Small epg-find-configuration improvement
* lisp/epg-config.el (epg-find-configuration):
Handle epg-gpg-program customized but not saved.  (Bug#25947)
2017-03-11 17:21:20 -08:00
Paul Eggert
bcf244ef9b Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
2017-01-01 01:10:47 -08:00
Paul Eggert
5badc81c1c Update copyright year to 2017
Run admin/update-copyright.
2016-12-31 19:42:26 -08:00
Daiki Ueno
72ef0c8b2f Improve doc string of epg-*-program
* lisp/epg-config.el (epg-gpg-program, epg-gpgsm-program):
Suggest to use Customize when setting.  (Bug#24229)
2016-08-19 11:20:30 +02:00
Daiki Ueno
dadfc30dae Revert "epg: Add a way to detect gpg1 executable for tests"
This reverts commit d4ae6d7033.
2016-05-20 19:34:06 +09:00
Daiki Ueno
65e38569e5 epg: Add a way to detect gpg1 executable for tests
Fixes bug#23561.

* test/automated/epg-tests.el
(epg-tests-program-alist-for-passphrase-callback): New
constant.
(epg-tests-find-usable-gpg-configuration): New function,
renamed from `epg-tests-gpg-usable'.  All callers changed.
(epg-tests-gpg-usable): Remove.

* lisp/epg-config.el (epg-config--program-alist): Factor out
constructor element to...
(epg-config--configuration-constructor-alist): ...here.
(epg-find-configuration): Rename FORCE argument to NO-CACHE,
and add PROGRAM-ALIST argument.
2016-05-20 16:29:04 +09:00
Daiki Ueno
d4ae6d7033 epg: Add a way to detect gpg1 executable for tests
Fixes bug#23561.

* test/automated/epg-tests.el
(epg-tests-program-alist-for-passphrase-callback): New
constant.
(epg-tests-find-usable-gpg-configuration): New function,
renamed from `epg-tests-gpg-usable'.  All callers changed.
(epg-tests-gpg-usable): Remove.

* lisp/epg-config.el (epg-config--program-alist): Factor out
constructor element to...
(epg-config--configuration-constructor-alist): ...here.
(epg-find-configuration): Rename FORCE argument to NO-CACHE,
and add PROGRAM-ALIST argument.
2016-05-19 18:11:06 +09:00
Daiki Ueno
d0f3b18fa9 Naming fix for consistency
* lisp/epg-config.el (epg-find-configuration): Rename from
`epg-configuration-find' to be consistent with other epg-* functions.
Change all callers.
2016-02-21 07:57:17 +09:00
Daiki Ueno
74ec92da9e Prefer customized value for GnuPG executable
* lisp/epg-config.el (epg-configuration-find): Don't check GPG
configuration if it is already set with custom.  (Bug#22747)
2016-02-21 07:55:22 +09:00
Daiki Ueno
e80c2a7b47 Make GnuPG version check robuster
We changed the default gpg program to "gpg2" from "gpg" in the commit
f93d669a16.  However, there are two
maintained branches (2.0 and 2.1) and Emacs doesn't work well with 2.0
series.  Check the actual version of "gpg2" at run time, and properly
divert to "gpg" if necessary.
* lisp/epg-config.el: Require 'cl-lib for `cl-destructuring-bind'.
(epg-config--program-alist): New variable.
(epg--configurations): New variable.
(epg-configuration-find): New function.
(epg-config--make-gpg-configuration): New function.
(epg-config--make-gpgsm-configuration): New function.
(epg-configuration): Mark as obsolete.
* lisp/epg.el (epg-context): Use `epg-configuration-find'.
2016-02-17 16:47:24 +09:00
Lars Ingebrigtsen
f93d669a16 Default to gpg2 instead of gpg
* lisp/epg-config.el (epg-gpg-program): Prefer gpg2 over gpg, if
it exists.  This fixes many problems with using the GPG
authentication agent.
2016-02-07 13:01:01 +11:00
Glenn Morris
e85e0d5951 Add some missing version tags.
* lisp/electric.el (electric-quote-comment)
(electric-quote-string, electric-quote-paragraph):
* lisp/epg-config.el (epg-gpgconf-program):
* lisp/rect.el (rectangle-preview):
* lisp/emacs-lisp/check-declare.el (check-declare-ext-errors):
* lisp/emacs-lisp/package.el (package-selected-packages)
(package-hidden-regexps):
* lisp/erc/erc.el (erc-network-hide-list, erc-channel-hide-list):
* lisp/eshell/em-term.el (eshell-destroy-buffer-when-process-dies):
* lisp/gnus/mml-sec.el (mml1991-signers, mml2015-signers)
(mml-smime-signers, mml1991-encrypt-to-self, mml2015-encrypt-to-self)
(mml-smime-encrypt-to-self, mml2015-sign-with-sender)
(mml-smime-sign-with-sender, mml2015-always-trust)
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
* lisp/net/browse-url.el (browse-url-conkeror-new-window-is-buffer)
(browse-url-conkeror-arguments):
* lisp/net/newst-reader.el (newsticker-download-logos):
* lisp/progmodes/gud.el (gud-guiler-command-name):
* lisp/progmodes/prog-mode.el (prettify-symbols-unprettify-at-point):
* lisp/progmodes/project.el (project-vc):
* lisp/progmodes/python.el (python-indent-guess-indent-offset-verbose)
(python-shell-remote-exec-path, python-shell-first-prompt-hook)
(python-shell-completion-native-disabled-interpreters)
(python-shell-completion-native-enable)
(python-shell-completion-native-output-timeout)
(python-shell-completion-native-try-output-timeout):
* lisp/progmodes/xref.el (xref):
* lisp/term/screen.el (xterm-screen-extra-capabilities):
* lisp/term/xterm.el (xterm-max-cut-length):
Add missing version tags.
2016-01-12 20:06:49 -05:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Daiki Ueno
bd8b5ac772 epg: Automatically start pinentry server
* epg-config.el (epg-gpgconf-program): New variable.
* epg.el (epg--start): Call `pinentry-start' if
allow-emacs-pinentry is set in ~/.gnupg/gpg-agent.conf.
2015-07-16 15:43:03 +09:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Stefan Monnier
5551acd251 * lisp/epg-config.el (epg-gpg-program): Use the plain program names rather
than their absolute file name.
2014-09-27 12:26:54 -04:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Chong Yidong
cf20dee024 Tweaks to Customize interface. Set custom-reset-button-menu to t.
* cus-edit.el (custom-commands, custom-reset-menu)
(Custom-reset-standard): Tweak labels.
(custom-reset-button-menu): Change default to t.
(custom-buffer-create-internal): For the custom-reset-button-menu
case, put the revert button first.
(custom-group-subtitle): New face.
(custom-group-value-create): Align docstring to a specific column.

* wid-edit.el (widget-documentation-link-add): Don't handle
indentation in this function.
(widget-documentation-string-indent-to): New function.
(widget-documentation-string-value-create): Use it.

* autorevert.el (auto-revert):
* epg-config.el (epg):
* ibuffer.el (ibuffer):
* mpc.el (mpc):
* ses.el (ses):
* eshell/eshell.el (eshell):
* net/ange-ftp.el (ange-ftp):
* progmodes/ebnf2ps.el (postscript):
* progmodes/flymake.el (flymake):
* progmodes/prolog.el (prolog):
* progmodes/verilog-mode.el (verilog-mode):
* progmodes/which-func.el (which-func):
* textmodes/picture.el (picture):
* textmodes/tildify.el (tildify):
* vc/ediff.el (ediff): Tweak defgroups to improve presentation in
customization buffers.
2012-04-22 21:58:00 +08:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Daiki Ueno
3ec6ca720b Try to use "gpg2" if "gpg" isn't available.
* epg-config.el (epg-gpg-program): Try to use "gpg2" if "gpg"
executable is not available on the system (Bug#7268).
2010-10-24 12:12:17 +09:00
Chong Yidong
bd78fa1d54 Add "Package:" file headers to denote built-in packages. 2010-08-29 12:17:13 -04:00
Chong Yidong
eba5b4dd16 Reorganize Custom groups.
* cus-edit.el (processes): Remove from development group.
(oop, hypermedia): Delete group.
(net): New group.

* url/url-vars.el (url):
* net/browse-url.el (browse-url):
* net/xesam.el (xesam):
* net/tramp.el (tramp):
* net/goto-addr.el (goto-address):
* net/ange-ftp.el (ange-ftp): Put in net group.

* view.el (view): Remove from editing group.

* uniquify.el (uniquify): Put in files group.

* net/browse-url.el (browse-url):
* ps-print.el (postscript): Put in external group.

* cus-edit.el (outlines):
* textmodes/text-mode.el (text-mode-hook):
* textmodes/table.el (table):
* textmodes/picture.el (picture):
* outline.el (outlines): Put in wp group.

* nxml/nxml-mode.el (nxml): Remove from wp group.

* net/tramp-imap.el (tramp-imap): Put in tramp group.

* mail/metamail.el (metamail): Remove from hypermedia group.

* cus-edit.el (abbrev):
* whitespace.el (whitespace):
* vcursor.el (vcursor):
* reveal.el (reveal):
* hl-line.el (hl-line): Put in convenience group.

* epg-config.el (epg): Put in data group.

* emulation/pc-select.el (pc-select): Put in emulations group.

* calculator.el (calculator): Put in applications group.

* org/org.el (org): Remove from hypermedia group.
2010-03-12 12:47:22 -05:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
d313574637 (epg): Doc fix. 2009-11-14 04:14:05 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Michael Olson
f1914c4078 EasyPG: Implement some suggestions from emacs-devel. 2008-02-10 20:57:47 +00:00
Dan Nicolaescu
0bd4f3175d * epa.el (epa-faces, epa):
* epa-file.el (epa-file):
* epg-config.el (epg): Add :version.
2008-02-09 21:59:34 +00:00
Miles Bader
37b77401a1 Add arch tagline 2008-02-09 02:29:02 +00:00
Michael Olson
c154c0be04 EasyPG: Initial check-in. 2008-02-08 06:54:27 +00:00