cgit.sxemacs.org Git - packages/blob - xemacs-packages/ediff/ChangeLog.XEmacs

   1 2014-05-15  Norbert Koch  <viteno@xemacs.org>
   2
   3         * Makefile (VERSION): XEmacs package 1.84 released.
   4
   5 2014-05-15  Norbert Koch  <viteno@xemacs.org>
   6
   7         * Makefile (VERSION): XEmacs package 1.83 released.
   8
   9 2014-05-13  Jerry James  <james@xemacs.org>
  10
  11         * .cvsignore: Remove.
  12         * .hgignore: New file.
  13
  14 2013-01-27  Norbert Koch  <viteno@xemacs.org>
  15
  16         * Makefile (VERSION): XEmacs package 1.82 released.
  17
  18 2013-01-21  Vin Shelton  <acs@xemacs.org>
  19
  20         * Makefile (REQUIRES): New tramp update requires sh-script.
  21
  22 2009-12-21  Norbert Koch  <viteno@xemacs.org>
  23
  24         * Makefile (VERSION): XEmacs package 1.81 released.
  25
  26 2009-12-19  Michael Kifer <kifer@cs.stonybrook.edu>
  27
  28         * ediff-patch.el (ediff-context-diff-label-regexp): regexp fix from the
  29         emacs tree.
  30
  31 2009-12-07  Norbert Koch  <viteno@xemacs.org>
  32
  33         * Makefile (VERSION): XEmacs package 1.80 released.
  34
  35 2009-12-07  Michael Kifer <kifer@cs.stonybrook.edu>
  36
  37         * ediff-init.el (ediff-event-key): use event-to-character instead of
  38         event-key.
  39
  40         * ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add
  41         menus to the meta mode. (Dan Nicolaescu's <dann@ics.uci.edu> patch.)
  42
  43         * ediff.el (ediff-buffers-internal): add unwind-protect.
  44
  45         * ediff-util.el (ediff-minibuffer-with-setup-hook): new macro from
  46         Emacs tree.
  47         (ediff-read-file-name): use that macro.
  48
  49 2009-11-27  Norbert Koch  <viteno@xemacs.org>
  50
  51         * Makefile (VERSION): XEmacs package 1.79 released.
  52
  53 2009-11-26  Adrian Aichner  <adrian@xemacs.org>
  54
  55         * ediff.el (ediff-buffers-internal): Delete temporary files in
  56         case of non-local exit, like C-g (keyboard-quit), as well.
  57         * ediff.el (ediff-regions-internal): Ditto.
  58
  59 2009-11-26  Michael Kifer <kifer@cs.stonybrook.edu>
  60
  61         * ediff-init.el, ediff-mult.el, ediff-util.el: relpace
  62         last-command-char and last-command-event with (ediff-last-command-char) everywhere.
  63
  64         * ediff.el (ediff-version): revert change made in Emacs tree.
  65
  66         * ediff-menu.el: use purecopy in Emacs menus.
  67
  68         * ediff-diff.el, ediff-merge.el, ediff-mult.el, ediff-util.el,
  69         ediff.el, ediff-vers.el: use with-current-buffer instead of
  70         save-excursion/set-buffer whenever possible. Other cosmetic changes
  71         from the Emacs tree.
  72
  73         * ediff-mult.el: apply Dan Nicolaescu's patch that adds a menu in
  74         ediff-meta mode.
  75
  76 2009-08-16  Norbert Koch  <viteno@xemacs.org>
  77
  78         * Makefile (VERSION): XEmacs package 1.78 released.
  79
  80 2009-08-15  Michael Kifer  <kifer@cs.stonybrook.edu>
  81
  82         * ediff-init.el (ediff-coding-system): use escape-quoted in case of
  83         XEmacs.
  84
  85         * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip,
  86         ediff-merge-region-is-non-clash,
  87         ediff-skip-merge-region-if-changed-from-default-p): use defun.
  88         Also check if the job is really a merge job.
  89
  90         * ediff.el (ediff-current-file): new function.
  91
  92         * Changes from the Emacs main trunk.
  93
  94 2008-12-01  Norbert Koch  <viteno@xemacs.org>
  95
  96         * Makefile (VERSION): XEmacs package 1.77 released.
  97
  98 2008-11-22  Michael Kifer  <kifer@cs.stonybrook.edu>
  99
 100         * ediff-hook.el: added tooltips to Emacs menus.
 101
 102         * ediff.el: changed date of last update.
 103
 104 2008-11-19  Norbert Koch  <viteno@xemacs.org>
 105
 106         * Makefile (VERSION): XEmacs package 1.76 released.
 107
 108 2008-11-06  Michael Kifer  <kifer@cs.stonybrook.edu>
 109
 110         * ediff-util.el (ediff-toggle-multiframe): Check if control window is
 111         live.
 112         (ediff-save-buffer): Let window-min-height to 2.
 113
 114         * ediff-wind.el (ediff-setup-windows-plain-compare): Avoid selecting
 115         the minibuffer.
 116
 117         * ediff*.el, ediff.texi: Copied changes from Emacs CVS.
 118
 119 2008-04-07  Norbert Koch  <viteno@xemacs.org>
 120
 121         * Makefile (VERSION): XEmacs package 1.75 released.
 122
 123 2008-04-06  Michael Kifer  <kifer@cs.stonybrook.edu>
 124
 125         * ediff*.el: replace 3-argument 'require' statements with 1-argument
 126         ones (wrapped in if's). For compatibility with the current stable
 127         version of XEmacs.
 128
 129 2008-04-04  Michael Kifer  <kifer@cs.stonybrook.edu>
 130
 131         * ediff*el: replaced load with require in eval-when-compile.
 132
 133         * ediff-hook: deleted all invocations of (autoload ...).
 134
 135         * ediff-util.el (ediff-setup): make window-min-height a local variable
 136         in ediff control window, and set its min height to 2.
 137         (ediff-setup-control-buffer): dedicate the control window.
 138         (ediff-toggle-multiframe): undedicate control window.
 139         Work directly with ediff-setup-windows-multiframe and
 140         ediff-setup-windows-plain.
 141
 142         * ediff-wind (ediff-choose-window-setup-function-automatically): new
 143         function.
 144         (ediff-window-setup-function): change initialization.
 145         (ediff-setup-windows-automatic): deleted.
 146         (ediff-setup-windows-plain-merge): make control window dedicated.
 147         (ediff-destroy-control-frame): do not skip frames if working in a
 148         single frame.
 149
 150 2008-01-10  Norbert Koch  <viteno@xemacs.org>
 151
 152         * Makefile (VERSION): XEmacs package 1.74 released.
 153
 154 2008-01-10  Michael Kifer  <kifer@cs.stonybrook.edu>
 155
 156
 157         * ediff*.el: uncommented declare-function.
 158
 159 2008-01-09  Norbert Koch  <viteno@xemacs.org>
 160
 161         * Makefile (VERSION): XEmacs package 1.73 released.
 162
 163 2008-01-09  Michael Kifer  <kifer@cs.stonybrook.edu>
 164
 165         * ediff*.el: many minor changes from the emacs tree.
 166
 167         * ediff-util (eqiff-quit): autoraise minibuffer.
 168
 169         * ediff-diff (ediff-convert-fine-diffs-to-overlays): make it a defin
 170         instead of defsubst.
 171
 172 2007-11-05  Norbert Koch  <viteno@xemacs.org>
 173
 174         * Makefile (VERSION): XEmacs package 1.72 released.
 175
 176 2007-11-02  Michael Kifer  <kifer@cs.stonybrook.edu>
 177
 178         * ediff-vers (ediff-vc-working-revision): add a quote.
 179
 180 2007-11-02  Michael Kifer  <kifer@cs.stonybrook.edu>
 181
 182         * ediff-util.el (ediff-make-current-diff-overlay): do not use face-name.
 183         Got rid of ediff-copy-list.
 184
 185         * ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not
 186         use face-name.
 187         (ediff-test-utility,ediff-diff-mandatory-option)
 188         (ediff-reset-diff-options): removed to simplify the mandatory option
 189         handling on windows.
 190         (ediff-set-diff-options): added.
 191         (ediff-diff-options): changed.
 192
 193         * ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window.
 194         (ediff-vc-merge-internal): use ediff-vc-revision-other-window and
 195         ediff-vc-working-revision.
 196         Require vc-hooks.
 197
 198 2007-08-28  Norbert Koch  <viteno@xemacs.org>
 199
 200         * Makefile (VERSION): XEmacs package 1.71 released.
 201
 202 2007-08-19  Norbert Koch  <viteno@xemacs.org>
 203
 204         * Makefile (VERSION): XEmacs package 1.70 released.
 205
 206 2007-08-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 207
 208         * ediff-util.el (ediff-make-temp-file): use the coding system of the
 209         buffer for which file is created.
 210
 211 2007-06-13  Michael Kifer  <kifer@cs.stonybrook.edu>
 212
 213         * ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
 214         previous patch
 215
 216 2007-06-13  Norbert Koch  <viteno@xemacs.org>
 217
 218         * Makefile (VERSION): XEmacs package 1.69 released.
 219
 220 2007-06-12  Michael Kifer  <kifer@cs.stonybrook.edu>
 221
 222         * ediff-ptch.el (ediff-context-diff-label-regexp): spurious
 223         parenthesis.
 224
 225         * ediff-init.el: doc strings.
 226
 227 2007-06-12  Michael Kifer  <kifer@cs.stonybrook.edu>
 228
 229         * ediff-mult.el
 230         (ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message):
 231         new variables.
 232         (ediff-meta-buffer-message): variable deleted.
 233         (ediff-verbose-help-enabled): new variable.
 234         (ediff-toggle-verbose-help-meta-buffer): new function.
 235         (ediff-redraw-directory-group-buffer): made aware of short/verbose
 236         message options
 237
 238         * ediff-ptch.el (ediff-context-diff-label-regexp): better regexp.
 239         (ediff-fixup-patch-map): improved heuristic.
 240
 241 2007-01-24  Norbert Koch  <viteno@xemacs.org>
 242
 243         * Makefile (VERSION): XEmacs package 1.68 released.
 244
 245 2007-01-23  Michael Kifer  <kifer@cs.stonybrook.edu>
 246
 247         * ediff-util.el (ediff-clone-buffer-for-region-comparison): change text
 248         of message. Activate mark.
 249         (ediff-activate-mark): set transient-mark-mode to t.
 250
 251         * ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed
 252         docstrings.
 253
 254 2006-12-28  Norbert Koch  <viteno@xemacs.org>
 255
 256         * Makefile (VERSION): XEmacs package 1.67 released.
 257
 258 2006-12-23  Michael Kifer  <kifer@cs.stonybrook.edu>
 259
 260         * ediff-diff.el (ediff-diff-options): clarify docstring.
 261         (ediff-setup-diff-regions): disallow -u in ediff-diff-options.
 262
 263 2006-11-27  Norbert Koch  <viteno@xemacs.org>
 264
 265         * Makefile (VERSION): XEmacs package 1.66 released.
 266
 267 2006-11-23  Michael Kifer  <kifer@cs.stonybrook.edu>
 268
 269         * ediff-diff.el (ediff-exec-process, ediff-same-file-contents): remove
 270         condition-case.
 271
 272 2006-10-31  Norbert Koch  <viteno@xemacs.org>
 273
 274         * Makefile (VERSION): XEmacs package 1.65 released.
 275
 276 2006-10-23  Michael Kifer  <kifer@cs.stonybrook.edu>
 277
 278         * ediff-diff.el (ediff-same-file-contents): expand file names.
 279
 280         * ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.
 281
 282 2006-09-23  Norbert Koch  <viteno@xemacs.org>
 283
 284         * Makefile (VERSION): XEmacs package 1.64 released.
 285
 286 2006-09-18  Michael Kifer  <kifer@cs.stonybrook.edu>
 287
 288         * ediff-util.el (ediff-add-to-history): new function.
 289
 290         * ediff.el: use ediff-add-to-history instead of add-to-history.
 291
 292 2006-08-26  Norbert Koch  <viteno@xemacs.org>
 293
 294         * Makefile (VERSION): XEmacs package 1.63 released.
 295
 296 2006-08-25  Michael Kifer  <kifer@cs.stonybrook.edu>
 297
 298         * ediff-mult.el (ediff-intersect-directories,
 299         ediff-get-directory-files-under-revision, ediff-dir-diff-copy-file):
 300         always expand filenames.
 301
 302 2006-06-18  Michael Kifer  <kifer@cs.stonybrook.edu>
 303
 304         * ediff-diff (ediff-test-patch-utility): catch errors.
 305         (ediff-actual-diff-options, ediff-actual-diff3-options): new variables.
 306         (ediff-set-actual-diff-options): new function.
 307         (ediff-reset-diff-options, ediff-toggle-ignore-case):
 308         use ediff-set-actual-diff-options.
 309         (ediff-extract-diffs): catch errors.
 310         (ediff-whitespace): add nonbreakable space.
 311         (ediff-same-file-contents): catch errors.
 312
 313         * ediff-mult.el (ediff-collect-custom-diffs): save
 314         coding-system-for-read.
 315
 316         * ediff-vers.el (ediff-keep-tmp-versions): new var.
 317         (ediff-vc-internal, ediff-vc-merge-internal): use
 318         ediff-delete-version-file.
 319         (ediff-delete-version-file): new function.
 320
 321         * ediff-wind.el (ediff-control-frame-parameters): set frame fringes.
 322
 323         * ediff.el (ediff-directories, ediff-directory-revisions,
 324         ediff-merge-directories, ediff-merge-directories-with-ancestor,
 325         ediff-directories-internal, ediff-merge-directory-revisions,
 326         ediff-merge-directory-revisions-with-ancestor,
 327         ediff-directories3): use read-directory-name.
 328
 329 2006-02-22  Norbert Koch  <viteno@xemacs.org>
 330
 331         * Makefile (VERSION): XEmacs package 1.62 released.
 332
 333 2006-02-21  Michael Kifer  <kifer@cs.stonybrook.edu>
 334
 335         * ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3):
 336         fix the regular expressions.
 337
 338 2006-02-20  Norbert Koch  <viteno@xemacs.org>
 339
 340         * Makefile (VERSION): XEmacs package 1.61 released.
 341
 342 2006-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 343
 344         * ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option,
 345         ediff-ignore-case-option3, ediff-actual-diff-options,
 346         ediff-actual-diff3-options): new variables to control case sensitivity.
 347         (ediff-make-diff2-buffer, ediff-setup-fine-diff-regions,
 348         ediff-setup-diff-regions3): made aware of case-sensitivity.
 349         (ediff-toggle-ignore-case): new function.
 350         (ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers.
 351
 352         * ediff-help.el (ediff-long-help-message-narrow2,
 353         ediff-long-help-message-compare2, ediff-long-help-message-compare3,
 354         ediff-long-help-message-word-mode): add ignore-case command.
 355         (ediff-help-for-quick-help): add ignore-case command.
 356
 357         * ediff-merg.el: move provide to the end.
 358
 359         * ediff-ptch.el: move provide to the end.
 360
 361         * ediff-wind.el: move provide to the end.
 362
 363         * ediff-mult.el: move provide to the end.
 364         (ediff-set-meta-overlay): enable follow-link.
 365
 366         * ediff.el: move provide to the end.
 367         Break recursive load cycle in eval-when-compile.
 368         (ediff-patch-buffer): better heuristics.
 369
 370         * ediff-util.el: move provide to the end.
 371         Break recursive load cycle in eval-when-compile.
 372         (ediff-setup-keymap): add binding for #c. Replaced some defsubsts with
 373         defuns.
 374         (ediff-submit-report): pass the values of ediff-diff3-program,
 375         ediff-diff3-options.
 376
 377 2005-12-05  Norbert Koch  <viteno@xemacs.org>
 378
 379         * Makefile (VERSION): XEmacs package 1.60 released.
 380
 381 2005-11-29  Michael Kifer  <kifer@cs.stonybrook.edu>
 382
 383         * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display):
 384         preserve user position.
 385
 386 2005-11-25  Norbert Koch  <viteno@xemacs.org>
 387
 388         * Makefile (VERSION): XEmacs package 1.59 released.
 389
 390 2005-11-25  Michael Kifer  <kifer@cs.stonybrook.edu>
 391
 392         * ediff-wind (ediff-make-wide-display): Slight simplification.
 393
 394         * ediff.el (ediff-date): Changed the date of last update.
 395
 396 2005-11-16  Norbert Koch  <viteno@xemacs.org>
 397
 398         * Makefile (VERSION): XEmacs package 1.58 released.
 399
 400 2005-11-15  Michael Kifer  <kifer@cs.stonybrook.edu>
 401
 402         * ediff-util (ediff-make-temp-file): use proper file-name-handler
 403         operation
 404
 405 2005-11-07  Norbert Koch  <viteno@xemacs.org>
 406
 407         * Makefile (VERSION): XEmacs package 1.57 released.
 408
 409 2005-11-04  Michael Kifer  <kifer@cs.stonybrook.edu>
 410
 411         * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not
 412         merging.
 413
 414         * ediff-util.el (ediff-previous-difference): don't skip regions that
 415         have merge clashes.
 416
 417 2005-10-06  Norbert Koch  <viteno@xemacs.org>
 418
 419         * Makefile (VERSION): XEmacs package 1.56 released.
 420
 421 2005-10-05  Michael Kifer  <kifer@cs.stonybrook.edu>
 422
 423         * ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.
 424         (ediff-merge-region-is-non-clash-to-skip): previouslu called
 425         ediff-merge-region-is-non-clash.
 426
 427         * ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use
 428         insert-buffer-substring.
 429
 430         * ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for
 431         selecting files to patch. Also bug fixes.
 432
 433         * ediff-util.el (ediff-setup): bug fix.
 434         (ediff-next-difference): Never skip clashes that differ in white space
 435         only.
 436
 437         * ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame):
 438         check the menubar feature.
 439
 440 2005-09-21  Norbert Koch  <viteno@xemacs.org>
 441
 442         * Makefile (VERSION): XEmacs package 1.55 released.
 443
 444 2005-09-20  Michael Kifer  <kifer@cs.stonybrook.edu>
 445
 446         * ediff-ptch.el (ediff-file-name-sans-prefix): treat nil as an empty
 447         string.
 448         (ediff-fixup-patch-map): better heuristic for intuiting the file names
 449         to patch.
 450         (ediff-prompt-for-patch-file): more intuitive prompt.
 451
 452         * ediff-util.el: use insert-buffer-substring.
 453
 454         * ediff-vers.el (cvs-run-ediff-on-file-descriptor): bug fix.
 455
 456 2005-07-19  Norbert Koch  <viteno@xemacs.org>
 457
 458         * Makefile (VERSION): XEmacs package 1.54 released.
 459
 460 2005-07-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 461
 462         * ediff.el (ediff-patch-buffer): changed the docstring.
 463
 464         * ediff-diff.el: add defvar for longlines-mode.
 465
 466 2005-07-10  Norbert Koch  <viteno@xemacs.org>
 467
 468         * Makefile (VERSION): XEmacs package 1.53 released.
 469
 470 2005-07-10  Michael Kifer  <kifer@cs.stonybrook.edu>
 471
 472         * ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3):
 473         Make it work with longlines mode
 474
 475         * ediff-mult.el (ediff-meta-mode-hook): new variable.
 476
 477         * ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp.
 478
 479         * ediff-init: got rid of -face in face names.
 480
 481 2005-06-04  Norbert Koch  <viteno@xemacs.org>
 482
 483         * Makefile (VERSION): XEmacs package 1.52 released.
 484
 485 2005-06-03  Michael Kifer  <kifer@cs.stonybrook.edu>
 486
 487         * ediff-diff.el (ediff-same-contents) Eliminate CL-type functions.
 488         Replace string-to-int with string-to-number.
 489
 490         * ediff-mult.el (ediff-intersect-directories) Make sure that ".." and
 491         "." files are deleted from all file lists before comparison
 492
 493 2005-02-19  Norbert Koch  <viteno@xemacs.org>
 494
 495         * Makefile (VERSION): XEmacs package 1.51 released.
 496
 497 2005-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 498
 499         * ediff.el (ediff-set-diff-overlays-in-one-buffer,
 500         ediff-set-fine-overlays-in-one-buffer,ediff-goto-word) make sure
 501         we use the syntax table of the correct buffer.
 502         (ediff-same-file-contents,ediff-same-contents): enhancements thanks to
 503         Felix Gatzemeier.
 504
 505         * ediff-init.el (ediff-hide-face): checks for definedness of functions.
 506         (ediff-file-remote-p): make synonymous with file-remote-p.
 507         In all deffaces ediff-*-face-*, use min-colors.
 508
 509         * ediff-mult.el (ediff-meta-mark-equal-files): make use of
 510         ediff-recurse-to-subdirectories.
 511         (ediff-mark-if-equal): check that the arguments are strings, use
 512         ediff-same-contents (after to Felix Gatzemeier).
 513
 514         * ediff.el (ediff-merge-on-startup): don't set buffer-modified-p to
 515         nil.
 516
 517 2004-02-20  Norbert Koch  <viteno@xemacs.org>
 518
 519         * Makefile (VERSION): XEmacs package 1.50 released.
 520
 521 2004-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 522
 523         * ediff-util.el (ediff-toggle-read-only): Remove extra format
 524         string argument.
 525         (ediff-toggle-regexp-match): Likewise.
 526         Suggested by Andreas Schwab  <schwab@suse.de>
 527         * ediff-ptch.el (ediff-test-patch-utility):
 528         * ediff-diff.el (ediff-test-utility): Don't use = or zerop to
 529         test the return value of call-process, because it can be a string.
 530         By Jesper Harder  <harder@ifa.au.dk>
 531
 532 2004-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
 533
 534         * ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
 535         temporary file for buffer already visiting one.  This change makes
 536         output likely to be directly usable by patch program.
 537         Suggested by Adrian Aichner  <adrian@xemacs.org>
 538
 539 2003-10-31  Norbert Koch  <viteno@xemacs.org>
 540
 541         * Makefile (VERSION): XEmacs package 1.49 released.
 542
 543 2003-10-13  Norbert Koch  <viteno@xemacs.org>
 544
 545         * Makefile (VERSION): XEmacs package 1.48 released.
 546
 547 2003-10-12  Michael Kifer  <kifer@cs.stonybrook.edu>
 548
 549         * ediff-mult.el (ediff-filegroup-action): use
 550         ediff-default-filtering-regexp.
 551
 552         * ediff-util.el (ediff-recenter): don't call
 553         ediff-restore-highlighting twice.
 554         (ediff-select-difference): set current difference.
 555         (ediff-unselect-and-select-difference): added comment.
 556
 557         * ediff.el (ediff-directories,ediff-directory-revisions,
 558         ediff-directories3,ediff-merge-directories,
 559         ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions,
 560         ediff-merge-directory-revisions-with-ancestor): use
 561         ediff-default-filtering-regexp.
 562
 563 2003-05-19  Norbert Koch  <viteno@xemacs.org>
 564
 565         * Makefile (VERSION): XEmacs package 1.47 released.
 566
 567 2003-05-18  Michael Kifer  <kifer@cs.stonybrook.edu>
 568
 569         * ediff-mult.el (ediff-default-filtering-regexp): new variable.
 570
 571         * ediff-util.el (ediff-maybe-save-and-delete-merge): change in a
 572         message.
 573
 574         * ediff.el (ediff-directories,ediff-directory-revisions,
 575         ediff-directories3,ediff-merge-directories,
 576         ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions,
 577         ediff-merge-directory-revisions-with-ancestor): make use of the new
 578         ediff-default-filtering-regexp variable.
 579
 580         * all files: eliminated trailing blanks in various lines.
 581
 582 2003-03-09  Ben Wing  <ben@xemacs.org>
 583
 584         * Makefile:
 585         Delete explicit compile:: and binkit: rules.
 586         Don't add custom-load.elc to the list of generated elc's.
 587         Use STANDARD_DOCS instead of explicitly giving the targets
 588         and dependencies.
 589
 590 2003-01-26  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 591
 592         * Makefile (VERSION): XEmacs package 1.46 released.
 593
 594 2003-01-25  Michael Kifer  <kifer@cs.stonybrook.edu>
 595
 596         * ediff.el (ediff-revision): better defaults.
 597
 598         * ediff-vers.el (ediff-vc-latest-version): new function.
 599         (ediff-vc-internal): use latest version instead of working version.
 600
 601 2002-11-29  Ben Wing  <ben@xemacs.org>
 602
 603         * .cvsignore: Remove files now handled automatically by CVS.
 604         * Makefile: Use `compile' instead of hard-coded `all'.
 605
 606 2002-12-06  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 607
 608         * Makefile (VERSION): XEmacs package 1.45 released.
 609
 610 2002-11-17  Michael Kifer  <kifer@cs.stonybrook.edu>
 611
 612         * ediff-diff.el (ediff-setup-diff-regions): change regexp.
 613
 614         * ediff-mult.el: comments.
 615
 616         * ediff.el: comments.
 617
 618 2002-10-29  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 619
 620         * Makefile (VERSION): XEmacs package 1.44 released.
 621
 622 2002-10-27  Michael Kifer  <kifer@cs.stonybrook.edu>
 623
 624         * ediff-wind.el (ediff-control-frame-parameters): added scrollbar-height.
 625
 626 2002-10-15  Ville Skyttä  <scop@xemacs.org>
 627
 628         * Makefile (srckit): Remove.
 629
 630 2002-10-14  Ville Skyttä  <scop@xemacs.org>
 631
 632         * Makefile (MANUAL): Removed (unused).
 633
 634 2002-10-14  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 635
 636         * Makefile (VERSION): XEmacs package 1.43 released.
 637
 638 2002-10-12  Michael Kifer  <kifer@cs.stonybrook.edu>
 639
 640         * ediff-init.el (ediff-frame-char-height): use frame-selected-window.
 641
 642         * ediff-util.el (ediff-file-checked-in-p): changed progn with and
 643
 644         * ediff-wind.el (ediff-skip-unsuitable-frames): distinguish selected
 645         frame from frame of selected window
 646         (ediff-frame-has-dedicated-windows): don't select any frames to avoid
 647         changing selected windows
 648         (ediff-setup-control-frame): make sure auto-rase is properly set for
 649         the control frame
 650
 651 2002-09-25  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 652
 653         * Makefile (VERSION): XEmacs package 1.42 released.
 654
 655 2002-09-23  Michael Kifer  <kifer@cs.stonybrook.edu>
 656
 657         * ediff-init.el (ediff-get-next-window): bug fix.
 658
 659         * ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs): Put the
 660         definition straight into loaddefs.el as well as executing it here
 661         (by RMS)
 662
 663 2002-09-18  Michael Kifer  <kifer@cs.stonybrook.edu>
 664
 665         * ediff-hooks.el: Put back the autoloads (for compatibility with XEmacs).
 666
 667         * ediff-init.el: Use defalias instead of fset.
 668
 669         * ediff-util.el: Use defalias instead of fset.
 670
 671         * ediff-ptch.el (ediff-test-patch-utility): catch errors
 672
 673         * ediff-wind.el (ediff-window-setup-function): better choices
 674
 675         * ediff-backup.el (ediff-backup): new function
 676
 677         * ediff.texi: typo
 678
 679 2002-07-16  Adrian Aichner  <adrian@xemacs.org>
 680
 681         * .cvsignore: Add generated .info* and .html files.
 682
 683 2002-04-30  Steve Youngs  <youngs@xemacs.org>
 684
 685         * Makefile (VERSION): XEmacs package 1.41 released.
 686
 687 2002-04-25  Michael Kifer  <kifer@cs.stonybrook.edu>
 688
 689         * ediff-hooks.el: Put back the autoloads.
 690
 691 2002-04-24  Steve Youngs  <youngs@xemacs.org>
 692
 693         * Makefile (VERSION): XEmacs package 1.40 released.
 694
 695 2002-04-16  Michael Kifer  <kifer@cs.stonybrook.edu>
 696
 697         * ediff-init.el: better defaults for all faces -- thanks to Eli
 698         Zaretskii.
 699
 700         * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit
 701         when the window is not in its own frame.
 702         (ediff-clone-buffer-for-region-comparison): more robust window
 703         arrangement while prompting for regions to compare.
 704         (ediff-make-cloned-buffer): use generate-new-buffer-name.
 705         (ediff-inferior-compare-regions): deleted unused vars
 706         ctl-buf and quit-now.
 707
 708 2002-03-25  Steve Youngs  <youngs@xemacs.org>
 709
 710         * Makefile (VERSION): 1.39 released.
 711
 712 2002-03-20  Michael Kifer  <kifer@cs.stonybrook.edu>
 713
 714         * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
 715         the current highlighting style into account.
 716         (ediff-forward-word-function,ediff-whitespace,ediff-word-1,
 717         ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local.
 718
 719         * ediff-init.el (ediff-patch-job): new macro.
 720
 721         * ediff-mult.el (ediff-make-new-meta-list-header): new API function.
 722         (ediff-intersect-directories): use ediff-make-new-meta-list-header.
 723
 724         * ediff-ptch.el (ediff-map-patch-buffer): use
 725         ediff-make-new-meta-list-header.
 726         (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el.
 727
 728         * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting.
 729         (ediff-select-difference): take highlighting style into account.
 730         (ediff-clone-buffer-for-region-comparison): new function.
 731         (ediff-inferior-compare-regions): added comparison of current diff
 732         regions.
 733
 734         * ediff.el (ediff-clone-buffer-for-region-comparison,
 735         ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
 736
 737 2002-03-05  Michael Kifer  <kifer@cs.stonybrook.edu>
 738
 739         * ediff-init.el: comments.
 740
 741         * ediff-hook.el: Got rid of autoloads. Not needed, since the hook
 742         is loaded.
 743
 744         * ediff-mult.el (ediff-intersect-directories,
 745         ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision):
 746         cleanup.
 747         (ediff-draw-dir-diffs): now supports the "C" command in directory
 748         difference buffer.
 749         (ediff-dir-diff-copy-file): new function that implements copying
 750         of files from one Ediff dir to another
 751         (ediff-bury-dir-diffs-buffer): kills the buffer instead.
 752         (ediff-append-custom-diff): better error msgs.
 753
 754         * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix.
 755         (ediff-inferior-compare-regions): Use
 756         ediff-clone-buffer-for-region-comparison. Better and simpler interface.
 757
 758         * ediff.el (ediff-directories-internal): Cleanup.
 759         (ediff-clone-buffer-for-region-comparison): Better interface.
 760
 761 2002-02-09  Michael Kifer  <kifer@cs.stonybrook.edu>
 762
 763         * ediff-init.el (ediff-has-gutter-support): Steven Turnbull's patch.
 764
 765         * ediff-wind.el (ediff-setup-control-frame): Use
 766         ediff-has-gutter-support.
 767
 768 2002-02-09  Michael Kifer  <kifer@cs.stonybrook.edu>
 769
 770         * ediff-util.el (ediff-dispose-of-variant-according-to-user):
 771         check if buff is alive.
 772
 773         * ediff.el: typo in comment.
 774
 775 2002-01-08  Michael Kifer  <kifer@cs.stonybrook.edu>
 776
 777         * ediff-hook.el: added autoload cookie
 778
 779 2002-01-07  Michael Kifer  <kifer@cs.stonybrook.edu>
 780
 781         * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
 782
 783         * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
 784
 785         * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
 786         macro designed to be used in many places where ediff-emacs-p or
 787         ediff-xemacs-p was previously used. Reduces the number of
 788         warnings.
 789         Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
 790         of ediff-xemacs-p.
 791         (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
 792         ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
 793         ediff-whitespace-diff-region-p, ediff-get-region-contents):
 794         moved to ediff-util.el.
 795         (ediff-event-key): moved here.
 796
 797         * ediff-merge.el: got rid of unreferenced variables.
 798
 799         * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
 800
 801         * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
 802         (ediff-cleanup-mess): improved the way windows are set up after
 803         quitting ediff.
 804         (ediff-janitor): use ediff-dispose-of-variant-according-to-user.
 805         (ediff-dispose-of-variant-according-to-user): new function
 806         designed to be smarter and also understands indirect buffers.
 807         (ediff-highlight-diff-in-one-buffer,
 808         ediff-unhighlight-diff-in-one-buffer,
 809         ediff-unhighlight-diffs-totally-in-one-buffer,
 810         ediff-highlight-diff, ediff-highlight-diff,
 811         ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
 812         ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
 813         ediff-get-region-contents, ediff-make-current-diff-overlay):
 814         moved here.
 815         (ediff-format-bindings-of): new function by Hannu Koivisto
 816         <azure@iki.fi>.
 817         (ediff-setup): make sure the merge buffer is always widened and
 818         modifiable.
 819         (ediff-write-merge-buffer-and-maybe-kill): refuse to write the
 820         result of a merge into a file visited by another buffer.
 821         (ediff-arrange-autosave-in-merge-jobs): check if the merge file
 822         is visited by another buffer and ask to save/delete that buffer.
 823         (ediff-verify-file-merge-buffer): new function to do the above.
 824
 825         * ediff-vers.el: load ediff-init.el at compile time.
 826
 827         * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
 828
 829         * ediff.el (ediff-windows, ediff-regions-wordwise,
 830         ediff-regions-linewise): use indirect buffers to improve
 831         robustness and make it possible to compare regions of the same
 832         buffer (even overlapping regions).
 833         (ediff-clone-buffer-for-region-comparison,
 834         ediff-clone-buffer-for-window-comparison): new functions.
 835         (ediff-files-internal): refuse to compare identical files.
 836         (ediff-regions-internal): get rid of the warning about comparing
 837         regions of the same buffer.
 838
 839         * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
 840         Plus the following fixes courtesy of Dave Love:
 841         Doc fixes.
 842         (ediff-word-1): Use word class and move - to the
 843         front per regexp documentation.
 844         (ediff-wordify): Bind forward-word-function outside loop.
 845         (ediff-copy-to-buffer): Use insert-buffer-substring rather than
 846         consing buffer contents.
 847         (ediff-goto-word): Move syntax table setting outside loop.
 848
 849 2002-01-07  Adrian Aichner  <adrian@xemacs.org>
 850
 851         * Makefile (HTML_FILES): New.
 852         * Makefile (HTML_DEP): New.
 853
 854 2001-12-30  Steve Youngs  <youngs@xemacs.org>
 855
 856         * package-info.in (provides): Update to include all provides.
 857
 858 2001-12-24  Michael Kifer  <kifer@cs.sunysb.edu>
 859
 860         * ediff-mult.el (ediff-meta-mark-equal-files): Added optional
 861         action argument.
 862
 863         * ediff-init.el: Fixed some doc strings.
 864
 865         * ediff-util.el (ediff-after-quit-hook-internal): New variable.
 866         Got rid of make-local-hook.
 867
 868         * ediff-wind.el (ediff-setup-control-frame): Got rid of
 869         make-local-hook.
 870
 871 2001-09-27  Michael Kifer  <kifer@cs.sunysb.edu>
 872
 873         * ediff-mult.el (ediff-get-meta-info): Installed Gerd's changes.
 874         Added comments.
 875
 876 2001-09-09  Michael Kifer  <kifer@cs.sunysb.edu>
 877
 878         * ediff-init.el (ediff-highest-priority): bug fix.
 879
 880         * ediff-mult.el (ediff-get-meta-info): replace and with or.
 881
 882 2001-07-21  Michael Kifer  <kifer@cs.sunysb.edu>
 883
 884         * ediff-util.el
 885         (ediff-file-checked-out-p,ediff-file-checked-in-p): check if
 886         vc-state is available.
 887         (ediff-make-temp-file): use ediff-coding-system-for-write.
 888
 889         * ediff-init.el (ediff-coding-system-for-read): from ediff-diff.el
 890         (ediff-coding-system-for-write): new variable.
 891         (ediff-highest-priority): fixed the bug having to do with disappearing
 892         overlays.
 893         (ediff-file-remote-p): use file-remote-p, if available.
 894         (ediff-listable-file): new function.
 895         (ediff-file-attributes): use ediff-listable-file.
 896
 897         * ediff-mult.el (ediff-meta-insert-file-info1): use
 898         ediff-listable-file.
 899
 900         * ediff-ptch.el (ediff-prompt-for-patch-file): use
 901         ediff-coding-system-for-read.
 902         (ediff-patch-file-internal): use ediff-coding-system-for-write.
 903
 904         * ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
 905         (ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
 906
 907         * ediff.texi: added clarifications, acknowledgements.
 908
 909 2001-04-08  Steve Youngs  <youngs@xemacs.org>
 910
 911         * Makefile (REQUIRES): Add prog-modes because diff-mode.el
 912         has moved there.
 913
 914 2001-03-17  Michael Kifer  <kifer@cs.sunysb.edu>
 915
 916         * ediff-util.el: Copyright years.
 917         (ediff-choose-syntax-table): New function.
 918         (ediff-setup): Use ediff-choose-syntax-table.
 919
 920         * ediff-init.el (ediff-with-syntax-table): New macro, uses
 921         with-syntax-table.
 922
 923         * ediff.el: Date of last update, copyright years.
 924
 925         * ediff-wind (ediff-setup-control-frame): Nill->nil.
 926
 927 2001-02-24  Michael Kifer  <kifer@cs.sunysb.edu>
 928
 929         * ediff.texi: Fixed some typos
 930
 931 2001-02-12  Michael Kifer  <kifer@cs.sunysb.edu>
 932
 933         * ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks
 934         for remote files.
 935         (ediff-coding-system-for-read): replaced the no-conversion default
 936         with raw-text.
 937
 938         * ediff-init.el: Removed :version from defcustom vars.
 939
 940         * ediff-util.el (ediff-compute-custom-diffs-maybe): Better
 941         handling of the diff mode
 942
 943         * ediff.texi: Added ediff-coding-system-for-read.
 944
 945 2001-01-19  Michael Kifer  <kifer@cs.sunysb.edu>
 946
 947         * ediff.el (ediff-patch-file): use better defaults.
 948
 949         * ediff-vers.el: fix for 8+3 DOS file systems
 950
 951         * ediff.texi: add credits.
 952
 953 2001-01-19  Colin Walters <walters@cis.ohio-state.edu>
 954
 955         * ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in
 956         diff mode, if available.
 957
 958 2001-01-19  Vin Shelton <acs@xemacs.org>
 959
 960         * ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button
 961
 962 2001-01-19  Steve Youngs  <youngs@xemacs.org>
 963
 964         * ediff-init.el (subst-char-in-string): Define and use it, unless
 965         it's already defined.
 966
 967 2001-01-17  Stephen J. Turnbull  <stephen@xemacs.org>
 968
 969         * Makefile:  Add edebug to REQUIRES (for def-edebug-spec).
 970
 971 2000-12-25  Michael Kifer  <kifer@cs.sunysb.edu>
 972
 973         * ediff-init.el (ediff-quit-hook,ediff-suspend-hook): changed
 974         initialization; use add-hook.
 975         (ediff-file-remote-p): use file-local-copy.
 976
 977         * ediff-ptch.el (ediff-prompt-for-patch-buffer): improved defaults.
 978
 979         * ediff.el (ediff-patch-buffer): bug fix.
 980         (ediff-revision): allow selection of the file at the prompt.
 981
 982 2000-11-24  Michael Kifer  <kifer@cs.sunysb.edu>
 983
 984         * ediff-diff.el: Moved variables around to have it compile under NT.
 985
 986         * ediff-help.el (ediff-use-long-help-message): made it customizable.
 987
 988         * ediff-init.el (ediff-abbrev-jobname): use capitalize.
 989
 990         * ediff-wind.el (ediff-skip-unsuitable-frames): deleted the
 991         redundant skip-small-frames test.
 992
 993 2000-10-29  Michael Kifer  <kifer@cs.sunysb.edu>
 994
 995         * ediff-wind.el (ediff-setup-control-frame): enclose
 996         face-attribute in condition-case to avoid errors in older emacsen.
 997
 998 2000-10-29  Michael Kifer  <kifer@cs.sunysb.edu>
 999
1000         * ediff-init.el (ediff-before-setup-hook): new hook.
1001         Several typos fixed in various docstrings.
1002         * ediff-merg.el (ediff-show-clashes-only): docstring typo fixed.
1003         * ediff-nult.el (ediff-before-session-group-setup-hooks): new
1004         hook.
1005         (ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks.
1006         * ediff-util.el (ediff-setup): run ediff-before-setup-hook.
1007         (ediff-other-buffer): use selected buffers if in Buffer-menu buffer.
1008         (ediff-get-selected-buffers): new function.
1009         * ediff-vers.el (ediff-vc-internal,ediff-rcs-internal,
1010         ediff-vc-merge-internal,ediff-rcs-merge-internal): use
1011         save-window-excursion.
1012         * ediff-wind.el (ediff-skip-unsuitable-frames): more robust
1013         termination check in while loop.
1014         * ediff.el (ediff-get-default-file-name): better defaults when in
1015         dired buffer.
1016         (ediff-files,ediff-merge-files,ediff-files3,
1017         ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
1018
1019 2000-07-05  Michael Kifer  <kifer@cs.sunysb.edu>
1020
1021         * ediff-diff.el (ediff-wordify): use syntax table.
1022         * ediff-init.el (ediff-has-face-support-p): use
1023         ediff-color-display-p.
1024         (ediff-color-display-p): use display-color-p, changed to defun
1025         from defsubst.
1026         Got rid of special cases for NeXT and OS/2.
1027         * ediff-wind.el (ediff-setup-control-frame): set proper modeline
1028         face.
1029
1030 2000-06-05  Michael Kifer  <kifer@cs.sunysb.edu>
1031
1032         * ediff-init.el (ediff-has-face-support-p): make it paint faces on
1033         tty's.
1034         * ediff-diff.el (ediff-exec-process): use --binary for fine
1035         differences whenever apropriate.
1036
1037 2000-05-25  Michael Kifer  <kifer@cs.sunysb.edu>
1038
1039         * ediff-diff.el (ediff-exec-process): delete --binary option from
1040         non-buffer ediff jobs.
1041
1042 2000-05-24  Michael Kifer  <kifer@cs.sunysb.edu>
1043
1044         * ediff-diff.el (ediff-forward-word): take syntactic word class into
1045         account.
1046         (ediff-test-utility,ediff-diff-mandatory-option,
1047         ediff-reset-diff-options): utilities for proper initialization of
1048         ediff-diff-options and ediff-diff3-options on Windows.
1049
1050         * ediff-init.el (ediff-merge-filename-prefix): new customizable
1051         variable.
1052
1053         * ediff-mult.el (ediff-filegroup-action): use
1054         ediff-merge-filename-prefix.
1055
1056 2000-2-28  Michael Kifer  <kifer@cs.sunysb.edu>
1057         * ediff-wind.el: minor comment changes.
1058         * ediff.el: copyright notice date fix.
1059
1060 1999-12-15  Gunnar Evermann  <ge204@eng.cam.ac.uk>
1061
1062         * ediff-help.el (ediff-customize): Add autoload cookie.
1063
1064 1999-11-24  Michael Kifer  <kifer@cs.sunysb.edu>
1065
1066         * ediff*el: replaced old-style backquotes.
1067
1068         * ediff-merge
1069         (ediff-looks-like-combined-merge,ediff-get-combined-region):
1070         changed to support the new format for ediff-combination-pattern.
1071
1072         * ediff-diff (ediff-set-fine-overlays-in-one-buffer):
1073         changed to support the new format for ediff-combination-pattern.
1074
1075         * ediff.texi: Describe the new format for
1076         ediff-combination-pattern.
1077
1078 1999-11-01  Michael Kifer  <kifer@cs.sunysb.edu>
1079
1080         * ediff-diff.el (ediff-cmp-options): new var.
1081         (ediff-same-file-contents): use ediff-cmp-options.
1082
1083         * ediff-ptch.el (ediff-prompt-for-patch-buffer,
1084         ediff-get-patch-buffer): use current buffer if it appears to be a
1085         patch.
1086
1087         * ediff-util.el (ediff-file-checked-in-p): don't consider CVS
1088         files checked in.
1089         (ediff-make-temp-file,ediff-make-empty-tmp-file):  Make sure you
1090         are writing to a newly created empty file.
1091
1092         * ediff.texi: minor improvements.
1093
1094 1999-08-18  Michael Kifer  <kifer@cs.sunysb.edu>
1095
1096         * ediff-init.el (ediff-temp-file-prefix): better initialization
1097
1098         * eviff-vers.el (ediff-vc-merge-internal): small buglet fix
1099
1100         * ediff.el: comment change
1101
1102 1999-05-27  SL Baur  <steve@xemacs.org>
1103
1104         * Makefile: bump version number.
1105
1106 1999-05-16  Michael Kifer  <kifer@cs.sunysb.edu>
1107
1108         * ediff.el, ediff-util.el: Enable ediff-merge-directories-* to be
1109         called with a parameter that specifies the directory where the
1110         merged files are to be saved.
1111
1112 1999-04-06  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
1113
1114         * ediff.texi: Add comma to satisfy texinfo 3.12f+'s grammar
1115         checker.
1116
1117 1999-03-03  Michael Kifer  <kifer@cs.sunysb.edu>
1118
1119         * ediff-mult.el (ediff-get-directory-files-under-revision): Use
1120         absolute file names.
1121
1122 1999-03-03  Adrian Aichner  <aichner@ecf.teradyne.com>
1123
1124         * ediff-init.el (stipple-pixmap): Locate "stipple" library in
1125         x-bitmap-file-path if bound, else try to locate it in
1126         mswindows-bitmap-file-path, if bound.
1127
1128 1999-02-16  Michael Kifer  <kifer@cs.sunysb.edu>
1129
1130         * ediff-help.el (ediff-customize): new command.
1131
1132         * ediff-hooks.el: added menu item for customizing ediff.
1133
1134 1999-02-06  SL Baur  <steve@xemacs.org>
1135
1136         * ediff-init.el (stipple-pixmap): Move x bitmap dependency to
1137         runtime.
1138
1139 1999-01-18  Michael Kifer  <kifer@cs.sunysb.edu>
1140
1141         * ediff-patch.el: (ediff-patch-buffer-internal): changed message.
1142
1143 1998-12-09  SL Baur  <steve@altair.xemacs.org>
1144
1145         * ediff-tbar.el (ediff-toolbar-icon-directory): Don't assume there
1146         is always toolbar support.
1147
1148 1998-10-8  Michael Kifer  <kifer@cs.sunysb.edu>
1149
1150         * ediff-util.el (ediff-cleanup-mess): fixed the case of dead windows.
1151         make sure you are in a good frame before deleting other
1152         windows.
1153
1154         * ediff-mult.el (ediff-show-session-group-hook): new default.
1155
1156         * ediff-vers.el (ediff-pcl-cvs-view-revision):
1157         first cd to the file directory. reportedly works
1158         better with remote files.
1159
1160         * ediff-vers.el (ediff-pcl-cvs-internal, ediff-pcl-cvs-merge-internal):
1161         use file-name-nondirectory when passing files to CVS.
1162
1163 1998-07-20  Michael Kifer  <kifer@cs.sunysb.edu>
1164
1165         * ediff-help.el (ediff-long-help-message-merge): default changed.
1166
1167         * ediff-util.el (ediff-status-info): updated.
1168         (ediff-toggle-skip-changed-regions): new function.
1169         (ediff-next-difference, ediff-previous-difference):
1170         now skips white space correctly in the merge mode.
1171         (ediff-write-merge-buffer-and-maybe-kill,
1172         ediff-maybe-save-and-delete-merge): changed to give more options to
1173         the user.
1174         (ediff-other-buffer): no longer skips mail buffers.
1175
1176         * ediff-merg.el (ediff-skip-merge-regions-that-differ-from-default):
1177         new variable.
1178         (ediff-skip-merge-region-if-changed-from-default-p,
1179         ediff-merge-changed-from-default-p): new functions.
1180
1181         * ediff-wind.el (ediff-control-frame-parameters):
1182         improved, to reduce distraction.
1183         (ediff-skip-unsuitable-frames): make it skip small windows.
1184
1185         * ediff-diff.el, ediff-init.el: Improved comments.
1186
1187         * ediff-mult.el (ediff-hide-marked-sessions):
1188         make it redraw the meta buffer.
1189         (ediff-collect-custom-diffs): make the diff buffer read-only, not
1190         modified.
1191         (ediff-mark-for-hiding, ediff-mark-for-operation): renamed to *-at-pos.
1192         (ediff-mark-session-for-hiding, ediff-mark-session-for-operation,
1193         ediff-unmark-all-for-operation, ediff-unmark-all-for-hiding): new
1194         functions.
1195         (ediff-setup-meta-map): changed bindings.
1196
1197         * ediff.el, ediff-init.el, ediff-ptch.el, ediff-help.el,
1198         ediff-diff.el, ediff-tbar.el, ediff-wind.el, ediff-mult.el: Removed
1199         function quotes around lambdas.
1200
1201         * ediff.texi: add section about $*.
1202
1203
1204 1998-04-27  SL Baur  <steve@altair.xemacs.org>
1205
1206         * dumped-lisp.el: removed.
1207
1208 1998-02-25  SL Baur  <steve@altair.xemacs.org>
1209
1210         * ediff-tbar.el (ediff-toolbar-icon-directory): New variable.
1211         (ediff-toolbar-next-icon): Use it.
1212         (ediff-toolbar-previous-icon): Ditto.
1213         (ediff-toolbar-A-icon): Ditto.
1214         (ediff-toolbar-B-icon): Ditto.
1215         (ediff-toolbar-toggle-split-icon): Ditto.
1216         (ediff-toolbar-save-icon): Ditto.
1217         (ediff-toolbar-quit-icon): Ditto.
1218         (ediff-toolbar-help-icon): Ditto.
1219         (ediff-toolbar-refresh-icon): Ditto.
1220         (ediff-toolbar-refine-icon): Ditto.
1221
1222         * ediff.texi: Add direntry section for automated installation.
1223
1224 1998-01-24  SL Baur  <steve@altair.xemacs.org>
1225
1226         * Makefile (VERSION): Update to package standard 1.0.
1227         * package-info.in: Ditto.
1228
1229 1998-01-03  SL Baur  <steve@altair.xemacs.org>
1230
1231         * Makefile: Update to newer package interface.
1232
1233 1997-12-25  SL Baur  <steve@altair.xemacs.org>
1234
1235         * Makefile: Created.