Re: mailcap-viewer-lessp is just plain wrong

[Shenghuo ZHU <zsh@cs.rochester.edu>]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

>>>>> "Mark" == Mark Buda <hermit@clark.net> writes:

[...]


Mark> (cond
Mark>  ; if only one is wild, the other one is better
Mark>  ((and x-wild (not y-wild))
Mark>   nil)
Mark>  ((and (not x-wild) y-wild)
Mark>   t)
Mark>  ; otherwise, if only one is lisp, it is better
Mark>  ((and x-lisp (not y-lisp))
Mark>   t)
Mark>  ((and (not x-lisp) y-lisp)
Mark>   nil)

This condition is not necessary.

Mark>  ; otherwise, compare them some other arbitrary way
Mark>  (t
Mark>   (blah blah blah)))

Done. Committed to CVS.

-- 
Shenghuo ZHU

1999-11-03 15:27:38  Shenghuo ZHU  <zsh@cs.rochester.edu>

	* mailcap.el (mailcap-viewer-lessp): Fix bug.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 97-121.diff --]
[-- Type: text/x-patch, Size: 673 bytes --]

Index: mailcap.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/mailcap.el,v
retrieving revision 5.23
diff -u -r5.23 mailcap.el
--- mailcap.el	1999/07/09 19:28:56	5.23
+++ mailcap.el	1999/11/03 20:29:40
@@ -623,11 +623,11 @@
 	(x-lisp (not (stringp (or (cdr-safe (assq 'viewer x)) ""))))
 	(y-lisp (not (stringp (or (cdr-safe (assq 'viewer y)) "")))))
     (cond
-     ((and x-lisp (not y-lisp))
-      t)
-     ((and (not y-lisp) x-wild (not y-wild))
-      t)
+     ((and x-wild (not y-wild))
+      nil)
      ((and (not x-wild) y-wild)
+      t)
+     ((and (not y-lisp) x-lisp)
       t)
      (t nil))))