Mercurial > emacs
changeset 68114:86ac787740e6
(mh-variant-mu-mh-info, mh-variant-nmh-info): Applied patch from
Satyaki from SF #1016027.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Tue, 10 Jan 2006 06:44:16 +0000 |
| parents | 92cb4eaf9123 |
| children | 09374864b194 |
| files | lisp/mh-e/ChangeLog lisp/mh-e/mh-init.el |
| diffstat | 2 files changed, 21 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog Tue Jan 10 04:05:46 2006 +0000 +++ b/lisp/mh-e/ChangeLog Tue Jan 10 06:44:16 2006 +0000 @@ -1,5 +1,8 @@ 2006-01-09 Bill Wohler <wohler@newt.com> + * mh-init.el (mh-variant-mu-mh-info, mh-variant-nmh-info): Applied + patch from Satyaki from SF #1016027. + * mh-e.el (mh-rescan-folder): Try to keep cursor at current message, even if cur sequence is no longer present (closes SF #1207247).
--- a/lisp/mh-e/mh-init.el Tue Jan 10 04:05:46 2006 +0000 +++ b/lisp/mh-e/mh-init.el Tue Jan 10 06:44:16 2006 +0000 @@ -239,23 +239,15 @@ (goto-char (point-min)) (when (search-forward-regexp "mhparam (\\(GNU [Mm]ailutils \\S +\\))" nil t) - (let ((version (match-string 1))) - (erase-buffer) - (call-process mhparam nil '(t nil) nil "libdir" "etcdir") - (goto-char (point-min)) - (when (search-forward-regexp "^libdir:\\s-\\(\\S-+\\)\\s-*$" nil t) - (let ((libdir (match-string 1))) - (goto-char (point-min)) - (when (search-forward-regexp - "^etcdir:\\s-\\(\\S-+\\)\\s-*$" nil t) - (let ((etcdir (match-string 1)) - (flists (file-exists-p (expand-file-name "flists" dir)))) - `(,version - (variant mu-mh) - (mh-lib-progs ,libdir) - (mh-lib ,etcdir) - (mh-progs ,dir) - (flists ,flists))))))))))) + (let ((version (match-string 1)) + (mh-progs dir)) + `(,version + (variant mu-mh) + (mh-lib-progs ,(mh-profile-component "libdir")) + (mh-lib ,(mh-profile-component "etcdir")) + (mh-progs ,dir) + (flists ,(file-exists-p + (expand-file-name "flists" dir))))))))) (defun mh-variant-nmh-info (dir) "Return info for nmh variant in DIR assuming a temporary buffer is setup." @@ -267,23 +259,15 @@ (call-process mhparam nil '(t nil) nil "-version") (goto-char (point-min)) (when (search-forward-regexp "mhparam -- nmh-\\(\\S +\\)" nil t) - (let ((version (format "nmh %s" (match-string 1)))) - (erase-buffer) - (call-process mhparam nil '(t nil) nil "libdir" "etcdir") - (goto-char (point-min)) - (when (search-forward-regexp "^libdir:\\s-\\(\\S-+\\)\\s-*$" nil t) - (let ((libdir (match-string 1))) - (goto-char (point-min)) - (when (search-forward-regexp - "^etcdir:\\s-\\(\\S-+\\)\\s-*$" nil t) - (let ((etcdir (match-string 1)) - (flists (file-exists-p (expand-file-name "flists" dir)))) - `(,version - (variant nmh) - (mh-lib-progs ,libdir) - (mh-lib ,etcdir) - (mh-progs ,dir) - (flists ,flists))))))))))) + (let ((version (format "nmh %s" (match-string 1))) + (mh-progs dir)) + `(,version + (variant nmh) + (mh-lib-progs ,(mh-profile-component "libdir")) + (mh-lib ,(mh-profile-component "etcdir")) + (mh-progs ,dir) + (flists ,(file-exists-p + (expand-file-name "flists" dir))))))))) (defun mh-variant-info (dir) "Return MH variant found in DIR, or nil if none present."