Mercurial > emacs
comparison lisp/mail/hashcash.el @ 87209:bc4976b7380e
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-950
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 09 Dec 2007 22:14:32 +0000 |
parents | b37f01064ecf |
children | b9e8ab94c460 |
comparison
equal
deleted
inserted
replaced
87208:87e24ce4f26a | 87209:bc4976b7380e |
---|---|
113 "Alist of asynchronous hashcash processes and buffers.") | 113 "Alist of asynchronous hashcash processes and buffers.") |
114 | 114 |
115 (require 'mail-utils) | 115 (require 'mail-utils) |
116 | 116 |
117 (eval-and-compile | 117 (eval-and-compile |
118 (if (fboundp 'point-at-bol) | 118 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))) |
119 (defalias 'hashcash-point-at-bol 'point-at-bol) | 119 |
120 (defalias 'hashcash-point-at-bol 'line-beginning-position)) | 120 (if (fboundp 'point-at-bol) |
121 | 121 (defalias 'hashcash-point-at-bol 'point-at-bol) |
122 (if (fboundp 'point-at-eol) | 122 (defalias 'hashcash-point-at-bol 'line-beginning-position)) |
123 (defalias 'hashcash-point-at-eol 'point-at-eol) | 123 |
124 (defalias 'hashcash-point-at-eol 'line-end-position))) | 124 (if (fboundp 'point-at-eol) |
125 (defalias 'hashcash-point-at-eol 'point-at-eol) | |
126 (defalias 'hashcash-point-at-eol 'line-end-position))) | |
125 | 127 |
126 (defun hashcash-strip-quoted-names (addr) | 128 (defun hashcash-strip-quoted-names (addr) |
127 (setq addr (mail-strip-quoted-names addr)) | 129 (setq addr (mail-strip-quoted-names addr)) |
128 (if (and addr (string-match "\\`\\([^+@]+\\)\\+[^@]*\\(@.+\\)" addr)) | 130 (if (and addr (string-match "\\`\\([^+@]+\\)\\+[^@]*\\(@.+\\)" addr)) |
129 (concat (match-string 1 addr) (match-string 2 addr)) | 131 (concat (match-string 1 addr) (match-string 2 addr)) |