[Emacs-commit] emacs/lisp/mh-e mh-init.el ChangeLog

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/01/10 06:44:16

Modified files:
        lisp/mh-e      : mh-init.el ChangeLog 

Log message:
        (mh-variant-mu-mh-info, mh-variant-nmh-info): Applied patch from
        Satyaki from SF #1016027.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-init.el.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.103&tr2=1.104&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.103 emacs/lisp/mh-e/ChangeLog:1.104
--- emacs/lisp/mh-e/ChangeLog:1.103     Tue Jan 10 01:56:32 2006
+++ emacs/lisp/mh-e/ChangeLog   Tue Jan 10 06:44:16 2006
@@ -1,5 +1,8 @@
 2006-01-09  Bill Wohler  <address@hidden>
 
+       * 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).
Index: emacs/lisp/mh-e/mh-init.el
diff -u emacs/lisp/mh-e/mh-init.el:1.24 emacs/lisp/mh-e/mh-init.el:1.25
--- emacs/lisp/mh-e/mh-init.el:1.24     Mon Jan  9 20:15:48 2006
+++ emacs/lisp/mh-e/mh-init.el  Tue Jan 10 06:44:16 2006
@@ -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."