Mercurial > emacs
comparison lisp/gnus/gnus-msg.el @ 90044:cb7f41387eb3
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-70
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 12 Nov 2004 02:53:04 +0000 |
parents | e24e2e78deda 4cbffc256922 |
children | 3ebd9bdb4fe5 |
comparison
equal
deleted
inserted
replaced
90043:e24e2e78deda | 90044:cb7f41387eb3 |
---|---|
1869 filep t))) | 1869 filep t))) |
1870 ;; Get the contents of file elems. | 1870 ;; Get the contents of file elems. |
1871 (when (and filep v) | 1871 (when (and filep v) |
1872 (setq v (with-temp-buffer | 1872 (setq v (with-temp-buffer |
1873 (insert-file-contents v) | 1873 (insert-file-contents v) |
1874 (goto-char (point-max)) | 1874 (buffer-substring |
1875 (skip-chars-backward "\n") | 1875 (point-min) |
1876 (delete-region (+ (point) (if (bolp) 0 1)) | 1876 (progn |
1877 (point-max)) | 1877 (goto-char (point-max)) |
1878 (buffer-string)))) | 1878 (if (zerop (skip-chars-backward "\n")) |
1879 (point) | |
1880 (1+ (point)))))))) | |
1879 (setq results (delq (assoc element results) results)) | 1881 (setq results (delq (assoc element results) results)) |
1880 (push (cons element v) results)))) | 1882 (push (cons element v) results)))) |
1881 ;; Now we have all the styles, so we insert them. | 1883 ;; Now we have all the styles, so we insert them. |
1882 (setq name (assq 'name results) | 1884 (setq name (assq 'name results) |
1883 address (assq 'address results)) | 1885 address (assq 'address results)) |