2011-04-04 06:16:23 +00:00
|
|
|
;;; epa.el --- the EasyPG Assistant -*- lexical-binding: t -*-
|
2011-01-16 02:21:30 +00:00
|
|
|
|
2013-01-01 09:11:05 +00:00
|
|
|
;; Copyright (C) 2006-2013 Free Software Foundation, Inc.
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
;; Author: Daiki Ueno <ueno@unixuser.org>
|
|
|
|
;; Keywords: PGP, GnuPG
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2008-02-08 06:54:27 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(require 'epg)
|
|
|
|
(require 'font-lock)
|
|
|
|
(require 'widget)
|
|
|
|
(eval-when-compile (require 'wid-edit))
|
|
|
|
(require 'derived)
|
|
|
|
|
|
|
|
(defgroup epa nil
|
|
|
|
"The EasyPG Assistant"
|
2008-02-09 21:59:34 +00:00
|
|
|
:version "23.1"
|
2008-02-08 06:54:27 +00:00
|
|
|
:group 'epg)
|
|
|
|
|
|
|
|
(defcustom epa-popup-info-window t
|
2013-07-19 13:30:58 +00:00
|
|
|
"If non-nil, display status information from epa commands in another window."
|
2008-02-08 06:54:27 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'epa)
|
|
|
|
|
|
|
|
(defcustom epa-info-window-height 5
|
|
|
|
"Number of lines used to display status information."
|
|
|
|
:type 'integer
|
|
|
|
:group 'epa)
|
|
|
|
|
|
|
|
(defgroup epa-faces nil
|
|
|
|
"Faces for epa-mode."
|
2008-02-09 21:59:34 +00:00
|
|
|
:version "23.1"
|
2008-02-08 06:54:27 +00:00
|
|
|
:group 'epa)
|
|
|
|
|
2013-07-26 09:32:44 +00:00
|
|
|
(defcustom epa-mail-aliases nil
|
|
|
|
"Alist of aliases of email addresses that stand for encryption keys.
|
|
|
|
Each element is (ALIAS EXPANSIONS...).
|
|
|
|
It means that when a message is addressed to ALIAS,
|
|
|
|
instead of encrypting it for ALIAS, encrypt it for EXPANSIONS...
|
|
|
|
If EXPANSIONS is empty, ignore ALIAS as regards encryption.
|
|
|
|
That is a handy way to avoid warnings about addresses
|
|
|
|
that you don't have any key for."
|
|
|
|
:type '(repeat (cons (string :tag "Alias") (repeat '(string :tag "Expansion"))))
|
|
|
|
:group 'epa
|
|
|
|
:version "24.4")
|
|
|
|
|
2008-02-08 06:54:27 +00:00
|
|
|
(defface epa-validity-high
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((default :weight bold)
|
|
|
|
(((class color) (background dark)) :foreground "PaleTurquoise"))
|
|
|
|
"Face for high validity EPA information."
|
2008-02-08 06:54:27 +00:00
|
|
|
:group 'epa-faces)
|
|
|
|
|
|
|
|
(defface epa-validity-medium
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((default :slant italic)
|
|
|
|
(((class color) (background dark)) :foreground "PaleTurquoise"))
|
|
|
|
"Face for medium validity EPA information."
|
2008-02-08 06:54:27 +00:00
|
|
|
:group 'epa-faces)
|
|
|
|
|
|
|
|
(defface epa-validity-low
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((t :slant italic))
|
2008-02-08 06:54:27 +00:00
|
|
|
"Face used for displaying the low validity."
|
|
|
|
:group 'epa-faces)
|
|
|
|
|
|
|
|
(defface epa-validity-disabled
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((t :slant italic :inverse-video t))
|
2008-02-08 06:54:27 +00:00
|
|
|
"Face used for displaying the disabled validity."
|
|
|
|
:group 'epa-faces)
|
|
|
|
|
|
|
|
(defface epa-string
|
|
|
|
'((((class color) (background dark))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
:foreground "lightyellow")
|
2008-02-08 06:54:27 +00:00
|
|
|
(((class color) (background light))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
:foreground "blue4"))
|
2008-02-08 06:54:27 +00:00
|
|
|
"Face used for displaying the string."
|
|
|
|
:group 'epa-faces)
|
|
|
|
|
|
|
|
(defface epa-mark
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((default :weight bold)
|
|
|
|
(((class color) (background dark)) :foreground "orange")
|
|
|
|
(((class color) (background light)) :foreground "red"))
|
2008-02-08 06:54:27 +00:00
|
|
|
"Face used for displaying the high validity."
|
|
|
|
:group 'epa-faces)
|
|
|
|
|
|
|
|
(defface epa-field-name
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((default :weight bold)
|
|
|
|
(((class color) (background dark)) :foreground "PaleTurquoise"))
|
2008-02-08 06:54:27 +00:00
|
|
|
"Face for the name of the attribute field."
|
|
|
|
:group 'epa)
|
|
|
|
|
|
|
|
(defface epa-field-body
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((default :slant italic)
|
|
|
|
(((class color) (background dark)) :foreground "turquoise"))
|
2008-02-08 06:54:27 +00:00
|
|
|
"Face for the body of the attribute field."
|
|
|
|
:group 'epa)
|
|
|
|
|
|
|
|
(defcustom epa-validity-face-alist
|
|
|
|
'((unknown . epa-validity-disabled)
|
|
|
|
(invalid . epa-validity-disabled)
|
|
|
|
(disabled . epa-validity-disabled)
|
|
|
|
(revoked . epa-validity-disabled)
|
|
|
|
(expired . epa-validity-disabled)
|
|
|
|
(none . epa-validity-low)
|
|
|
|
(undefined . epa-validity-low)
|
|
|
|
(never . epa-validity-low)
|
|
|
|
(marginal . epa-validity-medium)
|
|
|
|
(full . epa-validity-high)
|
|
|
|
(ultimate . epa-validity-high))
|
|
|
|
"An alist mapping validity values to faces."
|
|
|
|
:type '(repeat (cons symbol face))
|
|
|
|
:group 'epa)
|
|
|
|
|
|
|
|
(defvar epa-font-lock-keywords
|
|
|
|
'(("^\\*"
|
|
|
|
(0 'epa-mark))
|
|
|
|
("^\t\\([^\t:]+:\\)[ \t]*\\(.*\\)$"
|
|
|
|
(1 'epa-field-name)
|
|
|
|
(2 'epa-field-body)))
|
|
|
|
"Default expressions to addon in epa-mode.")
|
|
|
|
|
|
|
|
(defconst epa-pubkey-algorithm-letter-alist
|
|
|
|
'((1 . ?R)
|
|
|
|
(2 . ?r)
|
|
|
|
(3 . ?s)
|
|
|
|
(16 . ?g)
|
|
|
|
(17 . ?D)
|
|
|
|
(20 . ?G)))
|
|
|
|
|
|
|
|
(defvar epa-protocol 'OpenPGP
|
2012-04-09 13:05:48 +00:00
|
|
|
"The default protocol.
|
2008-02-08 06:54:27 +00:00
|
|
|
The value can be either OpenPGP or CMS.
|
|
|
|
|
|
|
|
You should bind this variable with `let', but do not set it globally.")
|
|
|
|
|
|
|
|
(defvar epa-armor nil
|
2012-04-09 13:05:48 +00:00
|
|
|
"If non-nil, epa commands create ASCII armored output.
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
You should bind this variable with `let', but do not set it globally.")
|
|
|
|
|
|
|
|
(defvar epa-textmode nil
|
2012-04-09 13:05:48 +00:00
|
|
|
"If non-nil, epa commands treat input files as text.
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
You should bind this variable with `let', but do not set it globally.")
|
|
|
|
|
|
|
|
(defvar epa-keys-buffer nil)
|
|
|
|
(defvar epa-key-buffer-alist nil)
|
|
|
|
(defvar epa-key nil)
|
|
|
|
(defvar epa-list-keys-arguments nil)
|
|
|
|
(defvar epa-info-buffer nil)
|
|
|
|
(defvar epa-last-coding-system-specified nil)
|
|
|
|
|
|
|
|
(defvar epa-key-list-mode-map
|
2008-04-29 07:10:55 +00:00
|
|
|
(let ((keymap (make-sparse-keymap))
|
|
|
|
(menu-map (make-sparse-keymap)))
|
2008-02-08 06:54:27 +00:00
|
|
|
(define-key keymap "m" 'epa-mark-key)
|
|
|
|
(define-key keymap "u" 'epa-unmark-key)
|
|
|
|
(define-key keymap "d" 'epa-decrypt-file)
|
|
|
|
(define-key keymap "v" 'epa-verify-file)
|
|
|
|
(define-key keymap "s" 'epa-sign-file)
|
|
|
|
(define-key keymap "e" 'epa-encrypt-file)
|
|
|
|
(define-key keymap "r" 'epa-delete-keys)
|
|
|
|
(define-key keymap "i" 'epa-import-keys)
|
|
|
|
(define-key keymap "o" 'epa-export-keys)
|
|
|
|
(define-key keymap "g" 'revert-buffer)
|
|
|
|
(define-key keymap "n" 'next-line)
|
|
|
|
(define-key keymap "p" 'previous-line)
|
2011-10-01 20:32:01 +00:00
|
|
|
(define-key keymap " " 'scroll-up-command)
|
2013-02-12 04:46:18 +00:00
|
|
|
(define-key keymap [?\S-\ ] 'scroll-down-command)
|
2011-10-01 20:32:01 +00:00
|
|
|
(define-key keymap [delete] 'scroll-down-command)
|
2008-02-08 06:54:27 +00:00
|
|
|
(define-key keymap "q" 'epa-exit-buffer)
|
2008-04-29 07:10:55 +00:00
|
|
|
(define-key keymap [menu-bar epa-key-list-mode] (cons "Keys" menu-map))
|
2008-04-30 05:44:17 +00:00
|
|
|
(define-key menu-map [epa-key-list-unmark-key]
|
|
|
|
'(menu-item "Unmark Key" epa-unmark-key
|
|
|
|
:help "Unmark a key"))
|
|
|
|
(define-key menu-map [epa-key-list-mark-key]
|
|
|
|
'(menu-item "Mark Key" epa-mark-key
|
|
|
|
:help "Mark a key"))
|
|
|
|
(define-key menu-map [separator-epa-file] '(menu-item "--"))
|
|
|
|
(define-key menu-map [epa-verify-file]
|
|
|
|
'(menu-item "Verify File..." epa-verify-file
|
|
|
|
:help "Verify FILE"))
|
|
|
|
(define-key menu-map [epa-sign-file]
|
|
|
|
'(menu-item "Sign File..." epa-sign-file
|
|
|
|
:help "Sign FILE by SIGNERS keys selected"))
|
|
|
|
(define-key menu-map [epa-decrypt-file]
|
|
|
|
'(menu-item "Decrypt File..." epa-decrypt-file
|
|
|
|
:help "Decrypt FILE"))
|
|
|
|
(define-key menu-map [epa-encrypt-file]
|
2009-09-29 02:26:20 +00:00
|
|
|
'(menu-item "Encrypt File..." epa-encrypt-file
|
2008-04-30 05:44:17 +00:00
|
|
|
:help "Encrypt FILE for RECIPIENTS"))
|
|
|
|
(define-key menu-map [separator-epa-key-list] '(menu-item "--"))
|
2008-04-29 07:10:55 +00:00
|
|
|
(define-key menu-map [epa-key-list-delete-keys]
|
2011-09-18 20:43:20 +00:00
|
|
|
'(menu-item "Delete Keys" epa-delete-keys
|
2008-04-30 05:44:17 +00:00
|
|
|
:help "Delete Marked Keys"))
|
2008-04-29 07:10:55 +00:00
|
|
|
(define-key menu-map [epa-key-list-import-keys]
|
2008-04-30 05:44:17 +00:00
|
|
|
'(menu-item "Import Keys" epa-import-keys
|
2008-04-29 07:10:55 +00:00
|
|
|
:help "Import keys from a file"))
|
|
|
|
(define-key menu-map [epa-key-list-export-keys]
|
2008-04-30 05:44:17 +00:00
|
|
|
'(menu-item "Export Keys" epa-export-keys
|
2008-04-29 07:10:55 +00:00
|
|
|
:help "Export marked keys to a file"))
|
2008-02-08 06:54:27 +00:00
|
|
|
keymap))
|
|
|
|
|
|
|
|
(defvar epa-key-mode-map
|
|
|
|
(let ((keymap (make-sparse-keymap)))
|
|
|
|
(define-key keymap "q" 'epa-exit-buffer)
|
|
|
|
keymap))
|
|
|
|
|
|
|
|
(defvar epa-info-mode-map
|
|
|
|
(let ((keymap (make-sparse-keymap)))
|
|
|
|
(define-key keymap "q" 'delete-window)
|
|
|
|
keymap))
|
|
|
|
|
|
|
|
(defvar epa-exit-buffer-function #'bury-buffer)
|
|
|
|
|
|
|
|
(define-widget 'epa-key 'push-button
|
|
|
|
"Button for representing a epg-key object."
|
|
|
|
:format "%[%v%]"
|
|
|
|
:button-face-get 'epa--key-widget-button-face-get
|
|
|
|
:value-create 'epa--key-widget-value-create
|
|
|
|
:action 'epa--key-widget-action
|
|
|
|
:help-echo 'epa--key-widget-help-echo)
|
|
|
|
|
2011-04-04 06:16:23 +00:00
|
|
|
(defun epa--key-widget-action (widget &optional _event)
|
2008-08-26 03:11:45 +00:00
|
|
|
(save-selected-window
|
|
|
|
(epa--show-key (widget-get widget :value))))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
(defun epa--key-widget-value-create (widget)
|
|
|
|
(let* ((key (widget-get widget :value))
|
|
|
|
(primary-sub-key (car (epg-key-sub-key-list key)))
|
|
|
|
(primary-user-id (car (epg-key-user-id-list key))))
|
|
|
|
(insert (format "%c "
|
|
|
|
(if (epg-sub-key-validity primary-sub-key)
|
|
|
|
(car (rassq (epg-sub-key-validity primary-sub-key)
|
|
|
|
epg-key-validity-alist))
|
|
|
|
? ))
|
|
|
|
(epg-sub-key-id primary-sub-key)
|
|
|
|
" "
|
|
|
|
(if primary-user-id
|
|
|
|
(if (stringp (epg-user-id-string primary-user-id))
|
|
|
|
(epg-user-id-string primary-user-id)
|
|
|
|
(epg-decode-dn (epg-user-id-string primary-user-id)))
|
|
|
|
""))))
|
|
|
|
|
|
|
|
(defun epa--key-widget-button-face-get (widget)
|
|
|
|
(let ((validity (epg-sub-key-validity (car (epg-key-sub-key-list
|
|
|
|
(widget-get widget :value))))))
|
|
|
|
(if validity
|
|
|
|
(cdr (assq validity epa-validity-face-alist))
|
|
|
|
'default)))
|
|
|
|
|
|
|
|
(defun epa--key-widget-help-echo (widget)
|
|
|
|
(format "Show %s"
|
|
|
|
(epg-sub-key-id (car (epg-key-sub-key-list
|
|
|
|
(widget-get widget :value))))))
|
|
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
(if (fboundp 'encode-coding-string)
|
|
|
|
(defalias 'epa--encode-coding-string 'encode-coding-string)
|
|
|
|
(defalias 'epa--encode-coding-string 'identity)))
|
|
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
(if (fboundp 'decode-coding-string)
|
|
|
|
(defalias 'epa--decode-coding-string 'decode-coding-string)
|
|
|
|
(defalias 'epa--decode-coding-string 'identity)))
|
|
|
|
|
|
|
|
(defun epa-key-list-mode ()
|
|
|
|
"Major mode for `epa-list-keys'."
|
|
|
|
(kill-all-local-variables)
|
|
|
|
(buffer-disable-undo)
|
|
|
|
(setq major-mode 'epa-key-list-mode
|
|
|
|
mode-name "Keys"
|
|
|
|
truncate-lines t
|
|
|
|
buffer-read-only t)
|
|
|
|
(use-local-map epa-key-list-mode-map)
|
|
|
|
(make-local-variable 'font-lock-defaults)
|
|
|
|
(setq font-lock-defaults '(epa-font-lock-keywords t))
|
|
|
|
;; In XEmacs, auto-initialization of font-lock is not effective
|
|
|
|
;; if buffer-file-name is not set.
|
|
|
|
(font-lock-set-defaults)
|
|
|
|
(make-local-variable 'epa-exit-buffer-function)
|
|
|
|
(make-local-variable 'revert-buffer-function)
|
|
|
|
(setq revert-buffer-function 'epa--key-list-revert-buffer)
|
2008-07-17 06:21:14 +00:00
|
|
|
(run-mode-hooks 'epa-key-list-mode-hook))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
(defun epa-key-mode ()
|
|
|
|
"Major mode for a key description."
|
|
|
|
(kill-all-local-variables)
|
|
|
|
(buffer-disable-undo)
|
|
|
|
(setq major-mode 'epa-key-mode
|
|
|
|
mode-name "Key"
|
|
|
|
truncate-lines t
|
|
|
|
buffer-read-only t)
|
|
|
|
(use-local-map epa-key-mode-map)
|
|
|
|
(make-local-variable 'font-lock-defaults)
|
|
|
|
(setq font-lock-defaults '(epa-font-lock-keywords t))
|
|
|
|
;; In XEmacs, auto-initialization of font-lock is not effective
|
|
|
|
;; if buffer-file-name is not set.
|
|
|
|
(font-lock-set-defaults)
|
|
|
|
(make-local-variable 'epa-exit-buffer-function)
|
2008-07-17 06:21:14 +00:00
|
|
|
(run-mode-hooks 'epa-key-mode-hook))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
(defun epa-info-mode ()
|
|
|
|
"Major mode for `epa-info-buffer'."
|
|
|
|
(kill-all-local-variables)
|
|
|
|
(buffer-disable-undo)
|
|
|
|
(setq major-mode 'epa-info-mode
|
|
|
|
mode-name "Info"
|
|
|
|
truncate-lines t
|
|
|
|
buffer-read-only t)
|
|
|
|
(use-local-map epa-info-mode-map)
|
2008-07-17 06:21:14 +00:00
|
|
|
(run-mode-hooks 'epa-info-mode-hook))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
(defun epa-mark-key (&optional arg)
|
|
|
|
"Mark a key on the current line.
|
|
|
|
If ARG is non-nil, unmark the key."
|
|
|
|
(interactive "P")
|
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
buffer-read-only
|
|
|
|
properties)
|
|
|
|
(beginning-of-line)
|
|
|
|
(unless (get-text-property (point) 'epa-key)
|
|
|
|
(error "No key on this line"))
|
|
|
|
(setq properties (text-properties-at (point)))
|
|
|
|
(delete-char 1)
|
|
|
|
(insert (if arg " " "*"))
|
|
|
|
(set-text-properties (1- (point)) (point) properties)
|
|
|
|
(forward-line)))
|
|
|
|
|
|
|
|
(defun epa-unmark-key (&optional arg)
|
|
|
|
"Unmark a key on the current line.
|
|
|
|
If ARG is non-nil, mark the key."
|
|
|
|
(interactive "P")
|
|
|
|
(epa-mark-key (not arg)))
|
|
|
|
|
|
|
|
(defun epa-exit-buffer ()
|
|
|
|
"Exit the current buffer.
|
|
|
|
`epa-exit-buffer-function' is called if it is set."
|
|
|
|
(interactive)
|
|
|
|
(funcall epa-exit-buffer-function))
|
|
|
|
|
|
|
|
(defun epa--insert-keys (keys)
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
(let (point)
|
|
|
|
(while keys
|
|
|
|
(setq point (point))
|
|
|
|
(insert " ")
|
|
|
|
(add-text-properties point (point)
|
|
|
|
(list 'epa-key (car keys)
|
|
|
|
'front-sticky nil
|
|
|
|
'rear-nonsticky t
|
|
|
|
'start-open t
|
|
|
|
'end-open t))
|
|
|
|
(widget-create 'epa-key :value (car keys))
|
|
|
|
(insert "\n")
|
2008-02-10 20:57:47 +00:00
|
|
|
(setq keys (cdr keys))))
|
2008-02-08 06:54:27 +00:00
|
|
|
(add-text-properties (point-min) (point-max)
|
|
|
|
(list 'epa-list-keys t
|
|
|
|
'front-sticky nil
|
|
|
|
'rear-nonsticky t
|
|
|
|
'start-open t
|
|
|
|
'end-open t)))))
|
|
|
|
|
|
|
|
(defun epa--list-keys (name secret)
|
|
|
|
(unless (and epa-keys-buffer
|
|
|
|
(buffer-live-p epa-keys-buffer))
|
|
|
|
(setq epa-keys-buffer (generate-new-buffer "*Keys*")))
|
|
|
|
(set-buffer epa-keys-buffer)
|
|
|
|
(epa-key-list-mode)
|
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
buffer-read-only
|
|
|
|
(point (point-min))
|
|
|
|
(context (epg-make-context epa-protocol)))
|
|
|
|
(unless (get-text-property point 'epa-list-keys)
|
|
|
|
(setq point (next-single-property-change point 'epa-list-keys)))
|
|
|
|
(when point
|
|
|
|
(delete-region point
|
|
|
|
(or (next-single-property-change point 'epa-list-keys)
|
|
|
|
(point-max)))
|
|
|
|
(goto-char point))
|
|
|
|
(epa--insert-keys (epg-list-keys context name secret))
|
|
|
|
(widget-setup)
|
|
|
|
(set-keymap-parent (current-local-map) widget-keymap))
|
|
|
|
(make-local-variable 'epa-list-keys-arguments)
|
|
|
|
(setq epa-list-keys-arguments (list name secret))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(pop-to-buffer (current-buffer)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-list-keys (&optional name)
|
|
|
|
"List all keys matched with NAME from the public keyring."
|
|
|
|
(interactive
|
|
|
|
(if current-prefix-arg
|
|
|
|
(let ((name (read-string "Pattern: "
|
|
|
|
(if epa-list-keys-arguments
|
|
|
|
(car epa-list-keys-arguments)))))
|
|
|
|
(list (if (equal name "") nil name)))
|
|
|
|
(list nil)))
|
|
|
|
(epa--list-keys name nil))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-list-secret-keys (&optional name)
|
|
|
|
"List all keys matched with NAME from the private keyring."
|
|
|
|
(interactive
|
|
|
|
(if current-prefix-arg
|
|
|
|
(let ((name (read-string "Pattern: "
|
|
|
|
(if epa-list-keys-arguments
|
|
|
|
(car epa-list-keys-arguments)))))
|
|
|
|
(list (if (equal name "") nil name)))
|
|
|
|
(list nil)))
|
|
|
|
(epa--list-keys name t))
|
|
|
|
|
2011-04-04 06:16:23 +00:00
|
|
|
(defun epa--key-list-revert-buffer (&optional _ignore-auto _noconfirm)
|
2008-02-08 06:54:27 +00:00
|
|
|
(apply #'epa--list-keys epa-list-keys-arguments))
|
|
|
|
|
|
|
|
(defun epa--marked-keys ()
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
(or (with-current-buffer epa-keys-buffer
|
2008-02-08 06:54:27 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(let (keys key)
|
|
|
|
(while (re-search-forward "^\\*" nil t)
|
|
|
|
(if (setq key (get-text-property (match-beginning 0)
|
|
|
|
'epa-key))
|
|
|
|
(setq keys (cons key keys))))
|
|
|
|
(nreverse keys)))
|
Replace still more end-of-line etc with line-end-position, etc.
* lisp/gnus/nnbabyl.el (nnbabyl-request-move-article, nnbabyl-delete-mail)
(nnbabyl-check-mbox): Use point-at-bol.
* lisp/cedet/semantic/lex.el (semantic-lex-ignore-comments, semantic-flex):
* lisp/cedet/semantic/grammar.el (semantic-grammar-epilogue):
* lisp/cedet/ede/speedbar.el (ede-find-nearest-file-line):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/ede/autoconf-edit.el (autoconf-delete-parameter):
Use point-at-bol and point-at-eol.
* lisp/vc/emerge.el (emerge-line-number-in-buf):
* lisp/textmodes/ispell.el (ispell-region):
* lisp/textmodes/fill.el (current-fill-column):
* lisp/progmodes/xscheme.el (xscheme-send-current-line):
* lisp/progmodes/vhdl-mode.el (vhdl-current-line, vhdl-line-copy):
* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment):
* lisp/progmodes/sh-script.el (sh-handle-prev-do):
* lisp/progmodes/meta-mode.el (meta-indent-line):
* lisp/progmodes/idlwave.el (idlwave-goto-comment, idlwave-fill-paragraph)
(idlwave-in-quote):
* lisp/progmodes/idlw-shell.el (idlwave-shell-current-frame)
(idlwave-shell-update-bp-overlays, idlwave-shell-sources-filter):
* lisp/progmodes/fortran.el (fortran-looking-at-if-then):
* lisp/progmodes/etags.el (find-tag-in-order, etags-snarf-tag):
* lisp/progmodes/cperl-mode.el (cperl-sniff-for-indent)
(cperl-find-pods-heres):
* lisp/progmodes/ada-mode.el (ada-get-current-indent, ada-narrow-to-defun):
* lisp/net/quickurl.el (quickurl-list-insert):
* lisp/net/ldap.el (ldap-search-internal):
* lisp/net/eudc.el (eudc-expand-inline):
* lisp/mail/sendmail.el (sendmail-send-it):
* lisp/mail/mspools.el (mspools-visit-spool, mspools-get-spool-name):
* lisp/emulation/viper-cmd.el (viper-paren-match, viper-backward-indent)
(viper-brac-function):
* lisp/calc/calc-yank.el (calc-do-grab-region):
* lisp/calc/calc-keypd.el (calc-keypad-press):
* lisp/term.el (term-move-columns, term-insert-spaces):
* lisp/speedbar.el (speedbar-highlight-one-tag-line):
* lisp/simple.el (current-word):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* lisp/info.el (Info-find-node-in-buffer-1, Info-follow-reference)
(Info-scroll-down):
* lisp/hippie-exp.el (he-line-beg):
* lisp/epa.el (epa--marked-keys):
* lisp/dired-aux.el (dired-kill-line, dired-do-kill-lines)
(dired-update-file-line, dired-add-entry, dired-remove-entry)
(dired-relist-entry):
* lisp/buff-menu.el (Buffer-menu-buffer):
* lisp/array.el (current-line):
* lisp/allout.el (allout-resolve-xref)
(allout-latex-verbatim-quote-curr-line):
Replace yet more uses of end-of-line etc with line-end-position.
2010-11-09 05:33:07 +00:00
|
|
|
(let ((key (get-text-property (point-at-bol) 'epa-key)))
|
|
|
|
(if key
|
|
|
|
(list key)))))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
(defun epa--select-keys (prompt keys)
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
(unless (and epa-keys-buffer
|
|
|
|
(buffer-live-p epa-keys-buffer))
|
|
|
|
(setq epa-keys-buffer (generate-new-buffer "*Keys*")))
|
|
|
|
(with-current-buffer epa-keys-buffer
|
2008-02-08 06:54:27 +00:00
|
|
|
(epa-key-list-mode)
|
2012-04-04 01:38:37 +00:00
|
|
|
;; C-c C-c is the usual way to finish the selection (bug#11159).
|
|
|
|
(define-key (current-local-map) "\C-c\C-c" 'exit-recursive-edit)
|
2008-02-08 06:54:27 +00:00
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
buffer-read-only)
|
|
|
|
(erase-buffer)
|
|
|
|
(insert prompt "\n"
|
|
|
|
(substitute-command-keys "\
|
|
|
|
- `\\[epa-mark-key]' to mark a key on the line
|
|
|
|
- `\\[epa-unmark-key]' to unmark a key on the line\n"))
|
|
|
|
(widget-create 'link
|
2011-04-04 06:16:23 +00:00
|
|
|
:notify (lambda (&rest _ignore) (abort-recursive-edit))
|
2008-02-08 06:54:27 +00:00
|
|
|
:help-echo
|
|
|
|
(substitute-command-keys
|
|
|
|
"Click here or \\[abort-recursive-edit] to cancel")
|
|
|
|
"Cancel")
|
|
|
|
(widget-create 'link
|
2011-04-04 06:16:23 +00:00
|
|
|
:notify (lambda (&rest _ignore) (exit-recursive-edit))
|
2008-02-08 06:54:27 +00:00
|
|
|
:help-echo
|
|
|
|
(substitute-command-keys
|
|
|
|
"Click here or \\[exit-recursive-edit] to finish")
|
|
|
|
"OK")
|
|
|
|
(insert "\n\n")
|
|
|
|
(epa--insert-keys keys)
|
|
|
|
(widget-setup)
|
|
|
|
(set-keymap-parent (current-local-map) widget-keymap)
|
|
|
|
(setq epa-exit-buffer-function #'abort-recursive-edit)
|
|
|
|
(goto-char (point-min))
|
2010-05-25 17:53:37 +00:00
|
|
|
(let ((display-buffer-mark-dedicated 'soft))
|
|
|
|
(pop-to-buffer (current-buffer))))
|
2008-02-08 06:54:27 +00:00
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(recursive-edit)
|
|
|
|
(epa--marked-keys))
|
|
|
|
(kill-buffer epa-keys-buffer))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-select-keys (context prompt &optional names secret)
|
|
|
|
"Display a user's keyring and ask him to select keys.
|
|
|
|
CONTEXT is an epg-context.
|
|
|
|
PROMPT is a string to prompt with.
|
|
|
|
NAMES is a list of strings to be matched with keys. If it is nil, all
|
|
|
|
the keys are listed.
|
|
|
|
If SECRET is non-nil, list secret keys instead of public keys."
|
|
|
|
(let ((keys (epg-list-keys context names secret)))
|
2008-04-01 05:28:04 +00:00
|
|
|
(epa--select-keys prompt keys)))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
(defun epa--show-key (key)
|
|
|
|
(let* ((primary-sub-key (car (epg-key-sub-key-list key)))
|
|
|
|
(entry (assoc (epg-sub-key-id primary-sub-key)
|
|
|
|
epa-key-buffer-alist))
|
|
|
|
(inhibit-read-only t)
|
|
|
|
buffer-read-only
|
|
|
|
pointer)
|
|
|
|
(unless entry
|
|
|
|
(setq entry (cons (epg-sub-key-id primary-sub-key) nil)
|
|
|
|
epa-key-buffer-alist (cons entry epa-key-buffer-alist)))
|
|
|
|
(unless (and (cdr entry)
|
|
|
|
(buffer-live-p (cdr entry)))
|
|
|
|
(setcdr entry (generate-new-buffer
|
|
|
|
(format "*Key*%s" (epg-sub-key-id primary-sub-key)))))
|
|
|
|
(set-buffer (cdr entry))
|
|
|
|
(epa-key-mode)
|
|
|
|
(make-local-variable 'epa-key)
|
|
|
|
(setq epa-key key)
|
|
|
|
(erase-buffer)
|
|
|
|
(setq pointer (epg-key-user-id-list key))
|
|
|
|
(while pointer
|
|
|
|
(if (car pointer)
|
|
|
|
(insert " "
|
|
|
|
(if (epg-user-id-validity (car pointer))
|
|
|
|
(char-to-string
|
|
|
|
(car (rassq (epg-user-id-validity (car pointer))
|
|
|
|
epg-key-validity-alist)))
|
|
|
|
" ")
|
|
|
|
" "
|
|
|
|
(if (stringp (epg-user-id-string (car pointer)))
|
|
|
|
(epg-user-id-string (car pointer))
|
|
|
|
(epg-decode-dn (epg-user-id-string (car pointer))))
|
|
|
|
"\n"))
|
|
|
|
(setq pointer (cdr pointer)))
|
|
|
|
(setq pointer (epg-key-sub-key-list key))
|
|
|
|
(while pointer
|
|
|
|
(insert " "
|
|
|
|
(if (epg-sub-key-validity (car pointer))
|
|
|
|
(char-to-string
|
|
|
|
(car (rassq (epg-sub-key-validity (car pointer))
|
|
|
|
epg-key-validity-alist)))
|
|
|
|
" ")
|
|
|
|
" "
|
|
|
|
(epg-sub-key-id (car pointer))
|
|
|
|
" "
|
|
|
|
(format "%dbits"
|
|
|
|
(epg-sub-key-length (car pointer)))
|
|
|
|
" "
|
|
|
|
(cdr (assq (epg-sub-key-algorithm (car pointer))
|
|
|
|
epg-pubkey-algorithm-alist))
|
|
|
|
"\n\tCreated: "
|
|
|
|
(condition-case nil
|
|
|
|
(format-time-string "%Y-%m-%d"
|
|
|
|
(epg-sub-key-creation-time (car pointer)))
|
|
|
|
(error "????-??-??"))
|
|
|
|
(if (epg-sub-key-expiration-time (car pointer))
|
2008-12-03 06:16:18 +00:00
|
|
|
(format (if (time-less-p (current-time)
|
|
|
|
(epg-sub-key-expiration-time
|
|
|
|
(car pointer)))
|
|
|
|
"\n\tExpires: %s"
|
|
|
|
"\n\tExpired: %s")
|
2008-02-08 06:54:27 +00:00
|
|
|
(condition-case nil
|
|
|
|
(format-time-string "%Y-%m-%d"
|
|
|
|
(epg-sub-key-expiration-time
|
|
|
|
(car pointer)))
|
|
|
|
(error "????-??-??")))
|
|
|
|
"")
|
|
|
|
"\n\tCapabilities: "
|
|
|
|
(mapconcat #'symbol-name
|
|
|
|
(epg-sub-key-capability (car pointer))
|
|
|
|
" ")
|
|
|
|
"\n\tFingerprint: "
|
|
|
|
(epg-sub-key-fingerprint (car pointer))
|
|
|
|
"\n")
|
|
|
|
(setq pointer (cdr pointer)))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(pop-to-buffer (current-buffer))))
|
|
|
|
|
|
|
|
(defun epa-display-info (info)
|
|
|
|
(if epa-popup-info-window
|
|
|
|
(save-selected-window
|
|
|
|
(unless (and epa-info-buffer (buffer-live-p epa-info-buffer))
|
|
|
|
(setq epa-info-buffer (generate-new-buffer "*Info*")))
|
|
|
|
(if (get-buffer-window epa-info-buffer)
|
|
|
|
(delete-window (get-buffer-window epa-info-buffer)))
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
(with-current-buffer epa-info-buffer
|
2008-02-08 06:54:27 +00:00
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
buffer-read-only)
|
|
|
|
(erase-buffer)
|
|
|
|
(insert info))
|
|
|
|
(epa-info-mode)
|
|
|
|
(goto-char (point-min)))
|
|
|
|
(if (> (window-height)
|
|
|
|
epa-info-window-height)
|
|
|
|
(set-window-buffer (split-window nil (- (window-height)
|
|
|
|
epa-info-window-height))
|
|
|
|
epa-info-buffer)
|
|
|
|
(pop-to-buffer epa-info-buffer)
|
|
|
|
(if (> (window-height) epa-info-window-height)
|
|
|
|
(shrink-window (- (window-height) epa-info-window-height)))))
|
|
|
|
(message "%s" info)))
|
|
|
|
|
|
|
|
(defun epa-display-verify-result (verify-result)
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
(declare (obsolete epa-display-info "23.1"))
|
2008-02-08 06:54:27 +00:00
|
|
|
(epa-display-info (epg-verify-result-to-string verify-result)))
|
|
|
|
|
|
|
|
(defun epa-passphrase-callback-function (context key-id handback)
|
|
|
|
(if (eq key-id 'SYM)
|
2010-10-09 13:27:24 +00:00
|
|
|
(read-passwd
|
|
|
|
(format "Passphrase for symmetric encryption%s: "
|
2010-10-10 01:45:45 +00:00
|
|
|
;; Add the file name to the prompt, if any.
|
|
|
|
(if (stringp handback)
|
|
|
|
(format " for %s" handback)
|
|
|
|
""))
|
2010-10-09 13:27:24 +00:00
|
|
|
(eq (epg-context-operation context) 'encrypt))
|
2008-02-08 06:54:27 +00:00
|
|
|
(read-passwd
|
|
|
|
(if (eq key-id 'PIN)
|
|
|
|
"Passphrase for PIN: "
|
|
|
|
(let ((entry (assoc key-id epg-user-id-alist)))
|
|
|
|
(if entry
|
|
|
|
(format "Passphrase for %s %s: " key-id (cdr entry))
|
|
|
|
(format "Passphrase for %s: " key-id)))))))
|
|
|
|
|
2011-04-04 06:16:23 +00:00
|
|
|
(defun epa-progress-callback-function (_context what _char current total
|
2008-02-08 06:54:27 +00:00
|
|
|
handback)
|
2011-08-12 03:30:18 +00:00
|
|
|
(let ((prompt (or handback
|
|
|
|
(format "Processing %s: " what))))
|
|
|
|
;; According to gnupg/doc/DETAIL: a "total" of 0 indicates that
|
|
|
|
;; the total amount is not known. The condition TOTAL && CUR ==
|
|
|
|
;; TOTAL may be used to detect the end of an operation.
|
|
|
|
(if (> total 0)
|
|
|
|
(if (= current total)
|
|
|
|
(message "%s...done" prompt)
|
|
|
|
(message "%s...%d%%" prompt
|
|
|
|
(floor (* (/ current (float total)) 100))))
|
|
|
|
(message "%s..." prompt))))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
2013-06-10 00:32:49 +00:00
|
|
|
(defun epa-read-file-name (input)
|
|
|
|
"Interactively read an output file name based on INPUT file name."
|
|
|
|
(setq input (file-name-sans-extension (expand-file-name input)))
|
|
|
|
(expand-file-name
|
|
|
|
(read-file-name
|
|
|
|
(concat "To file (default " (file-name-nondirectory input) ") ")
|
|
|
|
(file-name-directory input)
|
|
|
|
input)))
|
|
|
|
|
2008-02-08 06:54:27 +00:00
|
|
|
;;;###autoload
|
2013-06-10 00:32:49 +00:00
|
|
|
(defun epa-decrypt-file (decrypt-file &optional plain-file)
|
|
|
|
"Decrypt DECRYPT-FILE into PLAIN-FILE.
|
|
|
|
If you do not specify PLAIN-FILE, this functions prompts for the value to use."
|
2013-05-11 13:14:07 +00:00
|
|
|
(interactive
|
2013-06-10 00:32:49 +00:00
|
|
|
(let* ((file (read-file-name "File to decrypt: "))
|
|
|
|
(plain (epa-read-file-name file)))
|
2013-05-11 13:14:07 +00:00
|
|
|
(list file plain)))
|
2013-06-10 00:32:49 +00:00
|
|
|
(or plain-file (setq plain-file (epa-read-file-name decrypt-file)))
|
2013-05-11 13:14:07 +00:00
|
|
|
(setq decrypt-file (expand-file-name decrypt-file))
|
|
|
|
(let ((context (epg-make-context epa-protocol)))
|
2008-02-08 06:54:27 +00:00
|
|
|
(epg-context-set-passphrase-callback context
|
|
|
|
#'epa-passphrase-callback-function)
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
(format "Decrypting %s..."
|
2013-05-11 13:14:07 +00:00
|
|
|
(file-name-nondirectory decrypt-file))))
|
|
|
|
(message "Decrypting %s..." (file-name-nondirectory decrypt-file))
|
|
|
|
(epg-decrypt-file context decrypt-file plain-file)
|
|
|
|
(message "Decrypting %s...wrote %s" (file-name-nondirectory decrypt-file)
|
|
|
|
(file-name-nondirectory plain-file))
|
2008-02-08 06:54:27 +00:00
|
|
|
(if (epg-context-result-for context 'verify)
|
|
|
|
(epa-display-info (epg-verify-result-to-string
|
|
|
|
(epg-context-result-for context 'verify))))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-verify-file (file)
|
|
|
|
"Verify FILE."
|
|
|
|
(interactive "fFile: ")
|
|
|
|
(setq file (expand-file-name file))
|
|
|
|
(let* ((context (epg-make-context epa-protocol))
|
|
|
|
(plain (if (equal (file-name-extension file) "sig")
|
|
|
|
(file-name-sans-extension file))))
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
(format "Verifying %s..."
|
|
|
|
(file-name-nondirectory file))))
|
|
|
|
(message "Verifying %s..." (file-name-nondirectory file))
|
|
|
|
(epg-verify-file context file plain)
|
|
|
|
(message "Verifying %s...done" (file-name-nondirectory file))
|
|
|
|
(if (epg-context-result-for context 'verify)
|
|
|
|
(epa-display-info (epg-verify-result-to-string
|
|
|
|
(epg-context-result-for context 'verify))))))
|
|
|
|
|
|
|
|
(defun epa--read-signature-type ()
|
|
|
|
(let (type c)
|
|
|
|
(while (null type)
|
|
|
|
(message "Signature type (n,c,d,?) ")
|
|
|
|
(setq c (read-char))
|
|
|
|
(cond ((eq c ?c)
|
|
|
|
(setq type 'clear))
|
|
|
|
((eq c ?d)
|
|
|
|
(setq type 'detached))
|
|
|
|
((eq c ??)
|
|
|
|
(with-output-to-temp-buffer "*Help*"
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
(with-current-buffer standard-output
|
2008-02-08 06:54:27 +00:00
|
|
|
(insert "\
|
|
|
|
n - Create a normal signature
|
|
|
|
c - Create a cleartext signature
|
|
|
|
d - Create a detached signature
|
|
|
|
? - Show this help
|
|
|
|
"))))
|
|
|
|
(t
|
2009-05-03 05:46:08 +00:00
|
|
|
(setq type 'normal))))
|
|
|
|
type))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-sign-file (file signers mode)
|
|
|
|
"Sign FILE by SIGNERS keys selected."
|
|
|
|
(interactive
|
|
|
|
(let ((verbose current-prefix-arg))
|
|
|
|
(list (expand-file-name (read-file-name "File: "))
|
|
|
|
(if verbose
|
|
|
|
(epa-select-keys (epg-make-context epa-protocol)
|
|
|
|
"Select keys for signing.
|
|
|
|
If no one is selected, default secret key is used. "
|
|
|
|
nil t))
|
|
|
|
(if verbose
|
|
|
|
(epa--read-signature-type)
|
|
|
|
'clear))))
|
|
|
|
(let ((signature (concat file
|
|
|
|
(if (eq epa-protocol 'OpenPGP)
|
|
|
|
(if (or epa-armor
|
|
|
|
(not (memq mode
|
|
|
|
'(nil t normal detached))))
|
|
|
|
".asc"
|
|
|
|
(if (memq mode '(t detached))
|
|
|
|
".sig"
|
|
|
|
".gpg"))
|
|
|
|
(if (memq mode '(t detached))
|
|
|
|
".p7s"
|
|
|
|
".p7m"))))
|
|
|
|
(context (epg-make-context epa-protocol)))
|
|
|
|
(epg-context-set-armor context epa-armor)
|
|
|
|
(epg-context-set-textmode context epa-textmode)
|
|
|
|
(epg-context-set-signers context signers)
|
|
|
|
(epg-context-set-passphrase-callback context
|
|
|
|
#'epa-passphrase-callback-function)
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
(format "Signing %s..."
|
|
|
|
(file-name-nondirectory file))))
|
|
|
|
(message "Signing %s..." (file-name-nondirectory file))
|
|
|
|
(epg-sign-file context file signature mode)
|
|
|
|
(message "Signing %s...wrote %s" (file-name-nondirectory file)
|
|
|
|
(file-name-nondirectory signature))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-encrypt-file (file recipients)
|
|
|
|
"Encrypt FILE for RECIPIENTS."
|
|
|
|
(interactive
|
|
|
|
(list (expand-file-name (read-file-name "File: "))
|
|
|
|
(epa-select-keys (epg-make-context epa-protocol)
|
|
|
|
"Select recipients for encryption.
|
|
|
|
If no one is selected, symmetric encryption will be performed. ")))
|
|
|
|
(let ((cipher (concat file (if (eq epa-protocol 'OpenPGP)
|
|
|
|
(if epa-armor ".asc" ".gpg")
|
|
|
|
".p7m")))
|
|
|
|
(context (epg-make-context epa-protocol)))
|
|
|
|
(epg-context-set-armor context epa-armor)
|
|
|
|
(epg-context-set-textmode context epa-textmode)
|
|
|
|
(epg-context-set-passphrase-callback context
|
|
|
|
#'epa-passphrase-callback-function)
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
(format "Encrypting %s..."
|
|
|
|
(file-name-nondirectory file))))
|
|
|
|
(message "Encrypting %s..." (file-name-nondirectory file))
|
|
|
|
(epg-encrypt-file context file recipients cipher)
|
|
|
|
(message "Encrypting %s...wrote %s" (file-name-nondirectory file)
|
|
|
|
(file-name-nondirectory cipher))))
|
|
|
|
|
|
|
|
;;;###autoload
|
2011-08-16 02:06:32 +00:00
|
|
|
(defun epa-decrypt-region (start end &optional make-buffer-function)
|
2008-02-08 06:54:27 +00:00
|
|
|
"Decrypt the current region between START and END.
|
2011-08-16 02:06:32 +00:00
|
|
|
|
|
|
|
If MAKE-BUFFER-FUNCTION is non-nil, call it to prepare an output buffer.
|
|
|
|
It should return that buffer. If it copies the input, it should
|
|
|
|
delete the text now being decrypted. It should leave point at the
|
|
|
|
proper place to insert the plaintext.
|
2008-02-08 06:54:27 +00:00
|
|
|
|
2011-08-16 01:40:26 +00:00
|
|
|
Be careful about using this command in Lisp programs!
|
2008-04-01 05:28:04 +00:00
|
|
|
Since this function operates on regions, it does some tricks such
|
|
|
|
as coding-system detection and unibyte/multibyte conversion. If
|
|
|
|
you are sure how the data in the region should be treated, you
|
|
|
|
should consider using the string based counterpart
|
|
|
|
`epg-decrypt-string', or the file based counterpart
|
|
|
|
`epg-decrypt-file' instead.
|
|
|
|
|
|
|
|
For example:
|
|
|
|
|
|
|
|
\(let ((context (epg-make-context 'OpenPGP)))
|
|
|
|
(decode-coding-string
|
|
|
|
(epg-decrypt-string context (buffer-substring start end))
|
|
|
|
'utf-8))"
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive "r")
|
|
|
|
(save-excursion
|
|
|
|
(let ((context (epg-make-context epa-protocol))
|
|
|
|
plain)
|
|
|
|
(epg-context-set-passphrase-callback context
|
|
|
|
#'epa-passphrase-callback-function)
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
"Decrypting..."))
|
|
|
|
(message "Decrypting...")
|
|
|
|
(setq plain (epg-decrypt-string context (buffer-substring start end)))
|
|
|
|
(message "Decrypting...done")
|
|
|
|
(setq plain (epa--decode-coding-string
|
|
|
|
plain
|
|
|
|
(or coding-system-for-read
|
2009-06-05 01:58:53 +00:00
|
|
|
(get-text-property start 'epa-coding-system-used)
|
|
|
|
'undecided)))
|
2011-08-16 02:18:10 +00:00
|
|
|
(if make-buffer-function
|
|
|
|
(with-current-buffer (funcall make-buffer-function)
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(insert plain)))
|
|
|
|
(if (y-or-n-p "Replace the original text? ")
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(delete-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(insert plain))
|
2011-08-16 01:40:26 +00:00
|
|
|
(with-output-to-temp-buffer "*Temp*"
|
|
|
|
(set-buffer standard-output)
|
|
|
|
(insert plain)
|
|
|
|
(epa-info-mode))))
|
2008-02-08 06:54:27 +00:00
|
|
|
(if (epg-context-result-for context 'verify)
|
|
|
|
(epa-display-info (epg-verify-result-to-string
|
|
|
|
(epg-context-result-for context 'verify)))))))
|
|
|
|
|
|
|
|
(defun epa--find-coding-system-for-mime-charset (mime-charset)
|
|
|
|
(if (featurep 'xemacs)
|
|
|
|
(if (fboundp 'find-coding-system)
|
|
|
|
(find-coding-system mime-charset))
|
2011-08-16 01:40:26 +00:00
|
|
|
;; Find the first coding system which corresponds to MIME-CHARSET.
|
2008-02-08 06:54:27 +00:00
|
|
|
(let ((pointer (coding-system-list)))
|
|
|
|
(while (and pointer
|
2011-08-16 01:40:26 +00:00
|
|
|
(not (eq (coding-system-get (car pointer) 'mime-charset)
|
|
|
|
mime-charset)))
|
2008-02-08 06:54:27 +00:00
|
|
|
(setq pointer (cdr pointer)))
|
2011-08-16 01:40:26 +00:00
|
|
|
(car pointer))))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-decrypt-armor-in-region (start end)
|
|
|
|
"Decrypt OpenPGP armors in the current region between START and END.
|
|
|
|
|
2008-04-01 05:28:04 +00:00
|
|
|
Don't use this command in Lisp programs!
|
|
|
|
See the reason described in the `epa-decrypt-region' documentation."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive "r")
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(let (armor-start armor-end)
|
|
|
|
(while (re-search-forward "-----BEGIN PGP MESSAGE-----$" nil t)
|
|
|
|
(setq armor-start (match-beginning 0)
|
|
|
|
armor-end (re-search-forward "^-----END PGP MESSAGE-----$"
|
|
|
|
nil t))
|
|
|
|
(unless armor-end
|
2011-08-16 01:40:26 +00:00
|
|
|
(error "Encryption armor beginning has no matching end"))
|
2008-02-08 06:54:27 +00:00
|
|
|
(goto-char armor-start)
|
|
|
|
(let ((coding-system-for-read
|
|
|
|
(or coding-system-for-read
|
|
|
|
(if (re-search-forward "^Charset: \\(.*\\)" armor-end t)
|
|
|
|
(epa--find-coding-system-for-mime-charset
|
|
|
|
(intern (downcase (match-string 1))))))))
|
|
|
|
(goto-char armor-end)
|
|
|
|
(epa-decrypt-region armor-start armor-end)))))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-verify-region (start end)
|
|
|
|
"Verify the current region between START and END.
|
|
|
|
|
2008-04-01 05:28:04 +00:00
|
|
|
Don't use this command in Lisp programs!
|
|
|
|
Since this function operates on regions, it does some tricks such
|
|
|
|
as coding-system detection and unibyte/multibyte conversion. If
|
|
|
|
you are sure how the data in the region should be treated, you
|
|
|
|
should consider using the string based counterpart
|
|
|
|
`epg-verify-string', or the file based counterpart
|
|
|
|
`epg-verify-file' instead.
|
|
|
|
|
|
|
|
For example:
|
|
|
|
|
|
|
|
\(let ((context (epg-make-context 'OpenPGP)))
|
|
|
|
(decode-coding-string
|
|
|
|
(epg-verify-string context (buffer-substring start end))
|
|
|
|
'utf-8))"
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive "r")
|
|
|
|
(let ((context (epg-make-context epa-protocol))
|
|
|
|
plain)
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
"Verifying..."))
|
|
|
|
(message "Verifying...")
|
|
|
|
(setq plain (epg-verify-string
|
|
|
|
context
|
|
|
|
(epa--encode-coding-string
|
|
|
|
(buffer-substring start end)
|
|
|
|
(or coding-system-for-write
|
|
|
|
(get-text-property start 'epa-coding-system-used)))))
|
|
|
|
(message "Verifying...done")
|
|
|
|
(setq plain (epa--decode-coding-string
|
|
|
|
plain
|
|
|
|
(or coding-system-for-read
|
2009-06-05 01:58:53 +00:00
|
|
|
(get-text-property start 'epa-coding-system-used)
|
|
|
|
'undecided)))
|
2008-02-08 06:54:27 +00:00
|
|
|
(if (y-or-n-p "Replace the original text? ")
|
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
buffer-read-only)
|
|
|
|
(delete-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(insert plain))
|
|
|
|
(with-output-to-temp-buffer "*Temp*"
|
|
|
|
(set-buffer standard-output)
|
|
|
|
(insert plain)
|
|
|
|
(epa-info-mode)))
|
|
|
|
(if (epg-context-result-for context 'verify)
|
|
|
|
(epa-display-info (epg-verify-result-to-string
|
|
|
|
(epg-context-result-for context 'verify))))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-verify-cleartext-in-region (start end)
|
|
|
|
"Verify OpenPGP cleartext signed messages in the current region
|
|
|
|
between START and END.
|
|
|
|
|
2008-04-01 05:28:04 +00:00
|
|
|
Don't use this command in Lisp programs!
|
|
|
|
See the reason described in the `epa-verify-region' documentation."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive "r")
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(let (cleartext-start cleartext-end)
|
|
|
|
(while (re-search-forward "-----BEGIN PGP SIGNED MESSAGE-----$"
|
|
|
|
nil t)
|
|
|
|
(setq cleartext-start (match-beginning 0))
|
|
|
|
(unless (re-search-forward "^-----BEGIN PGP SIGNATURE-----$"
|
|
|
|
nil t)
|
|
|
|
(error "Invalid cleartext signed message"))
|
|
|
|
(setq cleartext-end (re-search-forward
|
|
|
|
"^-----END PGP SIGNATURE-----$"
|
|
|
|
nil t))
|
|
|
|
(unless cleartext-end
|
|
|
|
(error "No cleartext tail"))
|
|
|
|
(epa-verify-region cleartext-start cleartext-end))))))
|
|
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
(if (fboundp 'select-safe-coding-system)
|
|
|
|
(defalias 'epa--select-safe-coding-system 'select-safe-coding-system)
|
2011-04-04 06:16:23 +00:00
|
|
|
(defun epa--select-safe-coding-system (_from _to)
|
2008-02-08 06:54:27 +00:00
|
|
|
buffer-file-coding-system)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-sign-region (start end signers mode)
|
|
|
|
"Sign the current region between START and END by SIGNERS keys selected.
|
|
|
|
|
2008-04-01 05:28:04 +00:00
|
|
|
Don't use this command in Lisp programs!
|
|
|
|
Since this function operates on regions, it does some tricks such
|
|
|
|
as coding-system detection and unibyte/multibyte conversion. If
|
|
|
|
you are sure how the data should be treated, you should consider
|
|
|
|
using the string based counterpart `epg-sign-string', or the file
|
|
|
|
based counterpart `epg-sign-file' instead.
|
|
|
|
|
|
|
|
For example:
|
|
|
|
|
|
|
|
\(let ((context (epg-make-context 'OpenPGP)))
|
|
|
|
(epg-sign-string
|
|
|
|
context
|
|
|
|
(encode-coding-string (buffer-substring start end) 'utf-8)))"
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive
|
|
|
|
(let ((verbose current-prefix-arg))
|
|
|
|
(setq epa-last-coding-system-specified
|
|
|
|
(or coding-system-for-write
|
|
|
|
(epa--select-safe-coding-system
|
|
|
|
(region-beginning) (region-end))))
|
|
|
|
(list (region-beginning) (region-end)
|
|
|
|
(if verbose
|
|
|
|
(epa-select-keys (epg-make-context epa-protocol)
|
|
|
|
"Select keys for signing.
|
|
|
|
If no one is selected, default secret key is used. "
|
|
|
|
nil t))
|
|
|
|
(if verbose
|
|
|
|
(epa--read-signature-type)
|
|
|
|
'clear))))
|
|
|
|
(save-excursion
|
|
|
|
(let ((context (epg-make-context epa-protocol))
|
|
|
|
signature)
|
|
|
|
;;(epg-context-set-armor context epa-armor)
|
|
|
|
(epg-context-set-armor context t)
|
|
|
|
;;(epg-context-set-textmode context epa-textmode)
|
|
|
|
(epg-context-set-textmode context t)
|
|
|
|
(epg-context-set-signers context signers)
|
|
|
|
(epg-context-set-passphrase-callback context
|
|
|
|
#'epa-passphrase-callback-function)
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
"Signing..."))
|
|
|
|
(message "Signing...")
|
|
|
|
(setq signature (epg-sign-string context
|
|
|
|
(epa--encode-coding-string
|
|
|
|
(buffer-substring start end)
|
|
|
|
epa-last-coding-system-specified)
|
|
|
|
mode))
|
|
|
|
(message "Signing...done")
|
|
|
|
(delete-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(add-text-properties (point)
|
|
|
|
(progn
|
|
|
|
(insert (epa--decode-coding-string
|
|
|
|
signature
|
|
|
|
(or coding-system-for-read
|
|
|
|
epa-last-coding-system-specified)))
|
|
|
|
(point))
|
|
|
|
(list 'epa-coding-system-used
|
|
|
|
epa-last-coding-system-specified
|
|
|
|
'front-sticky nil
|
|
|
|
'rear-nonsticky t
|
|
|
|
'start-open t
|
|
|
|
'end-open t)))))
|
|
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
(if (fboundp 'derived-mode-p)
|
|
|
|
(defalias 'epa--derived-mode-p 'derived-mode-p)
|
|
|
|
(defun epa--derived-mode-p (&rest modes)
|
|
|
|
"Non-nil if the current major mode is derived from one of MODES.
|
|
|
|
Uses the `derived-mode-parent' property of the symbol to trace backwards."
|
|
|
|
(let ((parent major-mode))
|
|
|
|
(while (and (not (memq parent modes))
|
|
|
|
(setq parent (get parent 'derived-mode-parent))))
|
|
|
|
parent))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-encrypt-region (start end recipients sign signers)
|
|
|
|
"Encrypt the current region between START and END for RECIPIENTS.
|
|
|
|
|
2008-04-01 05:28:04 +00:00
|
|
|
Don't use this command in Lisp programs!
|
|
|
|
Since this function operates on regions, it does some tricks such
|
|
|
|
as coding-system detection and unibyte/multibyte conversion. If
|
|
|
|
you are sure how the data should be treated, you should consider
|
|
|
|
using the string based counterpart `epg-encrypt-string', or the
|
|
|
|
file based counterpart `epg-encrypt-file' instead.
|
|
|
|
|
|
|
|
For example:
|
|
|
|
|
|
|
|
\(let ((context (epg-make-context 'OpenPGP)))
|
|
|
|
(epg-encrypt-string
|
|
|
|
context
|
|
|
|
(encode-coding-string (buffer-substring start end) 'utf-8)
|
|
|
|
nil))"
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive
|
|
|
|
(let ((verbose current-prefix-arg)
|
|
|
|
(context (epg-make-context epa-protocol))
|
|
|
|
sign)
|
|
|
|
(setq epa-last-coding-system-specified
|
|
|
|
(or coding-system-for-write
|
|
|
|
(epa--select-safe-coding-system
|
|
|
|
(region-beginning) (region-end))))
|
|
|
|
(list (region-beginning) (region-end)
|
|
|
|
(epa-select-keys context
|
|
|
|
"Select recipients for encryption.
|
|
|
|
If no one is selected, symmetric encryption will be performed. ")
|
|
|
|
(setq sign (if verbose (y-or-n-p "Sign? ")))
|
|
|
|
(if sign
|
|
|
|
(epa-select-keys context
|
|
|
|
"Select keys for signing. ")))))
|
|
|
|
(save-excursion
|
|
|
|
(let ((context (epg-make-context epa-protocol))
|
|
|
|
cipher)
|
|
|
|
;;(epg-context-set-armor context epa-armor)
|
|
|
|
(epg-context-set-armor context t)
|
|
|
|
;;(epg-context-set-textmode context epa-textmode)
|
|
|
|
(epg-context-set-textmode context t)
|
|
|
|
(if sign
|
|
|
|
(epg-context-set-signers context signers))
|
|
|
|
(epg-context-set-passphrase-callback context
|
|
|
|
#'epa-passphrase-callback-function)
|
|
|
|
(epg-context-set-progress-callback context
|
|
|
|
(cons
|
|
|
|
#'epa-progress-callback-function
|
|
|
|
"Encrypting..."))
|
|
|
|
(message "Encrypting...")
|
|
|
|
(setq cipher (epg-encrypt-string context
|
|
|
|
(epa--encode-coding-string
|
|
|
|
(buffer-substring start end)
|
|
|
|
epa-last-coding-system-specified)
|
|
|
|
recipients
|
|
|
|
sign))
|
|
|
|
(message "Encrypting...done")
|
|
|
|
(delete-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(add-text-properties (point)
|
|
|
|
(progn
|
|
|
|
(insert cipher)
|
|
|
|
(point))
|
|
|
|
(list 'epa-coding-system-used
|
|
|
|
epa-last-coding-system-specified
|
|
|
|
'front-sticky nil
|
|
|
|
'rear-nonsticky t
|
|
|
|
'start-open t
|
|
|
|
'end-open t)))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-delete-keys (keys &optional allow-secret)
|
2008-04-01 05:28:04 +00:00
|
|
|
"Delete selected KEYS."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive
|
|
|
|
(let ((keys (epa--marked-keys)))
|
|
|
|
(unless keys
|
|
|
|
(error "No keys selected"))
|
|
|
|
(list keys
|
|
|
|
(eq (nth 1 epa-list-keys-arguments) t))))
|
|
|
|
(let ((context (epg-make-context epa-protocol)))
|
|
|
|
(message "Deleting...")
|
|
|
|
(epg-delete-keys context keys allow-secret)
|
|
|
|
(message "Deleting...done")
|
2008-04-29 07:10:55 +00:00
|
|
|
(apply #'epa--list-keys epa-list-keys-arguments)))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-import-keys (file)
|
2008-04-01 05:28:04 +00:00
|
|
|
"Import keys from FILE."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive "fFile: ")
|
|
|
|
(setq file (expand-file-name file))
|
|
|
|
(let ((context (epg-make-context epa-protocol)))
|
|
|
|
(message "Importing %s..." (file-name-nondirectory file))
|
|
|
|
(condition-case nil
|
|
|
|
(progn
|
|
|
|
(epg-import-keys-from-file context file)
|
|
|
|
(message "Importing %s...done" (file-name-nondirectory file)))
|
|
|
|
(error
|
|
|
|
(message "Importing %s...failed" (file-name-nondirectory file))))
|
|
|
|
(if (epg-context-result-for context 'import)
|
|
|
|
(epa-display-info (epg-import-result-to-string
|
|
|
|
(epg-context-result-for context 'import))))
|
|
|
|
(if (eq major-mode 'epa-key-list-mode)
|
2008-04-29 07:10:55 +00:00
|
|
|
(apply #'epa--list-keys epa-list-keys-arguments))))
|
2008-02-08 06:54:27 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-import-keys-region (start end)
|
2008-04-01 05:28:04 +00:00
|
|
|
"Import keys from the region."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive "r")
|
|
|
|
(let ((context (epg-make-context epa-protocol)))
|
|
|
|
(message "Importing...")
|
|
|
|
(condition-case nil
|
|
|
|
(progn
|
|
|
|
(epg-import-keys-from-string context (buffer-substring start end))
|
|
|
|
(message "Importing...done"))
|
|
|
|
(error
|
|
|
|
(message "Importing...failed")))
|
|
|
|
(if (epg-context-result-for context 'import)
|
|
|
|
(epa-display-info (epg-import-result-to-string
|
|
|
|
(epg-context-result-for context 'import))))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-import-armor-in-region (start end)
|
|
|
|
"Import keys in the OpenPGP armor format in the current region
|
2008-04-01 05:28:04 +00:00
|
|
|
between START and END."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive "r")
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(let (armor-start armor-end)
|
|
|
|
(while (re-search-forward
|
|
|
|
"-----BEGIN \\(PGP \\(PUBLIC\\|PRIVATE\\) KEY BLOCK\\)-----$"
|
|
|
|
nil t)
|
|
|
|
(setq armor-start (match-beginning 0)
|
|
|
|
armor-end (re-search-forward
|
|
|
|
(concat "^-----END " (match-string 1) "-----$")
|
|
|
|
nil t))
|
|
|
|
(unless armor-end
|
|
|
|
(error "No armor tail"))
|
|
|
|
(epa-import-keys-region armor-start armor-end))))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-export-keys (keys file)
|
2008-04-01 05:28:04 +00:00
|
|
|
"Export selected KEYS to FILE."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive
|
|
|
|
(let ((keys (epa--marked-keys))
|
|
|
|
default-name)
|
|
|
|
(unless keys
|
|
|
|
(error "No keys selected"))
|
|
|
|
(setq default-name
|
|
|
|
(expand-file-name
|
|
|
|
(concat (epg-sub-key-id (car (epg-key-sub-key-list (car keys))))
|
|
|
|
(if epa-armor ".asc" ".gpg"))
|
|
|
|
default-directory))
|
|
|
|
(list keys
|
|
|
|
(expand-file-name
|
|
|
|
(read-file-name
|
|
|
|
(concat "To file (default "
|
|
|
|
(file-name-nondirectory default-name)
|
|
|
|
") ")
|
|
|
|
(file-name-directory default-name)
|
|
|
|
default-name)))))
|
|
|
|
(let ((context (epg-make-context epa-protocol)))
|
|
|
|
(epg-context-set-armor context epa-armor)
|
|
|
|
(message "Exporting to %s..." (file-name-nondirectory file))
|
|
|
|
(epg-export-keys-to-file context keys file)
|
|
|
|
(message "Exporting to %s...done" (file-name-nondirectory file))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun epa-insert-keys (keys)
|
2008-04-01 05:28:04 +00:00
|
|
|
"Insert selected KEYS after the point."
|
2008-02-08 06:54:27 +00:00
|
|
|
(interactive
|
|
|
|
(list (epa-select-keys (epg-make-context epa-protocol)
|
2012-04-04 01:38:37 +00:00
|
|
|
"Select keys to export.
|
|
|
|
If no one is selected, default public key is exported. ")))
|
2008-02-08 06:54:27 +00:00
|
|
|
(let ((context (epg-make-context epa-protocol)))
|
|
|
|
;;(epg-context-set-armor context epa-armor)
|
|
|
|
(epg-context-set-armor context t)
|
|
|
|
(insert (epg-export-keys-to-string context keys))))
|
|
|
|
|
|
|
|
;; (defun epa-sign-keys (keys &optional local)
|
|
|
|
;; "Sign selected KEYS.
|
|
|
|
;; If a prefix-arg is specified, the signature is marked as non exportable.
|
|
|
|
|
|
|
|
;; Don't use this command in Lisp programs!"
|
|
|
|
;; (interactive
|
|
|
|
;; (let ((keys (epa--marked-keys)))
|
|
|
|
;; (unless keys
|
|
|
|
;; (error "No keys selected"))
|
|
|
|
;; (list keys current-prefix-arg)))
|
|
|
|
;; (let ((context (epg-make-context epa-protocol)))
|
|
|
|
;; (epg-context-set-passphrase-callback context
|
|
|
|
;; #'epa-passphrase-callback-function)
|
|
|
|
;; (epg-context-set-progress-callback context
|
|
|
|
;; (cons
|
|
|
|
;; #'epa-progress-callback-function
|
|
|
|
;; "Signing keys..."))
|
|
|
|
;; (message "Signing keys...")
|
|
|
|
;; (epg-sign-keys context keys local)
|
|
|
|
;; (message "Signing keys...done")))
|
|
|
|
;; (make-obsolete 'epa-sign-keys "Do not use.")
|
|
|
|
|
|
|
|
(provide 'epa)
|
|
|
|
|
|
|
|
;;; epa.el ends here
|