diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-02-19 04:46:24 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-02-19 04:46:24 +0000 |
| commit | 17561e4ffa9a46cf3149cd299cc7e4a5354007b7 (patch) | |
| tree | 2e54ef22cdc4f99ed116f18f226c27f53c7d86c1 /man/ediff.texi | |
| parent | 91c212f159577c0be32ec8fcc1f8e6a23777ee6d (diff) | |
| download | emacs-17561e4ffa9a46cf3149cd299cc7e4a5354007b7.tar.gz | |
* ediff.el (ediff-set-diff-overlays-in-one-buffer,
ediff-set-fine-overlays-in-one-buffer,ediff-goto-word) make sure
we use the syntax table of the correct buffer.
(ediff-same-file-contents,ediff-same-contents): enhancements thanks to
Felix Gatzemeier.
* ediff-init.el (ediff-hide-face): checks for definedness of functions.
(ediff-file-remote-p): make synonymous with file-remote-p.
In all deffaces ediff-*-face-*, use min-colors.
* ediff-mult.el (ediff-meta-mark-equal-files): make use of
ediff-recurse-to-subdirectories.
(ediff-mark-if-equal): check that the arguments are strings, use
ediff-same-contents (after to Felix Gatzemeier).
* ediff.el (ediff-merge-on-startup): don't set buffer-modified-p to
nil.
Diffstat (limited to 'man/ediff.texi')
| -rw-r--r-- | man/ediff.texi | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/man/ediff.texi b/man/ediff.texi index 954efe4e027..318ac9e5c3f 100644 --- a/man/ediff.texi +++ b/man/ediff.texi @@ -1106,10 +1106,18 @@ multi-file patch. This is because, in the latter-style sessions, there are many ways to create diff output, and it is easier to handle by running Ediff on the inactive sessions. -Last, but not least, by typing @kbd{=}, you can quickly find out which -sessions have identical files, so you won't have to run Ediff on those +Last, but not least, by typing @kbd{==}, you can quickly find out which +sessions have identical entries, so you won't have to run Ediff on those sessions. This, however, works only on local, uncompressed files. For compressed or remote files, this command won't report anything. +Likewise, you can use @kbd{=h} to mark sessions with identical entries +for hiding or, with @kbd{=m}, for further operations. + +The comparison operations @kbd{==}, @kbd{=h}, and @kbd{=m} can recurse into +subdirectories to see if they have identical contents (so the user will not +need to descend into those subdirectories manually). These commands ask the +user whether or not to do a recursive descent. + @node Remote and Compressed Files, Customization, Session Groups, Top @@ -2395,11 +2403,13 @@ Jay Finger (jayf@@microsoft.com), Xavier Fornari (xavier@@europe.cma.fr), Eric Freudenthal (freudent@@jan.ultra.nyu.edu), Job Ganzevoort (Job.Ganzevoort@@cwi.nl), +Felix Heinrich Gatzemeier (felix.g@@tzemeier.info), Boris Goldowsky (boris@@cs.rochester.edu), Allan Gottlieb (gottlieb@@allan.ultra.nyu.edu), Aaron Gross (aaron@@bfr.co.il), Thorbjoern Hansen (thorbjoern.hansen@@mchp.siemens.de), Marcus Harnisch (marcus_harnisch@@mint-tech.com), +Steven E. Harris (seh@@panix.com), Xiaoli Huang (hxl@@epic.com), Andreas Jaeger (aj@@suse.de), Lars Magne Ingebrigtsen (larsi@@ifi.uio.no), @@ -2428,6 +2438,7 @@ Chris Murphy (murphycm@@sun.aston.ac.uk), Erik Naggum (erik@@naggum.no), Eyvind Ness (Eyvind.Ness@@hrp.no), Ray Nickson (nickson@@cs.uq.oz.au), +Dan Nicolaescu (dann@@ics.uci.edu), David Petchey (petchey_david@@jpmorgan.com), Benjamin Pierce (benjamin.pierce@@cl.cam.ac.uk), Francois Pinard (pinard@@iro.umontreal.ca), |