2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>

	* ediff-init.el (ediff-has-face-support-p): make it paint faces on
	tty's.
	* ediff-diff.el (ediff-exec-process): use --binary for fine
	differences whenever apropriate.
	* viper-cmd.el (viper-smart-suffix-list): rearranged list members.
	* viper.el (find-file,find-file-other-window): get viper to do
	wildcards.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3baeb08f703a68169a3c93c609f644958239e57..90c447d803f8fc39a8c78dc494423d4836c5aeb4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-06-05  Michael Kifer  <kifer@cs.sunysb.edu>
+       
+       * ediff-init.el (ediff-has-face-support-p): make it paint faces on
+       tty's.
+       * ediff-diff.el (ediff-exec-process): use --binary for fine
+       differences whenever apropriate.
+       * viper-cmd.el (viper-smart-suffix-list): rearranged list members.
+       * viper.el (find-file,find-file-other-window): get viper to do
+       wildcards. 
+       
 2000-06-04  Stefan Monnier  <monnier@cs.yale.edu>
 
        * emacs-lisp/easy-mmode.el (easy-mmode-define-toggle):

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 845416d07d94b1714435638ced22784be4d5fd1a..a7236bd1d35f89786614be5887281db4cc454381 100644 (file)
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -1135,7 +1135,9 @@ delimiter regions"))
     (setq args (append (split-string options) files))
     (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments
     ;; the --binary option, if present, should be used only for buffer jobs
+    ;; or for refining the differences
     (or (string-match "buffer" (symbol-name ediff-job-name))
+       (eq buffer ediff-fine-diff-buffer)
        (setq args (delete "--binary" args)))
     (unwind-protect
        (let ((directory default-directory)

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 438492032baf2ef6c85b3a2498a104535d1ce6f1..7cd3d3da229b836ab3e22dfff89473d8cc45eca5 100644 (file)
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -63,7 +63,8 @@ that Ediff doesn't know about.")
 (defun ediff-has-face-support-p ()
   (cond ((ediff-window-display-p))
        (ediff-force-faces)
-       (ediff-emacs-p (memq (ediff-device-type) '(pc)))
+       (ediff-emacs-p (or (x-display-color-p)
+                          (memq (ediff-device-type) '(pc))))
        (ediff-xemacs-p (memq (ediff-device-type) '(tty pc)))))
 
 (defun ediff-has-toolbar-support-p ()

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 91be4cf77655b08075382cf91ab46677d07fa6dc..4a0cc5ed3b337c26cdb50527b932c726301cb4b0 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1895,7 +1895,8 @@ Undo previous insertion and inserts new."
 
 
 (defcustom viper-smart-suffix-list
-  '("" "tex" "c" "cc" "C" "el" "java" "html" "htm" "pl" "flr" "P" "p")
+  '("" "tex" "c" "cc" "C" "java" "el" "html" "htm" "xml"
+    "pl" "flr" "P" "p" "h" "H")
   "*List of suffixes that Viper tries to append to filenames ending with a `.'.
 This is useful when you the current directory contains files with the same
 prefix and many different suffixes.  Usually, only one of the suffixes

diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index f5094a1b8da03eb094ce6c596ebd561b85625b8f..644bff67055eae51318edf16f7b45bd9843b9055 100644 (file)
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -400,6 +400,7 @@ widget."
     ps-mode
                                  
     completion-list-mode
+    diff-mode
     
     perl-mode
     javascript-mode
@@ -982,53 +983,44 @@ remains buffer-local."
   (defadvice find-file (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."
     (interactive (cons (read-file-name "Find file: " nil default-directory)
-                      ;; if Mule and prefix argument, ask for coding system
-                      (cond ((and viper-emacs-p 
-                                  (boundp 'MULE))   ; Emacs 20 with MULE
-                             nil)
-                            ((and viper-xemacs-p
-                                  (featurep 'mule)) ; XEmacs 20 with MULE
+                      ;; XEmacs: if Mule & prefix arg, ask for coding system
+                      (cond ((and viper-xemacs-p (featurep 'mule))
                              (list
                               (and current-prefix-arg
-                                   (read-coding-system 
-                                    "Coding-system: "))))
-                            )
-                      )))
+                                   (read-coding-system "Coding-system: "))))
+                            ;; Emacs: do wildcards
+                            ((and viper-emacs-p (boundp 'find-file-wildcards))
+                                  (list find-file-wildcards))))
+                ))
   
   (defadvice find-file-other-window (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."
     (interactive (cons (read-file-name "Find file in other window: "
                                       nil default-directory)
-                      ;; if Mule and prefix argument, ask for coding system
-                      (cond ((and viper-emacs-p 
-                                  (boundp 'MULE)) ; Emacs 20 with MULE
-                             nil)
-                            ((and viper-xemacs-p
-                                  (featurep 'mule))   ; XEmacs 20 with MULE
+                      ;; XEmacs: if Mule & prefix arg, ask for coding system
+                      (cond ((and viper-xemacs-p (featurep 'mule))
                              (list
                               (and current-prefix-arg
-                                   (read-coding-system 
-                                    "Coding-system: "))))
-                            )
-                      )))
+                                   (read-coding-system "Coding-system: "))))
+                            ;; Emacs: do wildcards
+                            ((and viper-emacs-p (boundp 'find-file-wildcards))
+                             (list find-file-wildcards))))
+                ))
   
 
   (defadvice find-file-other-frame (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."
     (interactive (cons (read-file-name "Find file in other frame: "
                                       nil default-directory)
-                      ;; if Mule and prefix argument, ask for coding system
-                      (cond ((and viper-emacs-p 
-                                  (boundp 'MULE))   ; Emacs 20 with MULE
-                             nil)
-                            ((and viper-xemacs-p
-                                  (featurep 'mule)) ; XEmacs 20 with MULE
+                      ;; XEmacs: if Mule & prefix arg, ask for coding system
+                      (cond ((and viper-xemacs-p (featurep 'mule))
                              (list
                               (and current-prefix-arg
-                                   (read-coding-system 
-                                    "Coding-system: "))))
-                            )
-                      )))
+                                   (read-coding-system "Coding-system: "))))
+                            ;; Emacs: do wildcards
+                            ((and viper-emacs-p (boundp 'find-file-wildcards))
+                             (list find-file-wildcards))))
+                ))
 
   
   (defadvice read-file-name (around viper-suffix-advice activate)