mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
Michael Kifer 2000-06-05 00:07:02 +00:00
parent be22f4cc63
commit 560ef11a16
5 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -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):

2
lisp/ediff-diff.el
View file

@ -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)

3
lisp/ediff-init.el
View file

@ -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 ()

3
lisp/emulation/viper-cmd.el
View file

@ -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

52
lisp/emulation/viper.el
View file

@ -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)