Mercurial > emacs
changeset 29412:ecd388a0937d
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Mon, 05 Jun 2000 00:07:02 +0000 |
| parents | 232f7e558a38 |
| children | ce16b083b459 |
| files | lisp/ChangeLog lisp/ediff-diff.el lisp/ediff-init.el lisp/emulation/viper-cmd.el lisp/emulation/viper.el |
| diffstat | 5 files changed, 38 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Jun 04 23:40:58 2000 +0000 +++ b/lisp/ChangeLog Mon Jun 05 00:07:02 2000 +0000 @@ -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):
--- a/lisp/ediff-diff.el Sun Jun 04 23:40:58 2000 +0000 +++ b/lisp/ediff-diff.el Mon Jun 05 00:07:02 2000 +0000 @@ -1135,7 +1135,9 @@ (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)
--- a/lisp/ediff-init.el Sun Jun 04 23:40:58 2000 +0000 +++ b/lisp/ediff-init.el Mon Jun 05 00:07:02 2000 +0000 @@ -63,7 +63,8 @@ (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 ()
--- a/lisp/emulation/viper-cmd.el Sun Jun 04 23:40:58 2000 +0000 +++ b/lisp/emulation/viper-cmd.el Mon Jun 05 00:07:02 2000 +0000 @@ -1895,7 +1895,8 @@ (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
--- a/lisp/emulation/viper.el Sun Jun 04 23:40:58 2000 +0000 +++ b/lisp/emulation/viper.el Mon Jun 05 00:07:02 2000 +0000 @@ -400,6 +400,7 @@ ps-mode completion-list-mode + diff-mode perl-mode javascript-mode @@ -982,53 +983,44 @@ (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)