Commits

Anonymous committed 2c8bba2

2005-12-24 Steve Youngs <steve@sxemacs.org>

* steve@eicq.org--2005/xetla--main--1.1--version-0 is released.
See ./ChangeLog.d/ChangeLog-1.1 for details.

* ChangeLog.d/*: New files.

* package-info.in (description): Mention (S)XEmacs in the
description.
(provides): Remove smerge, it isn't part of XEtla anymore.

* Makefile (AUTHOR_VERSION): Bump to
steve@eicq.org--2005/xetla--main--1.1--version-0
(ELCS): Remove smerge.el, it isn't part of XEtla anymore.

Comments (0)

Files changed (13)

+2005-12-24  Steve Youngs  <steve@sxemacs.org>
+
+	* steve@eicq.org--2005/xetla--main--1.1--version-0 is released.
+	See ./ChangeLog.d/ChangeLog-1.1 for details.
+
+	* ChangeLog.d/*: New files.
+
+	* package-info.in (description): Mention (S)XEmacs in the
+	description. 
+	(provides): Remove smerge, it isn't part of XEtla anymore.
+
+	* Makefile (AUTHOR_VERSION): Bump to
+	steve@eicq.org--2005/xetla--main--1.1--version-0 
+	(ELCS): Remove smerge.el, it isn't part of XEtla anymore.
+
 2005-04-04  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.00 released.

ChangeLog.d/ChangeLog-0.1

+# do not edit -- automatically generated by arch changelog
+# non-id: automatic-ChangeLog--steve@eicq.org--2004/xetla--main--0.1
+#
+
+2004-12-21 04:18:48 GMT	Steve Youngs <steve@eicq.org>	patch-24
+
+    Summary:
+      Font lock updates.
+    Revision:
+      xetla--main--0.1--patch-24
+
+    * xetla-defs.el (xetla-log-edit-font-lock-keywords): Add some colour to
+      the Summary and Keywords header content.
+      (xetla-cat-log-font-lock-keywords): Add font-locking to the entire
+      buffer, not just the log headers.
+    
+
+    modified files:
+     xetla-defs.el
+
+
+2004-12-20 17:40:42 GMT	Steve Youngs <steve@eicq.org>	patch-23
+
+    Summary:
+      remove unnecessary defvar from xetla-build.el
+    Revision:
+      xetla--main--0.1--patch-23
+
+
+    modified files:
+     xetla-build.el
+
+
+2004-12-20 17:26:41 GMT	Steve Youngs <steve@eicq.org>	patch-22
+
+    Summary:
+      Fix font-locking and "markerp nil" error from `C-x T a'
+    Revision:
+      xetla--main--0.1--patch-22
+
+    * xetla.el (xetla-log-edit-mode): Call `font-lock-mode'.
+    (xetla-cat-log-mode): Ditto.
+    (xetla-changes-mode): Ditto.
+    (xetla-changelog-mode): Ditto.
+    (xetla-show-changes-buffer): Remove void variable
+    `global-font-lock-mode'. 
+    
+    * xetla-defs.el (xetla-changelog-font-lock-keywords): Rewrite, specifying
+      the keywords without relying on `change-log-font-lock-keywords'.  The
+      format from `tla changelog' is slightly different from GNU style Changelog
+      files so just using `change-log-font-lock-keywords' will not work.
+    
+    * xetla-defs.el (xetla-log-edit-font-lock-keywords): Use
+      `xetla-changelog-font-lock-keywords'. 
+    
+
+    modified files:
+     xetla-defs.el xetla.el
+
+
+2004-12-17 05:59:49 GMT	Steve Youngs <steve@eicq.org>	patch-21
+
+    Summary:
+      Add autoload cookie to xetla-version<f>
+    Revision:
+      xetla--main--0.1--patch-21
+
+
+    modified files:
+     xetla.el
+
+
+2004-12-17 03:24:56 GMT	Steve Youngs <steve@eicq.org>	patch-20
+
+    Summary:
+      Improve `xetla-reload'.
+    Revision:
+      xetla--main--0.1--patch-20
+
+    * xetla-core.el (xetla-reload): Handle XEtla's auto-autoloads.el file.
+    
+
+    modified files:
+     xetla-core.el
+
+
+2004-12-17 03:06:31 GMT	Steve Youngs <steve@eicq.org>	patch-19
+
+    Summary:
+      Get rid of the need for xetla-xemacs.el.
+    Revision:
+      xetla--main--0.1--patch-19
+
+    This patch removes the need to have xetla-xemacs.el.
+    
+    All of the "Use `foo' instead of `bar' are GNU/Emacs -> XEmacs
+    corrections. 
+    
+    * Makefile (SOURCES): Remove xetla-xemacs.el
+    
+    * xetla-browse.el (xetla-widget-archives-root-node-register-archive): Use
+      `match-string' instead of `match-string-no-properties'.
+    
+    * xetla-browse.el (xetla-widget-archive-node-convert-to-source): Ditto.
+    
+    * xetla-browse.el (xetla-widget-version-control-show-revisions): Use
+      `point-at-*' instead of `line-*-position' functions.
+    
+    * xetla-browse.el (xetla-browse-toggle-subtree-maybe): Ditto.
+    
+    * xetla-browse.el (xetla-browse-dash): Ditto.
+    
+    * xetla-build.el: No need to conditionalise on featurep 'xemacs.
+      Remove cruft about mouse-avoidance.
+      Add a defvar for `global-font-lock-mode' and
+      `xetla-dead-process-buffer-queue'. 
+    
+    * xetla-core.el: Don't require xetla-xemacs.
+    
+    * xetla-core.el (xetla-version-head): Use `point-at-*' instead of
+      `line-*-position' functions.
+    
+    * xetla-core.el (xetla-archive-tree-build-archives): Ditto.
+    
+    * xetla-core.el (xetla-archive-tree-build-categories): Ditto.
+    
+    * xetla-core.el (xetla-archive-tree-build-branches): Ditto.
+    
+    * xetla-core.el (xetla-archive-tree-build-versions): Ditto.
+    
+    * xetla-core.el (xetla-archive-tree-build-revisions): Ditto.
+    
+    * xetla-core.el (xetla-revlib-tree-build-archives): Ditto.
+    
+    * xetla-core.el (xetla-revlib-tree-build-categories): Ditto.
+    
+    * xetla-core.el (xetla-revlib-tree-build-branches): Ditto.
+    
+    * xetla-core.el (xetla-revlib-tree-build-versions): Ditto.
+    
+    * xetla-core.el (xetla-revlib-tree-build-revisions): Ditto.
+    
+    * xetla-core.el (xetla-name-read-refresh-cache): Use `buffer-substring'
+      instead of `minibuffer-contents'.
+    
+    * xetla-core.el (xetla-reload): Don't try to unload `xetla-xemacs' or
+      `xetla-emacs'. 
+    
+    * xetla-defs.el (clone-process): Define it with `defun-when-void'.
+    
+    * xetla-defs.el (clone-buffer): Moved here from xetla-xemacs.el and
+      defined with `defun-when-void'.
+    
+    * xetla-defs.el (xetla-name-read-minibuf-map): Use `window-minibuffer-p'
+      and `buffer-substring' in place of `minibufferp' and
+      `minibuffer-contents' respectively.
+    
+    * xetla-tips.el: Don't require xetla-xemacs or xetla-emacs.
+    
+    * xetla.el: Don't require xetla-xemacs.
+    
+    * xetla.el (xetla-generic-popup-menu-by-keyboard): Use `point-at-*'
+      instead of `line-*-position'.
+    
+    * xetla.el (xetla-edit-log): Ditto.
+    
+    * xetla.el (xetla-add-log-entry-internal): Ditto.
+    
+    * xetla.el (xetla-show-changes-buffer): Ditto.
+    
+    * xetla.el (xetla-view-conflicts): Ditto.
+    
+    * xetla.el (xetla-file-get-revision-in-file): Ditto.
+    
+    * xetla.el (xetla-revisions-parse-list): Ditto.
+    
+    * xetla.el (xetla-bookmarks-missing-parse-changes): Ditto.
+    
+    * xetla.el (xetla-log-edit-next-field): Ditto.
+    
+    * xetla.el (xetla-log-edit-insert-log-for-merge): Ditto.
+    
+    * xetla.el (xetla-log-edit-insert-memorized-log): Ditto.
+    
+    * xetla.el (xetla-log-edit-keywords): Ditto.
+    
+    * xetla.el (xetla-log-edit-keywords-insert): Ditto.
+    
+    * xetla.el (xetla-changes-jump-to-change): Ditto.
+    
+    * xetla.el (xetla-changes-diff-or-list): Ditto.
+    
+    * xetla.el (xetla-changes-prev): Ditto.
+    
+    * xetla.el (xetla-changes-ediff): Ditto.
+    
+    * xetla.el (xetla-changes-get-file-at-point): Ditto.
+    
+    * xetla.el (xetla-tree-lint-parse-buffer): Ditto.
+    
+    * xetla.el (xetla-version): Ditto.
+    
+    * xetla.el (xetla-gnus-article-extract-log-message): Ditto.
+    
+    * xetla.el (xetla-generic-popup-menu-by-keyboard): Remove mouse-avoidence
+      crud.
+    
+    * xetla.el (xetla-name-read-insert-default-archive): Use
+      `window-minibuffer-p' and `buffer-substring' in place of `minibufferp'
+      and `minibuffer-contents' respectively.
+    
+    * xetla.el (xetla-name-read-insert-info-at-point): Ditto.
+    
+    * xetla.el (xetla-name-read-insert-partner-previous): Ditto.
+    
+    * xetla.el (xetla-name-read-insert-partner-next): Ditto.
+    
+    * xetla.el (xetla-name-read-insert-ancestor): Ditto.
+    
+    * xetla.el (xetla-name-read-insert-bookmark-previous): Ditto.
+    
+    * xetla.el (xetla-name-read-insert-bookmark-next): Ditto.
+    
+    * xetla.el (xetla-register-archive): Use `match-string' instead of
+      `match-string-no-properties'. 
+    
+    * xetla.el (xetla-merge-summary-line-for-log): Ditto.
+    
+    * xetla.el: Defvar `vc-ignore-vc-files' at compile time.
+    
+    * xetla.el (xetla-find-file-hook): Simplify somebody's idea of logic by
+      removing a useless `if' sexp.
+    
+
+    removed files:
+     .arch-ids/xetla-xemacs.el.id xetla-xemacs.el
+
+    modified files:
+     Makefile xetla-browse.el xetla-build.el xetla-core.el
+     xetla-defs.el xetla-tips.el xetla.el
+
+
+2004-12-16 23:57:55 GMT	Steve Youngs <steve@eicq.org>	patch-18
+
+    Summary:
+      Improve the list of log keywords.
+    Revision:
+      xetla--main--0.1--patch-18
+
+    * xetla-defs.el (xetla-log-edit-keywords): Richer set of keywords.
+      Remove autoload cookie.
+    
+
+    modified files:
+     xetla-defs.el
+
+
+2004-12-16 17:45:45 GMT	Steve Youngs <steve@eicq.org>	patch-17
+
+    Summary:
+      Remove a bogus doc string
+    Revision:
+      xetla--main--0.1--patch-17
+
+
+    modified files:
+     xetla.el
+
+
+2004-12-16 17:40:06 GMT	Steve Youngs <steve@eicq.org>	patch-16
+
+    Summary:
+      Make `xetla-log-edit-done' mimic `add-log-exit' a bit more.
+    Revision:
+      xetla--main--0.1--patch-16
+
+    * xetla.el (xetla-log-edit-done): Don't run `tla commit' unless there's a
+      prefix arg.
+    
+
+    modified files:
+     xetla.el
+
+
+2004-12-16 14:39:53 GMT	Steve Youngs <steve@eicq.org>	patch-15
+
+    Summary:
+      merge from hrop (finish removing buffers menu crap)
+    Revision:
+      xetla--main--0.1--patch-15
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
+       flush install-buffers instead of commenting'em out
+    
+
+    modified files:
+     xetla-browse.el xetla-core.el xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
+
+
+2004-12-16 05:20:45 GMT	Steve Youngs <steve@eicq.org>	patch-14
+
+    Summary:
+      merge from hrop (remove buffers menu)
+    Revision:
+      xetla--main--0.1--patch-14
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
+       star merge from steve --patch-12 --patch-13
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
+       flushing xetla-buffers menu
+    
+
+    modified files:
+     xetla-browse.el xetla-core.el xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
+
+
+2004-12-09 09:09:55 GMT	Steve Youngs <steve@eicq.org>	patch-13
+
+    Summary:
+      merge from hrop... yet another -- to - fubar
+    Revision:
+      xetla--main--0.1--patch-13
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
+       fix, some more s/-/--/ issue
+    
+
+    modified files:
+     xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
+
+
+2004-12-06 23:34:26 GMT	Steve Youngs <steve@eicq.org>	patch-12
+
+    Summary:
+      merge from hrop
+    Revision:
+      xetla--main--0.1--patch-12
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
+       fix, some more parsing corrections for dealing with tla archive strings
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
+       fix, inventory mode now correctly respects prefix arguments
+    
+
+    modified files:
+     xetla-core.el xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
+
+
+2004-12-02 09:00:45 GMT	Steve Youngs <steve@eicq.org>	patch-11
+
+    Summary:
+      merge from hrop
+    Revision:
+      xetla--main--0.1--patch-11
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
+       abstraction
+    
+
+    modified files:
+     xetla-core.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
+
+
+2004-11-29 21:19:36 GMT	Steve Youngs <steve@eicq.org>	patch-10
+
+    Summary:
+      merge from hrop (fix xetla-tree-version-list)
+    Revision:
+      xetla--main--0.1--patch-10
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
+       minor fix to correctly identify tree version
+    
+
+    modified files:
+     xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
+
+
+2004-11-27 00:36:28 GMT	Steve Youngs <steve@eicq.org>	patch-9
+
+    Summary:
+      merge from hrop (overlay -> extent conversion)
+    Revision:
+      xetla--main--0.1--patch-9
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
+       star-merge <=patch-8 of steve-line
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
+       evaporation of overlay cruft
+    
+
+    modified files:
+     xetla-browse.el xetla-xemacs.el xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
+
+
+2004-11-25 11:28:01 GMT	Steve Youngs <steve@eicq.org>	patch-8
+
+    Summary:
+      Fix faces to work with XEmacs and fix tla cmd line args
+    Revision:
+      xetla--main--0.1--patch-8
+
+    Looks like the initial xtla -> xetla renaming caused more problems than
+    it solved.  All the external tla command line args (the long options) got
+    one of the leading dashes deleted.  This fixes it.
+    
+    This patch goes a long way toward getting faces and font-locking working
+    properly.  It's not quite right yet, but at least there aren't any errors
+    any more.
+    
+    * xetla-defs.el: Redo all the faces to work properly with XEmacs.
+    (xetla-inventory-file-font-lock-keywords): Syntax fix for XEmacs.
+    (xetla-log-edit-font-lock-keywords): Ditto.
+    (xetla-changes-font-lock-keywords): Ditto.
+    (xetla-changelog-font-lock-keywords): Ditto.
+    
+    * xetla-browse.el: Ditto.
+    
+    * xetla.el (xetla-inventory): Fix tla command line args that got messed
+      up with the initial renaming.
+    
+    * xetla.el (xetla-changes): Ditto.
+    
+    * xetla.el (xetla-changes-internal): Ditto.
+    
+    * xetla.el (xetla-show-changeset): Ditto.
+    
+    * xetla.el (xetla-apply-changeset-internal): Ditto.
+    
+    * xetla.el (xetla-commit): Ditto.
+    
+    * xetla.el (xetla-logs): Ditto.
+    
+    * xetla.el (xetla-library-delete): Ditto.
+    
+    * xetla.el (xetla-library-find): Ditto.
+    
+    * xetla.el (xetla-star-merge): Ditto.
+    
+    * xetla.el (xetla-replay): Ditto.
+    
+    * xetla.el (xetla-tag): Ditto.
+    
+    * xetla.el (xetla-missing-refresh): Ditto.
+    
+    * xetla.el (xetla-bookmarks-tag): Ditto.
+    
+    * xetla.el (xetla-unregister-archive): Ditto.
+    
+    * xetla.el (xetla-make-archive-internal): Ditto.
+    
+    * xetla.el (xetla-mirror-archive): Ditto.
+    
+    * xetla.el (xetla-mirror-from-archive): Ditto.
+    
+    * xetla.el (xetla-cat-config): Ditto.
+    
+    * xetla.el (xetla-add): Ditto.
+    
+    * xetla.el (xetla-remove): Ditto.
+    
+    * xetla.el (xetla-start-project): Ditto.
+    
+    * xetla-core.el (xetla-archive-tree-build-revisions): Ditto.
+    
+    * xetla-core.el (xetla-revlib-tree-build-revisions): Ditto.
+    
+    * xetla-core.el (xetla-compute-direct-ancestor): Ditto.
+    
+    * xetla-core.el (xetla-escape): Ditto.
+    
+    * xetla-xemacs.el: Remove the font compatibility code.
+
+    modified files:
+     xetla-browse.el xetla-core.el xetla-defs.el xetla-xemacs.el
+     xetla.el
+
+
+2004-11-25 05:55:35 GMT	Steve Youngs <steve@eicq.org>	patch-7
+
+    Summary:
+      Code audit - removing xtla/gna.org references.
+    Revision:
+      xetla--main--0.1--patch-7
+
+    * xetla-tips.el (xetla-tips-array): Remove reference to gna.org.
+    
+    * xetla.el (xetla-submit-patch): Send patches to
+      xetla-devel@youngs.au.com. 
+    
+    * xetla.el (xetla-submit-bug-report): Send bugs to
+      xetla-devel@youngs.au.com. 
+    
+    * xetla.el (xetla): Update displayed info to be XEtla-centric.
+    
+
+    modified files:
+     xetla-tips.el xetla.el
+
+
+2004-11-25 03:46:36 GMT	Steve Youngs <steve@eicq.org>	patch-6
+
+    Summary:
+      Build fixes for ewoc.el
+    Revision:
+      xetla--main--0.1--patch-6
+
+    * ewoc.el (ewoc-dll): Remove this dummy variable and undo the `dll ->
+      ewoc-dll' renaming.
+      (dll): Bind as a variable at compile time only.
+    
+    This patch gives a clean compile for ewoc.el, and pretty much undoes
+    Sebastian's attempt to fix it. :-P  The problem with Sebastian's patch
+    was that he did a global `dll -> ewoc-dll' replacement and there was a
+    data type that relied on having 'dll'.
+    
+      
+    
+
+    modified files:
+     ewoc.el
+
+
+2004-11-25 01:27:46 GMT	Steve Youngs <steve@eicq.org>	patch-5
+
+    Summary:
+      syncing up patch logs from hrop
+    Revision:
+      xetla--main--0.1--patch-5
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
+       tag of steve@eicq.org--2004/xetla--main--0.1--base-0
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
+       bypass compiler warnings
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
+       fixing my fuckups
+    
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
+
+
+2004-11-25 01:26:24 GMT	Steve Youngs <steve@eicq.org>	patch-4
+
+    Summary:
+      merge from hrop (ewoc.el warning fix)
+    Revision:
+      xetla--main--0.1--patch-4
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
+       bypass compiler warnings
+    
+
+    modified files:
+     ewoc.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
+
+
+2004-11-24 23:42:57 GMT	Steve Youngs <steve@eicq.org>	patch-3
+
+    Summary:
+      New file xetla.texi
+    Revision:
+      xetla--main--0.1--patch-3
+
+
+    new files:
+     .arch-ids/xetla.texi.id xetla.texi
+
+
+2004-11-24 23:41:43 GMT	Steve Youngs <steve@eicq.org>	patch-2
+
+    Summary:
+      Fix the rest of the renaming fubars and add a Makefile
+    Revision:
+      xetla--main--0.1--patch-2
+
+    * xetla.el (xetla-revision-sync-tree): buxetlast -> butlast
+    (xetla-revision-star-merge): Ditto.
+    (xetla-revision-replay): Ditto.
+    (xetla-library-add-internal): New, renamed from `xetla-library-add'.  In
+    the initial xtla -> xetla renaming there was a `tla-library-add' and a
+    `tla--library-add', the keyboard macro I used to do the renaming didn't
+    take this situation into account.
+    (xetla-library-add-interactive): Use `xetla-library-add-internal'.
+    (xetla-register-archive): Use `xetla-register-archive-internal'.
+    (xetla-register-archive-internal): New.
+    (xetla-edit-archive-location): Use `xetla-register-archive-internal'.
+    (xetla-use-as-default-mirror): Ditto.
+    (xetla-archive-convert-to-source-archive): Ditto.
+    (xetla-make-archive-internal): New.
+    (xetla-make-archive): Use it.
+    
+    * xetla-core.el (xetla-name-read-refresh-cache): Ditto.
+    
+    * xetla-browse.el (xetla-widget-archives-root-node-register-archive): Use
+      `xetla-register-archive-internal'.
+    
+    * xetla-browse.el (xetla-widget-archives-root-node-make-archive): Use
+      `xetla-make-archive-internal'. 
+    
+    * Makefile: New.
+    
+    When I did the initial global renaming from xtla to xetla my keyboard
+    macro didn't take into account things like `tla-foo-bar' and
+    `tla--foo-bar' both existing.  This patch takes care of that.
+    
+    It also introduces a Makefile for people who wish to byte-compile xetla.
+    
+
+    new files:
+     .arch-ids/Makefile.id Makefile
+
+    modified files:
+     xetla-browse.el xetla-core.el xetla.el
+
+
+2004-11-24 21:17:37 GMT	Steve Youngs <steve@eicq.org>	patch-1
+
+    Summary:
+      from hrop... minor renaming fixes
+    Revision:
+      xetla--main--0.1--patch-1
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
+       minor fixes
+    
+
+    modified files:
+     xetla-core.el xetla-defs.el xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
+
+
+2004-11-24 15:43:59 GMT	Steve Youngs <steve@eicq.org>	base-0
+
+    Summary:
+      Initial import of XEtla
+    Revision:
+      xetla--main--0.1--base-0
+
+    Initial import of XEtla.
+    XEtla is based heavily on xtla, except that the emphasis is
+    on XEmacs.  We suspect that XEtla will diverge quite significantly
+    from xtla.
+
+    new files:
+     BINDINGS COPYING FEATURES TODO ewoc.el smerge.el
+     xetla-browse.el xetla-build.el xetla-core.el xetla-defs.el
+     xetla-tips.el xetla-xemacs.el xetla.el
+
+

ChangeLog.d/ChangeLog-0.2

+# do not edit -- automatically generated by arch changelog
+# non-id: automatic-ChangeLog--steve@eicq.org--2005/xetla--main--0.2
+#
+
+2005-03-11 13:31:17 GMT	Steve Youngs <steve@eicq.org>	version-0
+
+    Summary:
+      0.2--version-0 is released
+    Revision:
+      xetla--main--0.2--version-0
+
+
+
+2005-03-11 06:34:11 GMT	Steve Youngs <steve@eicq.org>	patch-7
+
+    Summary:
+      Keymap fixes -- use `buttonN' not `mouse-N'
+    Revision:
+      xetla--main--0.2--patch-7
+
+    * xetla.el (xetla-insert-button): Use `button' not `mouse' in keymaps.
+      (xetla-inventory-insert-headers): Ditto.
+    
+    * xetla-defs.el (xetla-context-map-template): Ditto.
+      (xetla-bookmarks-entry-map): Ditto.
+      (xetla-inventory-item-map): Ditto.
+      (xetla-inventory-tagging-method-map): Ditto.
+      (xetla-tree-lint-file-map): Ditto.
+      (xetla-archive-archive-map): Ditto.
+      (xetla-category-category-map): Ditto.
+      (xetla-branch-branch-map): Ditto.
+      (xetla-version-version-map): Ditto.
+      (xetla-revision-revision-map): Ditto.
+      (xetla-changes-file-map): Ditto.
+    
+    * xetla-browse.el (xetla-widget-node-map): Ditto.
+    
+    * xetla-core.el (xetla-log-printer-print-buffer): Ditto.
+    
+
+    modified files:
+     xetla-browse.el xetla-core.el xetla-defs.el xetla.el
+
+
+2005-03-10 06:29:43 GMT	Steve Youngs <steve@eicq.org>	patch-6
+
+    Summary:
+      Fix up some of the tips... Xetla -> XEtla
+    Revision:
+      xetla--main--0.2--patch-6
+
+    * xetla-tips.el (xetla-tips-popup): Typo fix.
+    (xetla-tips-array): Ditto.
+    
+
+    modified files:
+     xetla-tips.el
+
+
+2005-03-10 06:18:31 GMT	Steve Youngs <steve@eicq.org>	patch-5
+
+    Summary:
+      Nuke the local vars in the source to avoid merge conflicts
+    Revision:
+      xetla--main--0.2--patch-5
+
+    * xetla-browse.el: Remove local vars and "Last-Modified" header, it
+      causes too many conflicts when merging.
+    
+    * xetla-build.el: Ditto.
+    
+    * xetla-core.el: Ditto.
+    
+    * xetla-defs.el: Ditto.
+    
+    * xetla-tips.el: Ditto.
+    
+    * xetla.el: Ditto.
+    
+    * xetla.texi: Ditto.
+    
+
+    modified files:
+     xetla-browse.el xetla-build.el xetla-core.el xetla-defs.el
+     xetla-tips.el xetla.el xetla.texi
+
+
+2005-03-10 06:11:01 GMT	Steve Youngs <steve@eicq.org>	patch-4
+
+    Summary:
+      Fix commit max-specpdl-size bug
+    Revision:
+      xetla--main--0.2--patch-4
+
+    * xetla.el (xetla-commit): Set the :finished key to "handler" only.  If
+      handler is nil the default `xetla-default-finish-function' will be
+      used. 
+    
+    This fixes the variable exceeds max-specpdl-size bug.
+    
+    This patch was committed from XEtla itself using `C-u C-c C-c' in the
+    xetla-log-edit buffer without error or warning.
+
+    modified files:
+     xetla.el
+
+
+2005-01-30 00:21:36 GMT	Steve Youngs <steve@eicq.org>	patch-3
+
+    Summary:
+      Typo in `xetla-delta', add a couple of keywords.
+    Revision:
+      xetla--main--0.2--patch-3
+
+    * xetla.el (xetla-delta): `-diffs' -> `--diffs'.
+    
+    * xetla-defs.el (xetla-log-edit-keywords): Add `sync' and `security'.
+    
+
+    modified files:
+     xetla-defs.el xetla.el
+
+
+2005-01-07 07:34:52 GMT	Steve Youngs <steve@eicq.org>	patch-2
+
+    Summary:
+      Some doc string clean up "xetla" -> "tla"
+    Revision:
+      xetla--main--0.2--patch-2
+
+    * xetla.el (xetla-changes): Update doc strings -- "Run xetla foo" => "Run
+      tla foo"
+      (xetla-delta): Ditto.
+      (xetla-show-changeset): Ditto.
+      (xetla-redo): Ditto.
+      (xetla-commit): Ditto.
+      (xetla-import): Ditto.
+      (xetla-logs): Ditto.
+      (xetla-help): Ditto.
+      (xetla-tree-root-xetla): Ditto.
+      (xetla-my-id): Ditto.
+      (xetla-my-revision-library): Ditto.
+      (xetla-library-config): Ditto.
+      (xetla-archive-fixup): Ditto.
+      (xetla-tag): Ditto.
+      (xetla-set-tree-version): Ditto.
+      (xetla-tree-revisions): Ditto.
+      (xetla-build-config): Ditto.
+      (xetla-cat-config): Ditto.
+      (xetla-get): Ditto.
+      (xetla-update): Ditto.
+      (xetla-inventory-star-merge): Ditto.
+      (xetla-inventory-changes): Ditto.
+      (xetla-inventory-replay): Ditto.
+      (xetla-inventory-update): Ditto.
+      (xetla-inventory-missing): Ditto.
+      (xetla-inventory-delta): Ditto.
+      (xetla-generic-set-tree-version): Ditto.
+      (xetla-version-tag): Ditto.
+      (xetla-revision-delta): Ditto.
+      (xetla-revision-tag-from-head): Ditto.
+      (xetla-revision-tag-from-here): Ditto.
+      (xetla-revision-update): Ditto.
+      (xetla-changes-diff): Ditto.
+      (xetla-tree-lint): Ditto.
+    
+    * xetla-browse.el (xetla-widget-version-node-tag): Ditto.
+    
+    * xetla-core.el (xetla-run-tla-async): Ditto.
+      (xetla-run-tla-sync): Ditto.
+    
+
+    modified files:
+     xetla-browse.el xetla-core.el xetla.el
+
+
+2004-12-31 23:39:42 GMT	Steve Youngs <steve@eicq.org>	patch-1
+
+    Summary:
+      Add changelog from prev version, bump VER in Makefile
+    Revision:
+      xetla--main--0.2--patch-1
+
+
+    new files:
+     ChangeLog.d/.arch-ids/=id
+     ChangeLog.d/.arch-ids/ChangeLog-0.1.id
+     ChangeLog.d/ChangeLog-0.1
+
+    modified files:
+     Makefile
+
+    new directories:
+     ChangeLog.d ChangeLog.d/.arch-ids
+
+
+2004-12-31 21:40:56 GMT	Steve Youngs <steve@eicq.org>	base-0
+
+    Summary:
+      tag of steve@eicq.org--2004/xetla--main--0.1--patch-24
+    Revision:
+      xetla--main--0.2--base-0
+
+    (automatically generated log message)
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
+     steve@eicq.org--2004/xetla--main--0.1--base-0
+     steve@eicq.org--2004/xetla--main--0.1--patch-1
+     steve@eicq.org--2004/xetla--main--0.1--patch-2
+     steve@eicq.org--2004/xetla--main--0.1--patch-3
+     steve@eicq.org--2004/xetla--main--0.1--patch-4
+     steve@eicq.org--2004/xetla--main--0.1--patch-5
+     steve@eicq.org--2004/xetla--main--0.1--patch-6
+     steve@eicq.org--2004/xetla--main--0.1--patch-7
+     steve@eicq.org--2004/xetla--main--0.1--patch-8
+     steve@eicq.org--2004/xetla--main--0.1--patch-9
+     steve@eicq.org--2004/xetla--main--0.1--patch-10
+     steve@eicq.org--2004/xetla--main--0.1--patch-11
+     steve@eicq.org--2004/xetla--main--0.1--patch-12
+     steve@eicq.org--2004/xetla--main--0.1--patch-13
+     steve@eicq.org--2004/xetla--main--0.1--patch-14
+     steve@eicq.org--2004/xetla--main--0.1--patch-15
+     steve@eicq.org--2004/xetla--main--0.1--patch-16
+     steve@eicq.org--2004/xetla--main--0.1--patch-17
+     steve@eicq.org--2004/xetla--main--0.1--patch-18
+     steve@eicq.org--2004/xetla--main--0.1--patch-19
+     steve@eicq.org--2004/xetla--main--0.1--patch-20
+     steve@eicq.org--2004/xetla--main--0.1--patch-21
+     steve@eicq.org--2004/xetla--main--0.1--patch-22
+     steve@eicq.org--2004/xetla--main--0.1--patch-23
+     steve@eicq.org--2004/xetla--main--0.1--patch-24
+
+

ChangeLog.d/ChangeLog-1.0

+# do not edit -- automatically generated by arch changelog
+# non-id: automatic-ChangeLog--steve@eicq.org--2005/xetla--main--1.0
+#
+
+2005-03-30 22:03:25 GMT	Steve Youngs <steve@eicq.org>	version-0
+
+    Summary:
+      XEtla 1.0 is released
+    Revision:
+      xetla--main--1.0--version-0
+
+
+
+2005-03-30 01:13:07 GMT	Steve Youngs <steve@eicq.org>	patch-7
+
+    Summary:
+      Fix tips buffer display
+    Revision:
+      xetla--main--1.0--patch-7
+
+    Under certain circumstances the tips buffer was being split into two
+    windows and displayed twice.  This fixes that by not trying to split the
+    tips buffer, just display it in the current window.
+    
+    * xetla-tips.el (xetla-tips-popup-number): Remove NOSWITCH arg and don't
+      split any windows when displaying the tips.
+      (xetla-tips-popup): Remove NOSWITCH arg.
+      (xetla-tips-next-tip): Call `xetla-tips-popup' with one arg not two.
+      (xetla-tips-previous-tip): Ditto.
+    
+
+    modified files:
+     xetla-tips.el
+
+
+2005-03-28 04:51:49 GMT	Steve Youngs <steve@eicq.org>	patch-6
+
+    Summary:
+      Clean up the build in readiness for XE package inclusion
+    Revision:
+      xetla--main--1.0--patch-6
+
+    * xetla-core.el: Autoload `xetla-tree-root' and `xetla-flash-line' at
+      compile time.  This ensures a clean build in XE packages hierarchy.
+    
+    * xetla-defs.el (xetla-clone-process): Renamed from `clone-process'.  For
+      avoiding a compiler warning in XE packages hierarchy.
+    
+    * xetla-defs.el (clone-buffer): Use it.
+    
+    * xetla.el (xetla-insinuate-gnus): Don't require any Gnus libs directly
+      in this function.  Autoload what is required at compile time instead.
+    
+
+    modified files:
+     xetla-core.el xetla-defs.el xetla.el
+
+
+2005-03-20 13:22:14 GMT	Steve Youngs <steve@eicq.org>	patch-5
+
+    Summary:
+      fix my stupidity
+    Revision:
+      xetla--main--1.0--patch-5
+
+
+    modified files:
+     xetla.el
+
+
+2005-03-20 09:50:41 GMT	Steve Youngs <steve@eicq.org>	patch-4
+
+    Summary:
+      Add missing face for bookmark names
+    Revision:
+      xetla--main--1.0--patch-4
+
+    * xetla.el (xetla-bookmark-face): Add definition of missing face.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-03-18 09:19:09 GMT	Steve Youngs <steve@eicq.org>	patch-3
+
+    Summary:
+      General code clean up.
+    Revision:
+      xetla--main--1.0--patch-3
+
+    * Makefile (VER): Bump to 1.0
+      (INSTALL): Don't set any args to install so mere mortal users can install
+      too.
+      (PRELOADS): Don't load xetla-build... it doesn't exist anymore.
+    
+    * xetla-browse.el: Autoload `easy-mmode-define-keymap' at compile time.
+      (xetla-widget-branch-node-get-branch): Use `read-directory-name'
+      instead of `xetla-read-directory-name'.
+      (xetla-widget-version-node-get-version): Ditto.
+    
+    * xetla-core.el: Autoload `read-passwd' at compile time.
+      (xetla-temp-directory): Set default with `temp-directory'.
+      (xetla-read-directory-name): Removed.  It didn't give anything that
+      `read-directory-name' didn't already give.
+      (xetla-add-to-list): Removed.  It didn't give anything that
+      `add-to-list' didn't already give.
+      (xetla-show-internal-buffers-on-menu): Default to nil.
+    
+    * xetla-defs.el: Remove a gazillion useless autoload cookies.
+      Lots of typo updates:
+           Xetla -> XEtla
+           xetla -> tla
+               - -> --
+      Set all the hook variable defcustoms to nil instead of `()
+      Put the call to `auto-mode-alist' inline with the autoload cookie
+      comment.  This avoids it getting loaded twice.
+    
+    * xetla-tips.el: Typo fixes.
+    
+    * xetla.el: Fix a condition-case form designed to skip an error.
+      Move the guts of xetla-build.el here.  Some went to other files, the
+      but majority is here.
+      (xetla-tree-version-list-xetla): Renambed to
+      `xetla-tree-version-list-tla'.
+      (xetla-tree-version-list-tla): New. from
+      `xetla-tree-version-list-xetla' .
+      (xetla-delete-file): New.  Replaces hack to maybe define
+      `dired-delete-file'.
+      Also lots of typo fixes.
+      Use `read-directory-name' instead of `xetla-read-directory-name'
+      throughout. 
+      Use `add-to-list' instead of `xetla-add-to-list' throughout.
+
+    removed files:
+     .arch-ids/xetla-build.el.id xetla-build.el
+
+    modified files:
+     Makefile xetla-browse.el xetla-core.el xetla-defs.el
+     xetla-tips.el xetla.el
+
+
+2005-03-11 14:44:57 GMT	Steve Youngs <steve@eicq.org>	patch-2
+
+    Summary:
+      Typo fixes -- xetla -> tla
+    Revision:
+      xetla--main--1.0--patch-2
+
+    * xetla.el (xetla-changes-internal): xetla -> tla typo fixes.
+    (xetla-changes): Ditto.
+    (xetla-changes-save): Ditto.
+    (xetla-changes-save-as-tgz): Ditto.
+    (xetla-delta-show-diff-on-buffer): Ditto.
+    (xetla-prepare-changes-buffer): Ditto.
+    (xetla-file-diff): Ditto.
+    (xetla-pristines): Ditto.
+    (xetla-changelog): Ditto.
+    (xetla-bookmarks-tag): Ditto.
+    (xetla-bookmarks-inventory): Ditto.
+    (xetla-bookmarks-get): Ditto.
+    (xetla-start-project): Ditto.
+    (xetla-cat-log-any): Ditto.
+    
+    * xetla-defs.el: Ditto.
+    (xetla-read-project-tree-mode): Ditto.
+    
+    * xetla-core.el (xetla-build-xetla-command): Ditto.
+    (minor-mode-alist): Ditto.
+    (xetla-unescape): Ditto.
+    
+    * xetla-browse.el (xetla-widget-branch-node-get-branch): Ditto.
+    (xetla-widget-version-node-get-version): Ditto.
+    
+    
+    
+
+    modified files:
+     xetla-browse.el xetla-core.el xetla-defs.el xetla.el
+
+
+2005-03-11 13:52:10 GMT	Steve Youngs <steve@eicq.org>	patch-1
+
+    Summary:
+      Add the 0.2 ChangeLog file
+    Revision:
+      xetla--main--1.0--patch-1
+
+
+    new files:
+     ChangeLog.d/.arch-ids/ChangeLog-0.2.id
+     ChangeLog.d/ChangeLog-0.2
+
+
+2005-03-11 13:43:46 GMT	Steve Youngs <steve@eicq.org>	base-0
+
+    Summary:
+      tag of steve@eicq.org--2005/xetla--main--0.2--version-0
+    Revision:
+      xetla--main--1.0--base-0
+
+    (automatically generated log message)
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
+     steve@eicq.org--2004/xetla--main--0.1--base-0
+     steve@eicq.org--2004/xetla--main--0.1--patch-1
+     steve@eicq.org--2004/xetla--main--0.1--patch-2
+     steve@eicq.org--2004/xetla--main--0.1--patch-3
+     steve@eicq.org--2004/xetla--main--0.1--patch-4
+     steve@eicq.org--2004/xetla--main--0.1--patch-5
+     steve@eicq.org--2004/xetla--main--0.1--patch-6
+     steve@eicq.org--2004/xetla--main--0.1--patch-7
+     steve@eicq.org--2004/xetla--main--0.1--patch-8
+     steve@eicq.org--2004/xetla--main--0.1--patch-9
+     steve@eicq.org--2004/xetla--main--0.1--patch-10
+     steve@eicq.org--2004/xetla--main--0.1--patch-11
+     steve@eicq.org--2004/xetla--main--0.1--patch-12
+     steve@eicq.org--2004/xetla--main--0.1--patch-13
+     steve@eicq.org--2004/xetla--main--0.1--patch-14
+     steve@eicq.org--2004/xetla--main--0.1--patch-15
+     steve@eicq.org--2004/xetla--main--0.1--patch-16
+     steve@eicq.org--2004/xetla--main--0.1--patch-17
+     steve@eicq.org--2004/xetla--main--0.1--patch-18
+     steve@eicq.org--2004/xetla--main--0.1--patch-19
+     steve@eicq.org--2004/xetla--main--0.1--patch-20
+     steve@eicq.org--2004/xetla--main--0.1--patch-21
+     steve@eicq.org--2004/xetla--main--0.1--patch-22
+     steve@eicq.org--2004/xetla--main--0.1--patch-23
+     steve@eicq.org--2004/xetla--main--0.1--patch-24
+     steve@eicq.org--2005/xetla--main--0.2--base-0
+     steve@eicq.org--2005/xetla--main--0.2--patch-1
+     steve@eicq.org--2005/xetla--main--0.2--patch-2
+     steve@eicq.org--2005/xetla--main--0.2--patch-3
+     steve@eicq.org--2005/xetla--main--0.2--patch-4
+     steve@eicq.org--2005/xetla--main--0.2--patch-5
+     steve@eicq.org--2005/xetla--main--0.2--patch-6
+     steve@eicq.org--2005/xetla--main--0.2--patch-7
+     steve@eicq.org--2005/xetla--main--0.2--version-0
+
+

ChangeLog.d/ChangeLog-1.1

+# do not edit -- automatically generated by arch changelog
+# non-id: automatic-ChangeLog--steve@eicq.org--2005/xetla--main--1.1
+#
+
+2005-12-24 03:53:37 GMT	Steve Youngs <steve@eicq.org>	version-0
+
+    Summary:
+      xetla--main--1.1--version-0 is released!
+    Revision:
+      xetla--main--1.1--version-0
+
+
+
+2005-12-24 02:45:19 GMT	Steve Youngs <steve@eicq.org>	patch-26
+
+    Summary:
+      Tiny cleanup before release.
+    Revision:
+      xetla--main--1.1--patch-26
+
+    * TODO: Re-write.  I've missed a lot of stuff that should be in this
+      file, so ADD TO IT!!
+    
+
+    removed files:
+     .arch-ids/BINDINGS.id .arch-ids/FEATURES.id BINDINGS FEATURES
+
+    modified files:
+     TODO
+
+
+2005-12-18 23:30:21 GMT	Steve Youngs <steve@eicq.org>	patch-25
+
+    Summary:
+      Merged from hrop (patch 10) -- fix buffer-live-p errors
+    Revision:
+      xetla--main--1.1--patch-25
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-10
+       minor fix, improve handling of killed buffers
+
+    modified files:
+     xetla-core.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-10
+
+
+2005-11-27 03:27:38 GMT	Steve Youngs <steve@eicq.org>	patch-24
+
+    Summary:
+      Enhance the tips buffer with `substitute-command-keys'.
+    Revision:
+      xetla--main--1.1--patch-24
+
+    * xetla-tips.el (xetla-tips-array): Add more tips and use a syntax
+      compatible with `substitute-command-keys'.
+      (xetla-tips-popup-number): Pass the tip through
+      `substitute-command-keys'.
+    
+
+    modified files:
+     xetla-tips.el
+
+
+2005-11-26 22:53:44 GMT	Steve Youngs <steve@eicq.org>	patch-23
+
+    Summary:
+      Support `tla changelog ARCHIVE/VERSION' in `xetla-changelog'
+    Revision:
+      xetla--main--1.1--patch-23
+
+    This changeset improves `xetla-changelog'.  With a prefix arg you can now
+    specify a archive/version to show a ChangeLog for.
+    
+    It also puts the changelog buffer in `view-mode' to make it easier to
+    scroll around the buffer.
+    
+    * xetla.el (xetla-changelog): Support the VERSION arg to `tla
+      changelog'.  And put the changelog buffer into `view-mode' for easier
+      scrolling. 
+    
+
+    modified files:
+     xetla.el
+
+
+2005-11-13 09:15:07 GMT	Steve Youngs <steve@sxemacs.org>	patch-22
+
+    Summary:
+      Tidy up bookmark code
+    Revision:
+      xetla--main--1.1--patch-22
+
+    This changeset tidies up the bookmark code.  It ensures that anything
+    that can operate on a local tree takes the situation of multiple local
+    trees into account.
+    
+    It also makes sure that all bookmark operations that switch buffers
+    honour `xetla-switch-to-buffer-mode'.
+    
+    * xetla.el (xetla-bookmarks-inventory): Support
+      `xetla-switch-to-buffer-mode'. 
+      (xetla-bookmarks-inventory): Support the possibility of having mulitple
+      local trees.
+      (xetla-bookmarks-load-from-file-OBSOLETE): Removed.
+      (xetla-bookmarks-load-from-file): Remove condition-case.
+      (xetla-bookmarks-missing): Use `substitute-command-keys' to show how to
+      get to the bookmarks buffer.
+      (xetla-bookmarks-open-tree): Update doc string, mention prefix arg usage.
+      (xetla-bookmarks-find-file): Support multiple local trees via a prefix
+      arg. 
+      (xetla-bookmarks-tag): Use `substitute-command-keys' to show how to get
+      to the bookmarks buffer.
+      (xetla-bookmarks-changes): Support both "full" and "summary" format
+      changes as well as mulitple local trees.  All done through prefix
+      args...
+          No prefix arg -- full format, default tree.
+          One prefix arg -- summary format, default tree.
+          Two prefix args -- full format, prompt for tree.
+          Three prefix args -- summary format, prompt for tree.
+      (xetla-bookmarks): xetla -> XEtla in doc string.
+      (xetla-bookmarks-mode): Ditto.
+    
+    
+
+    modified files:
+     xetla.el
+
+
+2005-11-10 04:08:35 GMT	Steve Youngs <steve@eicq.org>	patch-21
+
+    Summary:
+      Make xetla-star-merge interactive
+    Revision:
+      xetla--main--1.1--patch-21
+
+    * xetla.el (xetla-star-merge): Make it interactive so it can be called
+      directly instead of just from bookmarks or inventory buffers.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-11-09 00:28:43 GMT	Steve Youngs <steve@eicq.org>	patch-20
+
+    Summary:
+      Open non-default local tree of a bookmark
+    Revision:
+      xetla--main--1.1--patch-20
+
+    I discovered the other day that if a bookmark had more than one local
+    tree associated with it there was no way to open any tree apart from the
+    "default" tree.  This fixes that.
+    
+       In the bookmarks buffer:
+    
+            `o'     -- open "default tree"
+            `C-u o' -- ask user which tree to open, completing on the trees
+                       associated with that particular bookmark.  User is
+                       then asked if they want to make their choice the
+                       default.
+    
+    * xetla.el (xetla-bookmarks-open-tree): Use a prefix arg to handle a
+      bookmark having multiple local trees.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-10-30 15:14:36 GMT	Steve Youngs <steve@sxemacs.org>	patch-19
+
+    Summary:
+      Make bookmarks honour `xetla-switch-to-buffer-mode'
+    Revision:
+      xetla--main--1.1--patch-19
+
+    * xetla.el (xetla-bookmarks-open-tree): Only run dired in another window
+      if `xetla-switch-to-buffer-mode' is something other than
+      `single-window'.
+      (xetla-bookmarks): Put the bookmarks buffer in the same window if
+      `xetla-switch-to-buffer-mode' is `single-window'.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-07-28 10:21:43 GMT	Steve Youngs <steve@sxemacs.org>	patch-18
+
+    Summary:
+      Fix `xetla-arch-version-number' 
+    Revision:
+      xetla--main--1.1--patch-18
+
+    * xetla.el (xetla-arch-version-number): Fix regexp.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-07-01 12:20:53 GMT	Steve Youngs <steve@eicq.org>	patch-17
+
+    Summary:
+      Update tips
+    Revision:
+      xetla--main--1.1--patch-17
+
+    * xetla-tips.el (xetla-tips-array): Remove tip about smerge.
+    
+
+    modified files:
+     xetla-tips.el
+
+
+2005-07-01 12:10:26 GMT	Steve Youngs <steve@eicq.org>	patch-16
+
+    Summary:
+      Fix committing from the log buffer.
+    Revision:
+      xetla--main--1.1--patch-16
+
+    * xetla.el (xetla-commit-fix): Fix regex.
+      (xetla-log-edit-done): When current-prefix-arg is numeric, it's
+      actually a list, so use its `car'.  Also, kill the log buffer _before_
+      running `tla commit', otherwise the user gets asked a cryptic question
+      about killing a process.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-07-01 09:58:58 GMT	Steve Youngs <steve@eicq.org>	patch-15
+
+    Summary:
+      Ignore the duplicate logs for patch-12 to patch-14 (whee hiccup with XEtla)
+    Revision:
+      xetla--main--1.1--patch-15
+
+
+
+2005-07-01 09:37:07 GMT	Steve Youngs <steve@eicq.org>	patch-14
+
+    Summary:
+      Improve handling of seal/fix commits
+    Revision:
+      xetla--main--1.1--patch-14
+
+    This improves the implementation of seal/fix commits.  It makes it
+    possible to seal/fix from the log edit buffer by using the normal
+    existing C-c C-c keybinding...
+    
+        C-c C-c             -- Save and bury the log buffer
+        C-u C-c C-c         -- Save and kill the log + commit
+        C-u C-u C-c C-c     -- Save and kill the log + commit with seal
+        C-u C-u C-u C-c C-c -- Save and kill the log + commit with fix
+    
+    It also guards against trying to seal or fix when that isn't
+    appropriate.  For example, it won't let you "fix" an archive that isn't
+    sealed.  Neither will it let you "seal" an archive that is already sealed
+    or fixed.
+    
+    * xetla.el (xetla-get-current-revision): New.  Returns the latest fully
+      qualified revision in the current directory.
+      (xetla-commit-seal): Check against sealing when sealing is the wrong
+      thing to do.
+      (xetla-commit-fix): Ditto.
+      (xetla-log-edit-done): Rewrite.  Handle sealing and fixing commits.
+      Make it possible to seal and fix from the existing keymap using prefix
+      args.  See the doc string for the details.
+      (xetla-log-edit-done-with-sealing): Removed.  This isn't needed
+      anymore. 
+      (xetla-log-edit-done-with-fixing): Ditto.
+    
+
+
+2005-07-01 09:32:48 GMT	Steve Youngs <steve@eicq.org>	patch-13
+
+    Summary:
+      Improve handling of seal/fix commits
+    Revision:
+      xetla--main--1.1--patch-13
+
+    This improves the implementation of seal/fix commits.  It makes it
+    possible to seal/fix from the log edit buffer by using the normal
+    existing C-c C-c keybinding...
+    
+        C-c C-c             -- Save and bury the log buffer
+        C-u C-c C-c         -- Save and kill the log + commit
+        C-u C-u C-c C-c     -- Save and kill the log + commit with seal
+        C-u C-u C-u C-c C-c -- Save and kill the log + commit with fix
+    
+    It also guards against trying to seal or fix when that isn't
+    appropriate.  For example, it won't let you "fix" an archive that isn't
+    sealed.  Neither will it let you "seal" an archive that is already sealed
+    or fixed.
+    
+    * xetla.el (xetla-get-current-revision): New.  Returns the latest fully
+      qualified revision in the current directory.
+      (xetla-commit-seal): Check against sealing when sealing is the wrong
+      thing to do.
+      (xetla-commit-fix): Ditto.
+      (xetla-log-edit-done): Rewrite.  Handle sealing and fixing commits.
+      Make it possible to seal and fix from the existing keymap using prefix
+      args.  See the doc string for the details.
+      (xetla-log-edit-done-with-sealing): Removed.  This isn't needed
+      anymore. 
+      (xetla-log-edit-done-with-fixing): Ditto.
+    
+
+
+2005-07-01 09:32:04 GMT	Steve Youngs <steve@eicq.org>	patch-12
+
+    Summary:
+      Improve handling of seal/fix commits
+    Revision:
+      xetla--main--1.1--patch-12
+
+    This improves the implementation of seal/fix commits.  It makes it
+    possible to seal/fix from the log edit buffer by using the normal
+    existing C-c C-c keybinding...
+    
+        C-c C-c             -- Save and bury the log buffer
+        C-u C-c C-c         -- Save and kill the log + commit
+        C-u C-u C-c C-c     -- Save and kill the log + commit with seal
+        C-u C-u C-u C-c C-c -- Save and kill the log + commit with fix
+    
+    It also guards against trying to seal or fix when that isn't
+    appropriate.  For example, it won't let you "fix" an archive that isn't
+    sealed.  Neither will it let you "seal" an archive that is already sealed
+    or fixed.
+    
+    * xetla.el (xetla-get-current-revision): New.  Returns the latest fully
+      qualified revision in the current directory.
+      (xetla-commit-seal): Check against sealing when sealing is the wrong
+      thing to do.
+      (xetla-commit-fix): Ditto.
+      (xetla-log-edit-done): Rewrite.  Handle sealing and fixing commits.
+      Make it possible to seal and fix from the existing keymap using prefix
+      args.  See the doc string for the details.
+      (xetla-log-edit-done-with-sealing): Removed.  This isn't needed
+      anymore. 
+      (xetla-log-edit-done-with-fixing): Ditto.
+    
+
+
+2005-07-01 09:31:35 GMT	Steve Youngs <steve@eicq.org>	patch-11
+
+    Summary:
+      Improve handling of seal/fix commits
+    Revision:
+      xetla--main--1.1--patch-11
+
+    This improves the implementation of seal/fix commits.  It makes it
+    possible to seal/fix from the log edit buffer by using the normal
+    existing C-c C-c keybinding...
+    
+        C-c C-c             -- Save and bury the log buffer
+        C-u C-c C-c         -- Save and kill the log + commit
+        C-u C-u C-c C-c     -- Save and kill the log + commit with seal
+        C-u C-u C-u C-c C-c -- Save and kill the log + commit with fix
+    
+    It also guards against trying to seal or fix when that isn't
+    appropriate.  For example, it won't let you "fix" an archive that isn't
+    sealed.  Neither will it let you "seal" an archive that is already sealed
+    or fixed.
+    
+    * xetla.el (xetla-get-current-revision): New.  Returns the latest fully
+      qualified revision in the current directory.
+      (xetla-commit-seal): Check against sealing when sealing is the wrong
+      thing to do.
+      (xetla-commit-fix): Ditto.
+      (xetla-log-edit-done): Rewrite.  Handle sealing and fixing commits.
+      Make it possible to seal and fix from the existing keymap using prefix
+      args.  See the doc string for the details.
+      (xetla-log-edit-done-with-sealing): Removed.  This isn't needed
+      anymore. 
+      (xetla-log-edit-done-with-fixing): Ditto.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-06-30 04:30:32 GMT	Steve Youngs <steve@eicq.org>	patch-10
+
+    Summary:
+      Merged from hroptatyr@sxemacs.org--sxemacs (patch 6-7) -- seal/fix
+    Revision:
+      xetla--main--1.1--patch-10
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-6
+       new, add support for --seal and --fix commits
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-7
+       fix, minor enhancement to xetla-log-edit-done
+
+    modified files:
+     xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-6
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-7
+
+
+2005-05-26 02:49:43 GMT	Steve Youngs <steve@eicq.org>	patch-9
+
+    Summary:
+      Try to be smart about having both XEtla and Xtla installed
+    Revision:
+      xetla--main--1.1--patch-9
+
+    Having both XEtla and Xtla installed at the same time is _NOT_ a good
+    idea.  This changeset attempts to get around it.  It pops up a warning
+    buffer to tell the user what is going on and offers a way to disable
+    either XEtla or Xtla for the current session.  This isn't a "fix" as such
+    and the warning advises the user that the only real solution is to
+    physically remove either XEtla or Xtla.
+    
+    * xetla.el (xetla-dont-warn-about-xtla): New.  When non-nil don't warn
+      the user about having both XEtla and Xtla installed.
+      (xetla-warn-about-xtla-text): Text used in warning buffer when XEtla
+      and Xtla are installed.
+      (xetla-warn-about-xtla): Pop up a warning if both XEtla and Xtla are
+      installed. 
+      (xetla-attempt-xetla-removal): Attempt to disable XEtla in the current
+      session. 
+      (xetla-attempt-xtla-removal): Same as `xetla-attempt-xetla-removal' but
+      for Xtla instead of XEtla.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-05-21 01:20:18 GMT	Steve Youngs <steve@eicq.org>	patch-8
+
+    Summary:
+      Fix build (missing ad-add-advice)
+    Revision:
+      xetla--main--1.1--patch-8
+
+    * xetla-browse.el: Autoload `ad-add-advice' at compile time
+    
+
+    modified files:
+     xetla-browse.el
+
+
+2005-05-21 01:09:39 GMT	Steve Youngs <steve@eicq.org>	patch-7
+
+    Summary:
+      Merged from hroptatyr@sxemacs.org--sxemacs (patch 4) -- conflict handling
+    Revision:
+      xetla--main--1.1--patch-7
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-4
+       new, warn the users in case of .rej files
+
+    removed files:
+     .arch-ids/smerge.el.id smerge.el
+
+    modified files:
+     Makefile xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-4
+
+
+2005-04-18 03:20:36 GMT	Steve Youngs <steve@eicq.org>	patch-6
+
+    Summary:
+      Fix bug of x-f-f-h trying to use a VC var when VC isn't loaded
+    Revision:
+      xetla--main--1.1--patch-6
+
+    * xetla.el (vc-ignore-vc-files): This is not only needed at compile time
+      but also at run-time.  Especially for people who do _not_ have the vc
+      package installed or loaded.  So don't wrap in a eval-when-compile.  This
+      fixes a "symbol's definition as variable is void: vc-ignore-vc-files"
+      error that xetla-find-file-hook was generating.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-04-09 21:31:25 GMT	Steve Youngs <steve@eicq.org>	patch-5
+
+    Summary:
+      Merged from hroptatyr@sxemacs.org--sxemacs (patch 2) -- fix tla add 
+    Revision:
+      xetla--main--1.1--patch-5
+
+    Patches applied:
+    
+     * hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-2
+       fix, use `tla add' or `tla add-id' depending on which tla version is installed
+
+    modified files:
+     xetla.el
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--1.1--patch-2
+
+
+2005-04-09 02:52:17 GMT	Steve Youngs <steve@eicq.org>	patch-4
+
+    Summary:
+      Improve xetla-help -- enable displaying `tla help'
+    Revision:
+      xetla--main--1.1--patch-4
+
+    * xetla.el (xetla-help): Handle `tla help RET'.  If the user doesn't give
+      a command to get help on, display the output of `tla help'.
+      (xetla-display-global-help): New.  Used to display a buffer containing
+      the output from `tla help'.  Each tla command displayed in the buffer
+      is an extent which allows you to display the help for that command.
+      (xetla-help-extent-map): New.  Keymap used in the `xetla-display-global-help'
+      buffer.
+      (xetla-help-via-mouse): New.  Display help for tla command via mouse.
+      (xetla-help-via-keyb): New.  Display help for tla command via keyboard.
+    
+    * xetla-core.el (xetla-process-buffer-mode): Typo Xetla -> XEtla.
+    
+
+    modified files:
+     xetla-core.el xetla.el
+
+
+2005-04-07 23:54:09 GMT	Steve Youngs <steve@eicq.org>	patch-3
+
+    Summary:
+      Broken backward imcompatibility of tla 1.3.1 -- add -> add-id
+    Revision:
+      xetla--main--1.1--patch-3
+
+    * xetla.el (xetla-add-id): New.  Uses `tla add-id' instead of `tla add'.
+      (xetla-add): An alias to `xetla-add-id'.
+      (xetla-inventory-add-files): Use `xetla-add-id'.
+      (xetla-regenerate-id-for-file): Ditto.
+      (xetla-tree-lint-add-files): Ditto.
+    
+
+    modified files:
+     xetla.el
+
+
+2005-04-06 14:00:48 GMT	Steve Youngs <steve@eicq.org>	patch-2
+
+    Summary:
+      Remove =partner-versions file
+    Revision:
+      xetla--main--1.1--patch-2
+
+
+
+2005-03-30 22:44:04 GMT	Steve Youngs <steve@eicq.org>	patch-1
+
+    Summary:
+      Start 1.1
+    Revision:
+      xetla--main--1.1--patch-1
+
+    * Makefile (VER): Bump to 1.1
+    
+    Add ChangeLog file for previous release
+    
+
+    new files:
+     ChangeLog.d/.arch-ids/ChangeLog-1.0.id
+     ChangeLog.d/ChangeLog-1.0
+
+    modified files:
+     Makefile
+
+
+2005-03-30 22:39:14 GMT	Steve Youngs <steve@eicq.org>	base-0
+
+    Summary:
+      tag of steve@eicq.org--2005/xetla--main--1.0--version-0
+    Revision:
+      xetla--main--1.1--base-0
+
+    (automatically generated log message)
+
+    new patches:
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
+     hroptatyr@sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
+     steve@eicq.org--2004/xetla--main--0.1--base-0
+     steve@eicq.org--2004/xetla--main--0.1--patch-1
+     steve@eicq.org--2004/xetla--main--0.1--patch-2
+     steve@eicq.org--2004/xetla--main--0.1--patch-3
+     steve@eicq.org--2004/xetla--main--0.1--patch-4
+     steve@eicq.org--2004/xetla--main--0.1--patch-5
+     steve@eicq.org--2004/xetla--main--0.1--patch-6
+     steve@eicq.org--2004/xetla--main--0.1--patch-7
+     steve@eicq.org--2004/xetla--main--0.1--patch-8
+     steve@eicq.org--2004/xetla--main--0.1--patch-9
+     steve@eicq.org--2004/xetla--main--0.1--patch-10
+     steve@eicq.org--2004/xetla--main--0.1--patch-11
+     steve@eicq.org--2004/xetla--main--0.1--patch-12
+     steve@eicq.org--2004/xetla--main--0.1--patch-13
+     steve@eicq.org--2004/xetla--main--0.1--patch-14
+     steve@eicq.org--2004/xetla--main--0.1--patch-15
+     steve@eicq.org--2004/xetla--main--0.1--patch-16
+     steve@eicq.org--2004/xetla--main--0.1--patch-17
+     steve@eicq.org--2004/xetla--main--0.1--patch-18
+     steve@eicq.org--2004/xetla--main--0.1--patch-19
+     steve@eicq.org--2004/xetla--main--0.1--patch-20
+     steve@eicq.org--2004/xetla--main--0.1--patch-21
+     steve@eicq.org--2004/xetla--main--0.1--patch-22
+     steve@eicq.org--2004/xetla--main--0.1--patch-23
+     steve@eicq.org--2004/xetla--main--0.1--patch-24
+     steve@eicq.org--2005/xetla--main--0.2--base-0
+     steve@eicq.org--2005/xetla--main--0.2--patch-1
+     steve@eicq.org--2005/xetla--main--0.2--patch-2
+     steve@eicq.org--2005/xetla--main--0.2--patch-3
+     steve@eicq.org--2005/xetla--main--0.2--patch-4
+     steve@eicq.org--2005/xetla--main--0.2--patch-5
+     steve@eicq.org--2005/xetla--main--0.2--patch-6
+     steve@eicq.org--2005/xetla--main--0.2--patch-7
+     steve@eicq.org--2005/xetla--main--0.2--version-0
+     steve@eicq.org--2005/xetla--main--1.0--base-0
+     steve@eicq.org--2005/xetla--main--1.0--patch-1
+     steve@eicq.org--2005/xetla--main--1.0--patch-2
+     steve@eicq.org--2005/xetla--main--1.0--patch-3
+     steve@eicq.org--2005/xetla--main--1.0--patch-4
+     steve@eicq.org--2005/xetla--main--1.0--patch-5
+     steve@eicq.org--2005/xetla--main--1.0--patch-6
+     steve@eicq.org--2005/xetla--main--1.0--patch-7
+     steve@eicq.org--2005/xetla--main--1.0--version-0
+
+
 # Boston, MA 02111-1307, USA.
 
 VERSION = 1.00
-AUTHOR_VERSION = steve@eicq.org--2005/xetla--main--1.0--version-0
+AUTHOR_VERSION = steve@eicq.org--2005/xetla--main--1.1--version-0
 MAINTAINER = Steve Youngs <steve@youngs.au.com>
 PACKAGE = xetla
 PKG_TYPE = regular
 
 ELCS = \
 	ewoc.elc          \
-	smerge.elc        \
 	xetla-version.elc \
 	xetla-browse.elc  \
 	xetla-core.elc    \
    priority low
    category CATEGORY
    dump nil
-   description "Frontend to GNU/arch (tla)."
+   description "(S)XEmacs Frontend to GNU/arch (tla)."
    filename FILENAME
    md5sum MD5SUM
    size SIZE
-   provides (ewoc smerge xetla-browse xetla-core
+   provides (ewoc xetla-browse xetla-core
              xetla-defs xetla-tips xetla-version xetla)
    requires (REQUIRES)
    type regular

smerge.el

-;;; smerge.el --- SAM's Merge layer on top of ediff
-
-;; Copyright (C) 2002,2003 Sean MacLennan
-;; $Revision$ $Date$
-;; XEmacs
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;; TODO:
-;;      - keymap for buffer!
-;;	- ediff needs a list of args
-;;	- add more documentation!!!
-
-;; smerge marks the file with the `smerge-merged-face' when the files
-;; are merged. In the case of "only in" files, merged means you copied
-;; the file over to the other directory. However, for ediffed files,
-;; merged means you ran ediff on the files. This does not mean the
-;; files are identical. And you are allowed to run ediff on the files
-;; again. It is really just a marker that you looked at the file.
-
-(require 'ediff)
-
-(defmacro smerge-do-in-gnu-emacs (&rest body)
-  "Execute BODY if in GNU/Emacs."
-  (unless running-xemacs `(progn ,@body)))
-(put 'smerge-do-in-gnu-emacs 'lisp-indent-hook 'defun)
-
-(defmacro smerge-do-in-xemacs (&rest body)
-  "Execute BODY if in XEmacs."
-  (when running-xemacs `(progn ,@body)))
-(put 'smerge-do-in-xemacs 'lisp-indent-hook 'defun)
-
-
-(smerge-do-in-xemacs
-  (defalias 'smerge-dirlist 'directory-files))
-
-(smerge-do-in-gnu-emacs
-  (require 'extent)
-
-  (defun smerge-dirlist (directory &optional full match nosort files-only)
-    (if (eq files-only nil)
-	(directory-files directory full match nosort)
-      (let ((rawlist (directory-files-and-attributes
-		      directory full match nosort))
-	    dirlist)
-	(setq files-only (if (eq files-only t) nil t))
-	(dolist (entry rawlist)
-	  (when (eq (nth 1 entry) files-only)
-	    (setq dirlist (cons (car entry) dirlist))))
-	dirlist)))
-
-  (defun temp-directory ()
-    (let ((tmp (getenv "TMPDIR")))
-      (if tmp tmp "/tmp")))
-
-  (defun read-directory-name (prompt &optional dir default mustmatch)
-    (let* ((dir (read-file-name prompt dir default mustmatch))
-	   (attr (file-attributes dir)))
-      (unless (eq (car attr) t) (error "Must be a directory"))
-      dir))
-
-  (defun kill-entire-line (&optional arg)
-    (let ((kill-whole-line t)) (beginning-of-line) (kill-line arg)))
-  )
-
-(defvar smerge-diff-program ediff-diff-program
-  "*Program to use to diff the directories. Must support --brief option.")
-
-(defvar smerge-diff-options ediff-diff-options "*See `ediff-diff-options'.")
-
-(defvar smerge-diff-excludes '("*.o" "*.obj" "*.a" "*.lib" "*~" ".#*" "CVS")
-  "*List of patterns of files and subdirectories to ignore.
-smerge builds a temprorary file (`smerge-exclude-file') based on this list
-and passes it to `smerge-diff-program' with the --exclude-from option.
-Note: These excludes are wildcard expressions as used by diff, not lisp
-regular expressions.")
-
-(defvar smerge-preserve-modes t
-  "*When copying files, preserver the mode of the destination file.")
-
-(defvar smerge-exclude-file (concat (temp-directory) "/smerge-excludes")
-  "*Temporary file to hold the `smerge-excludes'.")
-
-(defface smerge-only1-face
-  '((((class color))  (:foreground "purple"))
-    (t (:underline t)))
-  "Face for files/directories only in directory 1.")
-
-(defface smerge-only2-face
-  '((((class color))  (:foreground "blue"))
-    (t (:underline t)))
-  "Face for files/directories only in directory 2.")
-
-(defface smerge-diff-face
-  '((((class color))  (:foreground "red"))
-    (t (:bold t)))
-  "Face for files that are different.")
-
-(defface smerge-merged-face
-  '((((class color))  (:foreground "black"))
-    (t (:bold t)))
-  "Face for files that are merged.")
-
-
-(defvar smerge-buffer "*smerge-output*" "*Name of smerge output buffer.")
-
-(defvar smerge-keymap nil "*Keymap used by smerge.")
-
-(defvar smerge-cvsignore nil
-  "*If non-nil, use the .cvsignore files in `dir1' to ignore files.")
-
-;; For debugging
-(defvar smerge-raw-diff-output nil
-  "*If non-nil, filename to write the raw diff output to. (dbg)")
-(defvar smerge-keep-cvsignore-buffer nil
-  "*If non-nil, keep the raw cvsignore buffer. (dbg)")
-
-;; Internals
-;; SAM This should be a list?
-(defvar smerge-flags nil)
-(defvar smerge-dir1 nil)
-(defvar smerge-dir2 nil)
-(defvar smerge-file nil)
-(defvar smerge-extent nil)
-
-
-(defconst smerge-copy-menu
-  (list "Copy to ..."
-	[(concat smerge-dir1 smerge-file) (smerge-copy 1) (smerge-allow-dir 1)]
-	[(concat smerge-dir2 smerge-file) (smerge-copy 2) (smerge-allow-dir 2)]
-	))
-
-(defun smerge-init ()
-  "This creates the keymap."
-  (unless smerge-keymap
-    (setq smerge-keymap (make-sparse-keymap "smerge"))
-    (if running-xemacs
-	(progn
-	  (define-key smerge-keymap 'button1 'smerge-mousable)
-	  (define-key smerge-keymap 'button2 'smerge-mousable)
-	  (define-key smerge-keymap 'button3 'smerge-menu))
-      (define-key smerge-keymap [mouse-1] 'smerge-mousable)
-      (define-key smerge-keymap [mouse-2] 'smerge-mousable)
-      (define-key smerge-keymap [mouse-3] 'smerge-menu))
-
-    (define-key smerge-keymap "\C-m" 'smerge-ediff-or-copy)
-    (define-key smerge-keymap "g"    'smerge-reload)
-    (define-key smerge-keymap "r"    'smerge-reload)
-    (define-key smerge-keymap "n"    'smerge-next)
-    (define-key smerge-keymap "p"    'smerge-prev)
-    ))
-
-;;;###autoload
-(defun smerge (flags &optional dir1 dir2)
-  "Merge two directories recursively."
-  (interactive "p")
-  (smerge-init)
-  (unless dir1
-    (setq dir1 (read-directory-name "Directory 1: " nil nil t)))
-  (unless dir2
-    (setq dir2 (read-directory-name "Directory 2: " nil nil t)))
-  (switch-to-buffer smerge-buffer) ;; Yes I want to be in the output buffer
-  (toggle-read-only 0) ;; writable
-  (setq smerge-flags flags)
-  (setq smerge-dir1 (file-name-as-directory (expand-file-name dir1)))
-  (setq smerge-dir2 (file-name-as-directory (expand-file-name dir2)))
-  (smerge-recursive-diff)
-  (smerge-fixup-filenames)
-  (when smerge-cvsignore (smerge-cvsignore smerge-dir1))
-  (smerge-post-process flags)
-  (toggle-read-only 1) ;; read-only
-  )
-
-(defun smerge-reload ()
-  "Rediff two directories recursively."
-  (interactive)
-  (smerge smerge-flags smerge-dir1 smerge-dir2))
-
-(defun smerge-recursive-diff ()
-  (let (rc)
-    (erase-buffer)
-    (dolist (exclude smerge-diff-excludes) (insert (concat exclude "\n")))
-    (write-region (point-min) (point-max) smerge-exclude-file nil 'no-message)
-    (erase-buffer)
-    (let ((diff-options (concat "--exclude-from=" smerge-exclude-file
-			      " -r" " --brief " smerge-diff-options)))
-      ;; Since we are tightly coupled with ediff, use their program!
-      ;; This erases the diff buffer automatically.
-      (ediff-exec-process smerge-diff-program