diff options
| author | Joerg Jaspert <joerg@debian.org> | 2014-02-24 07:17:32 -0500 |
|---|---|---|
| committer | Barak A. Pearlmutter <bap@debian.org> | 2014-02-24 07:17:32 -0500 |
| commit | d5f111187eec9f1e005091e5640969cfa131f004 (patch) | |
| tree | a1e11473c23fcb9a0cd1534dc87c27d320f8620b /lisp | |
| parent | 4517c9ba5fc3e6558e1d1adaa912e01c4f57ceb6 (diff) | |
debian-changes
Gbp-Pq: Name debian-changes
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bbdb-gnus.el | 10 | ||||
| -rw-r--r-- | lisp/bbdb-mhe.el | 28 |
2 files changed, 18 insertions, 20 deletions
diff --git a/lisp/bbdb-gnus.el b/lisp/bbdb-gnus.el index 0ea33db..e903c6a 100644 --- a/lisp/bbdb-gnus.el +++ b/lisp/bbdb-gnus.el @@ -580,13 +580,11 @@ excellent choice." (defcustom bbdb/gnus-split-myaddr-regexp (concat "^" (user-login-name) "$\\|^" (user-login-name) "@\\([-a-z0-9]+\\.\\)*" - (or gnus-local-domain (message-make-domain) + (or (message-make-domain) (system-name) "") "$") - "*This regular expression should match your address as found in the -From header of your mail. You should make sure gnus-local-domain or -gnus-use-generic-from are set before loading this module, if they differ -from (system-name). If you send mail/news from multiple addresses, then -you'll likely have to set this yourself anyways." + "This regular expression should match your address as found in +the From header of your mail. If you send mail/news from multiple +addresses, then you'll likely have to set this yourself anyway." :group 'bbdb-mua-specific-gnus-splitting :type 'string) diff --git a/lisp/bbdb-mhe.el b/lisp/bbdb-mhe.el index 717ae95..ee7187d 100644 --- a/lisp/bbdb-mhe.el +++ b/lisp/bbdb-mhe.el @@ -33,20 +33,20 @@ (defmacro bbdb/mh-cache-key (message) "Return a (numeric) key for MESSAGE" - (`(let* ((attrs (file-attributes (, message))) - (status-time (nth 6 attrs)) - (status-time-2 (cdr status-time)) - (inode (nth 10 attrs))) - (logxor (if (integerp inode) ;; if inode is larger than an emacs int, - inode ;; it's returned as a dotted pair - (car inode)) - (car status-time) - ;; We need the following test because XEmacs returns the - ;; status time as a dotted pair, whereas FSF and Epoch - ;; return it as list. - (if (integerp status-time-2) - status-time-2 - (car status-time-2)))))) + `(let* ((attrs (file-attributes , message)) + (status-time (nth 6 attrs)) + (status-time-2 (cdr status-time)) + (inode (nth 10 attrs))) + (logxor (if (integerp inode) ;; if inode is larger than an emacs int, + inode ;; it's returned as a dotted pair + (car inode)) + (car status-time) + ;; We need the following test because XEmacs returns the + ;; status time as a dotted pair, whereas FSF and Epoch + ;; return it as list. + (if (integerp status-time-2) + status-time-2 + (car status-time-2))))) ;;;###autoload (defun bbdb/mh-update-record (&optional offer-to-create) |