view lisp/pgg-def.el @ 109383:dcdf09a52e2c

[[[ * lisp/bookmark.el (bookmark-bmenu-switch-other-window, bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override ambient binding of `bookmark-automatically-show-annotations'. (Bug #6515) ]]] === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2010-04-14 15:07:53 +0000 +++ lisp/bookmark.el 2010-06-27 03:40:14 +0000 @@ -1860,8 +1860,7 @@ (pop-up-windows t)) (delete-other-windows) (switch-to-buffer (other-buffer)) - (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed? - (bookmark--jump-via bmrk 'pop-to-buffer)) + (bookmark--jump-via bmrk 'pop-to-buffer) (bury-buffer menu))) @@ -1875,8 +1874,7 @@ "Select this line's bookmark in other window, leaving bookmark menu visible." (interactive) (let ((bookmark (bookmark-bmenu-bookmark))) - (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? - (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))) + (bookmark--jump-via bookmark 'switch-to-buffer-other-window))) (defun bookmark-bmenu-switch-other-window () @@ -1887,8 +1885,7 @@ (pop-up-windows t) same-window-buffer-names same-window-regexps) - (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? - (bookmark--jump-via bookmark 'display-buffer)))) + (bookmark--jump-via bookmark 'display-buffer))) (defun bookmark-bmenu-other-window-with-mouse (event) "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible." === modified file 'lisp/saveplace.el' --- lisp/saveplace.el 2010-01-13 08:35:10 +0000 +++ lisp/saveplace.el 2010-02-07 23:14:52 +0000 @@ -213,7 +213,7 @@ (symbol-name coding-system-for-write))) (let ((print-length nil) (print-level nil)) - (print save-place-alist (current-buffer))) + (pp save-place-alist (current-buffer))) (let ((version-control (cond ((null save-place-version-control) nil)

;;; pgg-def.el --- functions/macros for defining PGG functions

;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

;; Author: Daiki Ueno <[e-mail]>
;; Created: 1999/11/02
;; Keywords: PGP, OpenPGP, GnuPG

;; This file is part of GNU Emacs.

;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; 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
;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

;;; Code:

(defgroup pgg ()
  "Glue for the various PGP implementations."
  :group 'mime
  :version "22.1")

(defcustom pgg-default-scheme 'gpg
  "Default PGP scheme."
  :group 'pgg
  :type '(choice (const :tag "GnuPG" gpg)
		 (const :tag "PGP 5" pgp5)
		 (const :tag "PGP" pgp)))

(defcustom pgg-default-user-id (user-login-name)
  "User ID of your default identity."
  :group 'pgg
  :type 'string)

(defcustom pgg-default-keyserver-address "subkeys.pgp.net"
  "Host name of keyserver."
  :group 'pgg
  :type 'string)

(defcustom pgg-query-keyserver nil
  "Whether PGG queries keyservers for missing keys when verifying messages."
  :version "22.1"
  :group 'pgg
  :type 'boolean)

(defcustom pgg-encrypt-for-me t
  "If t, encrypt all outgoing messages with user's public key."
  :group 'pgg
  :type 'boolean)

(defcustom pgg-cache-passphrase t
  "If t, cache passphrase."
  :group 'pgg
  :type 'boolean)

(defcustom pgg-passphrase-cache-expiry 16
  "How many seconds the passphrase is cached.
Whether the passphrase is cached at all is controlled by
`pgg-cache-passphrase'."
  :group 'pgg
  :type 'integer)

(defcustom pgg-passphrase-coding-system nil
  "Coding system to encode passphrase."
  :group 'pgg
  :type 'coding-system)

(defvar pgg-messages-coding-system nil
  "Coding system used when reading from a PGP external process.")

(defvar pgg-status-buffer " *PGG status*")
(defvar pgg-errors-buffer " *PGG errors*")
(defvar pgg-output-buffer " *PGG output*")

(defvar pgg-echo-buffer "*PGG-echo*")

(defvar pgg-scheme nil
  "Current scheme of PGP implementation.")

(defvar pgg-text-mode nil
  "If t, inform the recipient that the input is text.")

(defmacro pgg-truncate-key-identifier (key)
  `(if (> (length ,key) 8) (substring ,key -8) ,key))

(provide 'pgg-def)

;; arch-tag: c425f3ab-ed75-4055-bb46-431a418c94b7
;;; pgg-def.el ends here