Mercurial > emacs
comparison lisp/gnus/smime.el @ 110661:2b8ece636433
Merge changes made in Gnus trunk.
nndraft.el (nndraft-request-expire-articles): Use the group name instead if "nndraft".
gnus.texi (Using IMAP): Remove the @acronyms from the headings.
nnregistry.el: Added.
nnimap.el (nnimap-insert-partial-structure): Be way more permissive when interpreting the structures.
GNUS-NEWS: Minor error in GNUS-NEWS - password-cache.el.
nnimap.el (nnimap-request-accept-article): Add \r\n to the lines to make this work with Cyrus.
gnus-registry.el: Don't prompt on load, which makes it impossible to build Gnus.
gnus-gravatar.el: Add gnus-gravatar-properties.
gnus-agent.el, gnus-art.el, gnus-bookmark.el, gnus-dired.el, gnus-group.el,\
gnus-int.el, gnus-msg.el, gnus-registry.el, gnus-score.el, gnus-srvr.el,\
gnus-sum.el, gnus-topic.el, gnus-util.el, gnus.el, mm-decode.el, mm-util.el,\
mm-view.el, mml-smime.el, mml.el, nnmairix.el, nnrss.el, smime.el:\
Introduce gnus-completing-read.
gnus-util.el: Make completing-read function configurable.
gnus-util.el: Add requires and fix history for iswitchb.
webmail.el: Remove netscape/my-deja, since they no longer exist.
gnus.el (gnus-local-domain): Declare variable obsolete.
nnimap.el (nnimap-insert-partial-structure): Get the type from the correct slot, too.
pop3.el (pop3-send-streaming-command, pop3-stream-length): New variable.
nnimap.el (nnimap-open-connection): Revert the auto-network->starttls code.
nnimap.el (nnimap-request-set-mark): Erase the buffer before issuing commands.
nnimap.el (nnimap-split-rule): Mark as obsolete.
gnus-sum.el (gnus-valid-move-group-p): Make sure that `group' is a symbol.
nnimap.el (nnimap-split-incoming-mail): Allow `default' as nnimap-split-methods value.
nnimap.el (nnimap-request-article): Downcase the NILs so that they are nil.
nndoc.el (nndoc-retrieve-groups): New function.
gnus.texi: Fix Gravatar documentation.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 30 Sep 2010 08:39:23 +0000 |
parents | f2e111723c3a |
children | 38ee498456a4 |
comparison
equal
deleted
inserted
replaced
110660:4b5aaeebe785 | 110661:2b8ece636433 |
---|---|
369 (unless (smime-sign-region | 369 (unless (smime-sign-region |
370 (point-min) (point-max) | 370 (point-min) (point-max) |
371 (if keyfile | 371 (if keyfile |
372 keyfile | 372 keyfile |
373 (smime-get-key-with-certs-by-email | 373 (smime-get-key-with-certs-by-email |
374 (completing-read | 374 (gnus-completing-read |
375 (concat "Sign using key" | 375 "Sign using key" |
376 (if smime-keys | 376 smime-keys nil (car-safe (car-safe smime-keys)))))) |
377 (concat " (default " (caar smime-keys) "): ") | |
378 ": ")) | |
379 smime-keys nil nil (car-safe (car-safe smime-keys)))))) | |
380 (error "Signing failed")))) | 377 (error "Signing failed")))) |
381 | 378 |
382 (defun smime-encrypt-buffer (&optional certfiles buffer) | 379 (defun smime-encrypt-buffer (&optional certfiles buffer) |
383 "S/MIME encrypt BUFFER for recipients specified in CERTFILES. | 380 "S/MIME encrypt BUFFER for recipients specified in CERTFILES. |
384 CERTFILES is a list of filenames, each file is expected to consist of | 381 CERTFILES is a list of filenames, each file is expected to consist of |
500 (smime-decrypt-region | 497 (smime-decrypt-region |
501 (point-min) (point-max) | 498 (point-min) (point-max) |
502 (expand-file-name | 499 (expand-file-name |
503 (or keyfile | 500 (or keyfile |
504 (smime-get-key-by-email | 501 (smime-get-key-by-email |
505 (completing-read | 502 (gnus-completing-read |
506 (concat "Decipher using key" | 503 "Decipher using key" |
507 (if smime-keys (concat " (default " (caar smime-keys) "): ") | 504 smime-keys nil (car-safe (car-safe smime-keys))))))))) |
508 ": ")) | |
509 smime-keys nil nil (car-safe (car-safe smime-keys))))))))) | |
510 | 505 |
511 ;; Various operations | 506 ;; Various operations |
512 | 507 |
513 (defun smime-new-details-buffer () | 508 (defun smime-new-details-buffer () |
514 (with-current-buffer (get-buffer-create smime-details-buffer) | 509 (with-current-buffer (get-buffer-create smime-details-buffer) |
658 | 653 |
659 (define-key smime-mode-map "q" 'smime-exit) | 654 (define-key smime-mode-map "q" 'smime-exit) |
660 (define-key smime-mode-map "f" 'smime-certificate-info)) | 655 (define-key smime-mode-map "f" 'smime-certificate-info)) |
661 | 656 |
662 (autoload 'gnus-run-mode-hooks "gnus-util") | 657 (autoload 'gnus-run-mode-hooks "gnus-util") |
658 (autoload 'gnus-completing-read "gnus-util") | |
663 | 659 |
664 (defun smime-mode () | 660 (defun smime-mode () |
665 "Major mode for browsing, viewing and fetching certificates. | 661 "Major mode for browsing, viewing and fetching certificates. |
666 | 662 |
667 All normal editing commands are switched off. | 663 All normal editing commands are switched off. |