CVS update by viteno xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/12/26 23:50:51
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1389 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1388
retrieving revision 1.1389
diff -u -p -r1.1388 -r1.1389
--- version.sh 2005/12/25 22:51:07 1.1388
+++ version.sh 2005/12/26 22:50:50 1.1389
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051225)"
+xemacs_extra_name="(+CVS-20051226)"
xemacs_release_date="2005-12-19"
- 1 participants
- 0 comments
CVS update by vins xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: vins
Date: 05/12/26 23:25:50
Branch: xemacs/src release-21-4
Modified: xemacs/src ChangeLog objects-gtk.c
Log:
Increase maximum number of fonts for GTK to INT_MAX.
Revision Changes Path
1.290.2.105 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.104
retrieving revision 1.290.2.105
diff -u -p -r1.290.2.104 -r1.290.2.105
--- ChangeLog 2005/12/24 00:52:29 1.290.2.104
+++ ChangeLog 2005/12/26 22:25:43 1.290.2.105
＠＠ -1,3 +1,8 ＠＠
+2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * objects-gtk.c (MAX_FONT_COUNT): Increase MAX_FONT_COUNT from
+ 5000 to INT_MAX.
+
2005-12-05 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
* database.c: Suppress compiler warning under Cygwin.
1.2.2.1 +2 -2 XEmacs/xemacs/src/objects-gtk.c
Index: objects-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-gtk.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -p -r1.2 -r1.2.2.1
--- objects-gtk.c 2001/04/12 18:24:08 1.2
+++ objects-gtk.c 2005/12/26 22:25:46 1.2.2.1
＠＠ -481,7 +481,7 ＠＠ vars_of_objects_gtk (void)
#include <X11/Xatom.h>
/* Unbounded, for sufficiently small values of infinity... */
-#define MAX_FONT_COUNT 5000
+#define MAX_FONT_COUNT INT_MAX
#ifdef MULE
/* find a font spec that matches font spec FONT and also matches
＠＠ -529,7 +529,7 ＠＠ gtk_find_charset_font (Lisp_Object devic
#endif /* MULE */
/* Unbounded, for sufficiently small values of infinity... */
-#define MAX_FONT_COUNT 5000
+#define MAX_FONT_COUNT INT_MAX
static int
valid_font_name_p (Display *dpy, char *name)
- 1 participants
- 0 comments
CVS update by michaels packages/xemacs-packages/w3/lisp ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: michaels
Date: 05/12/26 14:47:36
Modified: packages/xemacs-packages/w3/lisp css.el
Log:
2003-09-08 Mike Sperber <sperber(a)informatik.uni-tuebingen.de>
* lisp/css.el (css-parse): Set `buffer-file-name' to nil after
reading stylesheet, to avoid spurious requests for saving the
file.
Revision Changes Path
1.46 +6 -0 XEmacs/packages/xemacs-packages/w3/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/w3/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ChangeLog 2005/05/10 05:54:08 1.45
+++ ChangeLog 2005/12/26 13:47:33 1.46
＠＠ -1,3 +1,9 ＠＠
+2003-09-08 Mike Sperber <sperber(a)informatik.uni-tuebingen.de>
+
+ * lisp/css.el (css-parse): Set `buffer-file-name' to nil after
+ reading stylesheet, to avoid spurious requests for saving the
+ file.
+
2005-05-10 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.31 released.
1.6 +1 -0 XEmacs/packages/xemacs-packages/w3/lisp/css.el
Index: css.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/w3/lisp/css.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- css.el 1999/11/27 15:37:18 1.5
+++ css.el 2005/12/26 13:47:35 1.6
＠＠ -929,6 +929,7 ＠＠ For a terminal frame, the value is alway
(set-syntax-table css-syntax-table)
(erase-buffer)
(if url (url-insert-file-contents url))
+ (setq buffer-file-name nil)
(goto-char (point-max))
(if string (insert string))
(css-clean-buffer)
- 1 participants
- 0 comments
CVS update by scop packages/unsupported/scop/generic-modes, generic-x.el ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: scop
Date: 05/12/26 11:54:21
Modified: packages/unsupported/scop/generic-modes ChangeLog
generic-x.el
Log:
No min-colors specifier in XEmacs.
Revision Changes Path
1.53 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- STATUS 2005/12/26 10:50:23 1.52
+++ STATUS 2005/12/26 10:54:19 1.53
＠＠ -13,7 +13,7 ＠＠ ede: Emacs Development Environment, <htt
- Compiles, I have no idea whether it works or not.
generic-modes: generic.el and generic-x.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2005-10-08.
+- Up to date with GNU Emacs CVS HEAD as of 2005-12-26.
- Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
vc: vc*.el and a few other related files from GNU Emacs
1.9 +5 -0 XEmacs/packages/unsupported/scop/generic-modes/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/generic-modes/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ChangeLog 2005/10/08 15:07:42 1.8
+++ ChangeLog 2005/12/26 10:54:21 1.9
＠＠ -1,3 +1,8 ＠＠
+2005-12-26 Ville Skyttä <scop(a)xemacs.org>
+
+ * generic-x.el (show-tabs-tab): No `min-colors' specifier in XEmacs.
+ (show-tabs-space): Ditto.
+
2005-10-08 Ville Skyttä <scop(a)xemacs.org>
* generic.el, generic-x.el: Sync with upstream.
1.7 +4 -2 XEmacs/packages/unsupported/scop/generic-modes/generic-x.el
Index: generic-x.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/generic-modes/generic-x.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- generic-x.el 2005/10/08 15:07:42 1.6
+++ generic-x.el 2005/12/26 10:54:21 1.7
＠＠ -1771,7 +1771,8 ＠＠ like an INI file. You can add this hook
;; XEmacs change: s/:weight bold/:bold t/
'((((class grayscale) (background light)) (:background "DimGray" :bold t))
(((class grayscale) (background dark)) (:background "LightGray" :bold t))
- (((class color) (min-colors 88)) (:background "red1"))
+ ;; XEmacs change: we don't have `min-colors'
+ ;(((class color) (min-colors 88)) (:background "red1"))
(((class color)) (:background "red"))
(t (:bold t)))
"Font Lock mode face used to highlight TABs."
＠＠ -1783,7 +1784,8 ＠＠ like an INI file. You can add this hook
;; XEmacs change: s/:weight bold/:bold t/
'((((class grayscale) (background light)) (:background "DimGray" :bold t))
(((class grayscale) (background dark)) (:background "LightGray" :bold t))
- (((class color) (min-colors 88)) (:background "yellow1"))
+ ;; XEmacs change: we don't have `min-colors'
+ ;(((class color) (min-colors 88)) (:background "yellow1"))
(((class color)) (:background "yellow"))
(t (:bold t)))
"Font Lock mode face used to highlight spaces."
- 1 participants
- 0 comments
CVS update by scop packages/unsupported/scop/vc, vc.el ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: scop
Date: 05/12/26 11:50:28
Modified: packages/unsupported/scop/vc ChangeLog vc-mcvs.el vc-svn.el
vc.el
Log:
Sync vc with upstream.
Revision Changes Path
1.52 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- STATUS 2005/12/05 10:37:53 1.51
+++ STATUS 2005/12/26 10:50:23 1.52
＠＠ -17,5 +17,5 ＠＠ generic-modes: generic.el and generic-x.
- Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
vc: vc*.el and a few other related files from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2005-12-05.
+- Up to date with GNU Emacs CVS HEAD as of 2005-12-26.
- Compiles, something even works.
1.39 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ChangeLog 2005/12/05 11:26:28 1.38
+++ ChangeLog 2005/12/26 10:50:26 1.39
＠＠ -1,3 +1,7 ＠＠
+2005-12-26 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc.el, vc-mcvs.el, vc-svn.el: Sync with upstream.
+
2005-12-05 Ville Skyttä <scop(a)xemacs.org>
* log-edit.el: Sync with upstream.
1.10 +1 -1 XEmacs/packages/unsupported/scop/vc/vc-mcvs.el
Index: vc-mcvs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-mcvs.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- vc-mcvs.el 2005/10/08 13:35:00 1.9
+++ vc-mcvs.el 2005/12/26 10:50:26 1.10
＠＠ -354,7 +354,7 ＠＠ the Meta-CVS command (in that order)."
(defun vc-mcvs-revert (file &optional contents-done)
"Revert FILE to the version it was based on."
- (vc-default-revert file contents-done)
+ (vc-default-revert 'MCVS file contents-done)
(unless (eq (vc-checkout-model file) 'implicit)
(if vc-mcvs-use-edit
(vc-mcvs-command nil 0 file "unedit")
1.13 +13 -9 XEmacs/packages/unsupported/scop/vc/vc-svn.el
Index: vc-svn.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-svn.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- vc-svn.el 2005/11/14 22:32:27 1.12
+++ vc-svn.el 2005/12/26 10:50:26 1.13
＠＠ -115,15 +115,19 ＠＠ This is only meaningful if you don't use
(file-name-directory file)))
(with-temp-buffer
(cd (file-name-directory file))
- (condition-case nil
- (vc-svn-command t 0 file "status" "-v")
- ;; Some problem happened. E.g. We can't find an `svn' executable.
- ;; We used to only catch `file-error' but when the process is run on
- ;; a remote host via Tramp, the error is only reported via the
- ;; exit status which is turned into an `error' by vc-do-command.
- (error nil))
- (vc-svn-parse-status t)
- (eq 'SVN (vc-file-getprop file 'vc-backend)))))
+ (let ((status
+ (condition-case nil
+ ;; Ignore all errors.
+ (vc-svn-command t t file "status" "-v")
+ ;; Some problem happened. E.g. We can't find an `svn'
+ ;; executable. We used to only catch `file-error' but when
+ ;; the process is run on a remote host via Tramp, the error
+ ;; is only reported via the exit status which is turned into
+ ;; an `error' by vc-do-command.
+ (error nil))))
+ (when (eq 0 status)
+ (vc-svn-parse-status t)
+ (eq 'SVN (vc-file-getprop file 'vc-backend)))))))
(defun vc-svn-state (file &optional localp)
"SVN-specific version of `vc-state'."
1.21 +166 -182 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- vc.el 2005/11/02 19:03:11 1.20
+++ vc.el 2005/12/26 10:50:26 1.21
＠＠ -473,12 +473,12 ＠＠
:group 'tools)
(defcustom vc-suppress-confirm nil
- "*If non-nil, treat user as expert; suppress yes-no prompts on some things."
+ "If non-nil, treat user as expert; suppress yes-no prompts on some things."
:type 'boolean
:group 'vc)
(defcustom vc-delete-logbuf-window t
- "*If non-nil, delete the *VC-log* buffer and window after each logical action.
+ "If non-nil, delete the *VC-log* buffer and window after each logical action.
If nil, bury that buffer instead.
This is most useful if you have multiple windows on a frame and would like to
preserve the setting."
＠＠ -486,12 +486,12 ＠＠ preserve the setting."
:group 'vc)
(defcustom vc-initial-comment nil
- "*If non-nil, prompt for initial comment when a file is registered."
+ "If non-nil, prompt for initial comment when a file is registered."
:type 'boolean
:group 'vc)
(defcustom vc-default-init-version "1.1"
- "*A string used as the default version number when a new file is registered.
+ "A string used as the default version number when a new file is registered.
This can be overridden by giving a prefix argument to \\[vc-register]. This
can also be overridden by a particular VC backend."
:type 'string
＠＠ -499,12 +499,12 ＠＠ can also be overridden by a particular V
:version "20.3")
(defcustom vc-command-messages nil
- "*If non-nil, display run messages from back-end commands."
+ "If non-nil, display run messages from back-end commands."
:type 'boolean
:group 'vc)
(defcustom vc-checkin-switches nil
- "*A string or list of strings specifying extra switches for checkin.
+ "A string or list of strings specifying extra switches for checkin.
These are passed to the checkin program by \\[vc-checkin]."
:type '(choice (const :tag "None" nil)
(string :tag "Argument String")
＠＠ -514,7 +514,7 ＠＠ These are passed to the checkin program
:group 'vc)
(defcustom vc-checkout-switches nil
- "*A string or list of strings specifying extra switches for checkout.
+ "A string or list of strings specifying extra switches for checkout.
These are passed to the checkout program by \\[vc-checkout]."
:type '(choice (const :tag "None" nil)
(string :tag "Argument String")
＠＠ -524,7 +524,7 ＠＠ These are passed to the checkout program
:group 'vc)
(defcustom vc-register-switches nil
- "*A string or list of strings; extra switches for registering a file.
+ "A string or list of strings; extra switches for registering a file.
These are passed to the checkin program by \\[vc-register]."
:type '(choice (const :tag "None" nil)
(string :tag "Argument String")
＠＠ -534,30 +534,30 ＠＠ These are passed to the checkin program
:group 'vc)
(defcustom vc-dired-listing-switches "-al"
- "*Switches passed to `ls' for vc-dired. MUST contain the `l' option."
+ "Switches passed to `ls' for vc-dired. MUST contain the `l' option."
:type 'string
:group 'vc
:version "21.1")
(defcustom vc-dired-recurse t
- "*If non-nil, show directory trees recursively in VC Dired."
+ "If non-nil, show directory trees recursively in VC Dired."
:type 'boolean
:group 'vc
:version "20.3")
(defcustom vc-dired-terse-display t
- "*If non-nil, show only locked files in VC Dired."
+ "If non-nil, show only locked files in VC Dired."
:type 'boolean
:group 'vc
:version "20.3")
(defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" "{arch}")
- "*List of directory names to be ignored when walking directory trees."
+ "List of directory names to be ignored when walking directory trees."
:type '(repeat string)
:group 'vc)
(defcustom vc-diff-switches nil
- "*A string or list of strings specifying switches for diff under VC.
+ "A string or list of strings specifying switches for diff under VC.
When running diff under a given BACKEND, VC concatenates the values of
`diff-switches', `vc-diff-switches', and `vc-BACKEND-diff-switches' to
get the switches for that command. Thus, `vc-diff-switches' should
＠＠ -572,7 +572,7 ＠＠ specific to any particular backend."
:version "21.1")
(defcustom vc-allow-async-revert nil
- "*Specifies whether the diff during \\[vc-revert-buffer] may be asynchronous.
+ "Specifies whether the diff during \\[vc-revert-buffer] may be asynchronous.
Enabling this option means that you can confirm a revert operation even
if the local changes in the file have not been found and displayed yet."
:type '(choice (const :tag "No" nil)
＠＠ -582,7 +582,7 ＠＠ if the local changes in the file have no
;;;###autoload
(defcustom vc-checkout-hook nil
- "*Normal hook (list of functions) run after checking out a file.
+ "Normal hook (list of functions) run after checking out a file.
See `run-hooks'."
:type 'hook
:group 'vc
＠＠ -599,7 +599,7 ＠＠ See `run-hooks'."
;;;###autoload
(defcustom vc-checkin-hook nil
- "*Normal hook (list of functions) run after a checkin is done.
+ "Normal hook (list of functions) run after a checkin is done.
See also `log-edit-done-hook'."
:type 'hook
:options '(log-edit-comment-to-change-log)
＠＠ -607,13 +607,13 ＠＠ See also `log-edit-done-hook'."
;;;###autoload
(defcustom vc-before-checkin-hook nil
- "*Normal hook (list of functions) run before a file is checked in.
+ "Normal hook (list of functions) run before a file is checked in.
See `run-hooks'."
:type 'hook
:group 'vc)
(defcustom vc-logentry-check-hook nil
- "*Normal hook run by `vc-backend-logentry-check'.
+ "Normal hook run by `vc-backend-logentry-check'.
Use this to impose your own rules on the entry in addition to any the
version control backend imposes itself."
:type 'hook
＠＠ -638,25 +638,25 ＠＠ version control backend imposes itself."
(300. . "#00CCFF")
(320. . "#00CC99")
(340. . "#0099FF"))
- "*Association list of age versus color, for \\[vc-annotate].
+ "Association list of age versus color, for \\[vc-annotate].
Ages are given in units of fractional days. Default is eighteen steps
using a twenty day increment."
:type 'alist
:group 'vc)
(defcustom vc-annotate-very-old-color "#0046FF"
- "*Color for lines older than the current color range in \\[vc-annotate]]."
+ "Color for lines older than the current color range in \\[vc-annotate]]."
:type 'string
:group 'vc)
(defcustom vc-annotate-background "black"
- "*Background color for \\[vc-annotate].
+ "Background color for \\[vc-annotate].
Default color is used if nil."
:type 'string
:group 'vc)
(defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01)
- "*Menu elements for the mode-specific menu of VC-Annotate mode.
+ "Menu elements for the mode-specific menu of VC-Annotate mode.
List of factors, used to expand/compress the time scale. See `vc-annotate'."
:type '(repeat number)
:group 'vc)
＠＠ -664,24 +664,23 ＠＠ List of factors, used to expand/compress
(defvar vc-annotate-mode-map
(let ((m (make-sparse-keymap)))
(define-key m [menu-bar] (make-sparse-keymap "VC-Annotate"))
+ (define-key m "A" 'vc-annotate-revision-previous-to-line)
+ (define-key m "D" 'vc-annotate-show-diff-revision-at-line)
+ (define-key m "J" 'vc-annotate-revision-at-line)
+ (define-key m "L" 'vc-annotate-show-log-revision-at-line)
+ (define-key m "N" 'vc-annotate-next-version)
+ (define-key m "P" 'vc-annotate-prev-version)
+ (define-key m "W" 'vc-annotate-workfile-version)
m)
"Local keymap used for VC-Annotate mode.")
-(define-key vc-annotate-mode-map "A" 'vc-annotate-revision-previous-to-line)
-(define-key vc-annotate-mode-map "D" 'vc-annotate-show-diff-revision-at-line)
-(define-key vc-annotate-mode-map "J" 'vc-annotate-revision-at-line)
-(define-key vc-annotate-mode-map "L" 'vc-annotate-show-log-revision-at-line)
-(define-key vc-annotate-mode-map "N" 'vc-annotate-next-version)
-(define-key vc-annotate-mode-map "P" 'vc-annotate-prev-version)
-(define-key vc-annotate-mode-map "W" 'vc-annotate-workfile-version)
-
(defvar vc-annotate-mode-menu nil
"Local keymap used for VC-Annotate mode's menu bar menu.")
;; Header-insertion hair
(defcustom vc-static-header-alist
- '(("\\.c$" .
+ '(("\\.c\\'" .
"\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
"*Associate static header string templates with file types.
A \%s in the template is replaced with the first string associated with
＠＠ -717,9 +716,7 ＠＠ and that its contents match what the mas
;; Variables the user doesn't need to know about.
(defvar vc-log-operation nil)
(defvar vc-log-after-operation-hook nil)
-(defvar vc-annotate-buffers nil
- "Alist of current \"Annotate\" buffers and their corresponding backends.
-The keys are \(BUFFER . BACKEND\). See also `vc-annotate-get-backend'.")
+
;; In a log entry buffer, this is a local variable
;; that points to the buffer for which it was made
;; (either a file, or a VC dired buffer).
＠＠ -766,7 +763,7 ＠＠ in their implementation of vc-BACKEND-di
(defun vc-default-previous-version (backend file rev)
"Return the version number immediately preceding REV for FILE,
or nil if there is no previous version. This default
-implementation works for <major>.<minor>-style version numbers as
+implementation works for MAJOR.MINOR-style version numbers as
used by RCS and CVS."
(let ((branch (vc-branch-part rev))
(minor-num (string-to-number (vc-minor-part rev))))
＠＠ -785,7 +782,7 ＠＠ used by RCS and CVS."
(defun vc-default-next-version (backend file rev)
"Return the version number immediately following REV for FILE,
or nil if there is no next version. This default implementation
-works for <major>.<minor>-style version numbers as used by RCS
+works for MAJOR.MINOR-style version numbers as used by RCS
and CVS."
(when (not (string= rev (vc-workfile-version file)))
(let ((branch (vc-branch-part rev))
＠＠ -934,8 +931,9 ＠＠ Output from COMMAND goes to BUFFER, or *
current buffer if BUFFER is t. If the destination buffer is not
already current, set it up properly and erase it. The command is
considered successful if its exit status does not exceed OKSTATUS (if
-OKSTATUS is nil, that means to ignore errors, if it is 'async, that
-means not to wait for termination of the subprocess). FILE is the
+OKSTATUS is nil, that means to ignore error status, if it is `async', that
+means not to wait for termination of the subprocess; if it is t it means to
+ignore all execution errors). FILE is the
name of the working file (may also be nil, to execute commands that
don't expect a file name). If an optional list of FLAGS is present,
that is inserted into the command line before the filename."
＠＠ -981,7 +979,9 ＠＠ that is inserted into the command line b
(message "Running %s in the background... done" ',command))))
;; XEmacs: we don't have process-file, use call-process instead.
(setq status (apply 'call-process command nil t nil squeezed))
- (when (or (not (integerp status)) (and okstatus (< okstatus status)))
+ (when (and (not (eq t okstatus))
+ (or (not (integerp status))
+ (and okstatus (< okstatus status))))
(pop-to-buffer (current-buffer))
(goto-char (point-min))
(shrink-window-if-larger-than-buffer)
＠＠ -1375,6 +1375,8 ＠＠ merge in the changes into your working c
;; These functions help the vc-next-action entry point
+(defun vc-default-init-version (backend) vc-default-init-version)
+
;;;###autoload
(defun vc-register (&optional set-version comment)
"Register the current file into a version control system.
＠＠ -1406,10 +1408,8 ＠＠ first backend that could register the fi
(if set-version
(read-string (format "Initial version level for %s: "
(buffer-name)))
- (let ((backend (vc-responsible-backend buffer-file-name)))
- (if (vc-find-backend-function backend 'init-version)
- (vc-call-backend backend 'init-version)
- vc-default-init-version)))
+ (vc-call-backend (vc-responsible-backend buffer-file-name)
+ 'init-version))
(or comment (not vc-initial-comment))
nil
"Enter initial comment."
＠＠ -1949,24 +1949,19 ＠＠ the variable `vc-BACKEND-header'."
(widen)
(if (or (not (vc-check-headers))
(y-or-n-p "Version headers already exist. Insert another set? "))
- (progn
- (let* ((delims (cdr (assq major-mode vc-comment-alist)))
- (comment-start-vc (or (car delims) comment-start "#"))
- (comment-end-vc (or (car (cdr delims)) comment-end ""))
- (hdsym (vc-make-backend-sym (vc-backend buffer-file-name)
- 'header))
- (hdstrings (and (boundp hdsym) (symbol-value hdsym))))
- (mapcar (lambda (s)
- (insert comment-start-vc "\t" s "\t"
- comment-end-vc "\n"))
- hdstrings)
- (if vc-static-header-alist
- (mapcar (lambda (f)
- (if (string-match (car f) buffer-file-name)
- (insert (format (cdr f) (car hdstrings)))))
- vc-static-header-alist))
- )
- )))))
+ (let* ((delims (cdr (assq major-mode vc-comment-alist)))
+ (comment-start-vc (or (car delims) comment-start "#"))
+ (comment-end-vc (or (car (cdr delims)) comment-end ""))
+ (hdsym (vc-make-backend-sym (vc-backend buffer-file-name)
+ 'header))
+ (hdstrings (and (boundp hdsym) (symbol-value hdsym))))
+ (dolist (s hdstrings)
+ (insert comment-start-vc "\t" s "\t"
+ comment-end-vc "\n"))
+ (if vc-static-header-alist
+ (dolist (f vc-static-header-alist)
+ (if (string-match (car f) buffer-file-name)
+ (insert (format (cdr f) (car hdstrings)))))))))))
(defun vc-clear-headers (&optional file)
"Clear all version headers in the current buffer (or FILE).
＠＠ -2543,6 +2538,33 ＠＠ return its name; otherwise return nil."
(if (file-exists-p backup-file)
backup-file)))))
+(defun vc-default-revert (backend file contents-done)
+ (unless contents-done
+ (let ((rev (vc-workfile-version file))
+ (file-buffer (or (get-file-buffer file) (current-buffer))))
+ (message "Checking out %s..." file)
+ (let ((failed t)
+ (backup-name (car (find-backup-file-name file))))
+ (when backup-name
+ (copy-file file backup-name 'ok-if-already-exists 'keep-date)
+ (unless (file-writable-p file)
+ (set-file-modes file (logior (file-modes file) 128))))
+ (unwind-protect
+ (let ((coding-system-for-read 'no-conversion)
+ (coding-system-for-write 'no-conversion))
+ (with-temp-file file
+ (let ((outbuf (current-buffer)))
+ ;; Change buffer to get local value of vc-checkout-switches.
+ (with-current-buffer file-buffer
+ (let ((default-directory (file-name-directory file)))
+ (vc-call find-version file rev outbuf)))))
+ (setq failed nil))
+ (when backup-name
+ (if failed
+ (rename-file backup-name file 'ok-if-already-exists)
+ (and (not vc-make-backup-files) (delete-file backup-name))))))
+ (message "Checking out %s...done" file))))
+
(defun vc-revert-file (file)
"Revert FILE back to the version it was based on."
(with-vc-properties
＠＠ -2884,8 +2906,7 ＠＠ Uses `rcs2log' which only works for RCS
(concat odefault f))))
files)))
"done"
- (pop-to-buffer
- (set-buffer (get-buffer-create "*vc*")))
+ (pop-to-buffer (get-buffer-create "*vc*"))
(erase-buffer)
(insert-file-contents tempfile)
"failed"))
＠＠ -2900,9 +2921,9 ＠＠ Uses `rcs2log' which only works for RCS
;; annotate-mode, which replaces it with the more sensible "span-to
;; days", along with autoscaling support.
(defvar vc-annotate-ratio nil "Global variable.")
-(defvar vc-annotate-backend nil "Global variable.")
;; internal buffer-local variables
+(defvar vc-annotate-backend nil)
(defvar vc-annotate-parent-file nil)
(defvar vc-annotate-parent-rev nil)
(defvar vc-annotate-parent-display-mode nil)
＠＠ -2911,12 +2932,6 ＠＠ Uses `rcs2log' which only works for RCS
;; The fontification is done by vc-annotate-lines instead of font-lock.
'((vc-annotate-lines)))
-(defun vc-annotate-get-backend (buffer)
- "Return the backend matching \"Annotate\" buffer BUFFER.
-Return nil if no match made. Associations are made based on
-`vc-annotate-buffers'."
- (cdr (assoc buffer vc-annotate-buffers)))
-
(define-derived-mode vc-annotate-mode fundamental-mode "Annotate"
"Major mode for output buffers of the `vc-annotate' command.
＠＠ -2926,8 +2941,7 ＠＠ menu items."
(set (make-local-variable 'truncate-lines) t)
(set (make-local-variable 'font-lock-defaults)
'(vc-annotate-font-lock-keywords t))
- (view-mode 1)
- (vc-annotate-add-menu))
+ (view-mode 1))
(defun vc-annotate-display-default (&optional ratio)
"Display the output of \\[vc-annotate] using the default color range.
＠＠ -2939,6 +2953,10 ＠＠ if present. The current time is used as
(if ratio (vc-annotate-time-span vc-annotate-color-map ratio)))
(message "Redisplaying annotation...done"))
+(defun vc-annotate-car-last-cons (a-list)
+ "Return car of last cons in association list A-LIST."
+ (caar (last a-list)))
+
(defun vc-annotate-display-autoscale (&optional full)
"Highlight the output of \\[vc-annotate] using an autoscaled color map.
Autoscaling means that the map is scaled from the current time to the
＠＠ -2974,70 +2992,48 ＠＠ cover the range from the oldest annotati
(format "Spanned to %.1f days old" (- current oldest))))))
;; Menu -- Using easymenu.el
-(defun vc-annotate-add-menu ()
- "Add the menu 'Annotate' to the menu bar in VC-Annotate mode."
- (let ((menu-elements vc-annotate-menu-elements)
- (menu-def
- '("VC-Annotate"
- ["Default" (unless (null vc-annotate-display-mode)
- (setq vc-annotate-display-mode nil)
- (vc-annotate-display-select))
- :style toggle :selected (null vc-annotate-display-mode)]))
- (oldest-in-map (vc-annotate-car-last-cons vc-annotate-color-map)))
- (while menu-elements
- (let* ((element (car menu-elements))
- (days (* element oldest-in-map)))
- (setq menu-elements (cdr menu-elements))
- (setq menu-def
- (append menu-def
- `([,(format "Span %.1f days" days)
- (unless (and (numberp vc-annotate-display-mode)
- (= vc-annotate-display-mode ,days))
- (vc-annotate-display-select nil ,days))
- :style toggle :selected
- (and (numberp vc-annotate-display-mode)
- (= vc-annotate-display-mode ,days)) ])))))
- (setq menu-def
- (append menu-def
- (list
- ["Span ..."
- (let ((days
- (float (string-to-number
- (read-string "Span how many days? ")))))
- (vc-annotate-display-select nil days)) t])
- (list "--")
- (list
- ["Span to Oldest"
- (unless (eq vc-annotate-display-mode 'scale)
- (vc-annotate-display-select nil 'scale))
- :style toggle :selected
- (eq vc-annotate-display-mode 'scale)])
- (list
- ["Span Oldest->Newest"
- (unless (eq vc-annotate-display-mode 'fullscale)
- (vc-annotate-display-select nil 'fullscale))
- :style toggle :selected
- (eq vc-annotate-display-mode 'fullscale)])
- (list "--")
- (list ["Annotate previous revision"
- (call-interactively 'vc-annotate-prev-version)])
- (list ["Annotate next revision"
- (call-interactively 'vc-annotate-next-version)])
- (list ["Annotate revision at line"
- (vc-annotate-revision-at-line)])
- (list ["Annotate revision previous to line"
- (vc-annotate-revision-previous-to-line)])
- (list ["Annotate latest revision"
- (vc-annotate-workfile-version)])
- (list ["Show log of revision at line"
- (vc-annotate-show-log-revision-at-line)])
- (list ["Show diff of revision at line"
- (vc-annotate-show-diff-revision-at-line)])))
-
- ;; Define the menu
- (if (or (featurep 'easymenu) (load "easymenu" t))
- (easy-menu-define vc-annotate-mode-menu vc-annotate-mode-map
- "VC Annotate Display Menu" menu-def))))
+(easy-menu-define vc-annotate-mode-menu vc-annotate-mode-map
+ "VC Annotate Display Menu"
+ `("VC-Annotate"
+ ["Default" (unless (null vc-annotate-display-mode)
+ (setq vc-annotate-display-mode nil)
+ (vc-annotate-display-select))
+:style toggle :selected (null vc-annotate-display-mode)]
+ ,＠(let ((oldest-in-map (vc-annotate-car-last-cons vc-annotate-color-map)))
+ (mapcar (lambda (element)
+ (let ((days (* element oldest-in-map)))
+ `([,(format "Span %.1f days" days)
+ (unless (and (numberp vc-annotate-display-mode)
+ (= vc-annotate-display-mode ,days))
+ (vc-annotate-display-select nil ,days))
+:style toggle :selected
+ (and (numberp vc-annotate-display-mode)
+ (= vc-annotate-display-mode ,days)) ])))
+ vc-annotate-menu-elements))
+ ["Span ..."
+ (let ((days
+ (float (string-to-number
+ (read-string "Span how many days? ")))))
+ (vc-annotate-display-select nil days)) t]
+ "--"
+ ["Span to Oldest"
+ (unless (eq vc-annotate-display-mode 'scale)
+ (vc-annotate-display-select nil 'scale))
+:style toggle :selected
+ (eq vc-annotate-display-mode 'scale)]
+ ["Span Oldest->Newest"
+ (unless (eq vc-annotate-display-mode 'fullscale)
+ (vc-annotate-display-select nil 'fullscale))
+:style toggle :selected
+ (eq vc-annotate-display-mode 'fullscale)]
+ "--"
+ ["Annotate previous revision" vc-annotate-prev-version]
+ ["Annotate next revision" vc-annotate-next-version]
+ ["Annotate revision at line" vc-annotate-revision-at-line]
+ ["Annotate revision previous to line" vc-annotate-revision-previous-to-line]
+ ["Annotate latest revision" vc-annotate-workfile-version]
+ ["Show log of revision at line" vc-annotate-show-log-revision-at-line]
+ ["Show diff of revision at line" vc-annotate-show-diff-revision-at-line]))
(defun vc-annotate-display-select (&optional buffer mode)
"Highlight the output of \\[vc-annotate].
＠＠ -3070,7 +3066,7 ＠＠ use; you may override this using the sec
;;;; the contents in BUFFER.
;;;###autoload
-(defun vc-annotate (prefix &optional revision display-mode)
+(defun vc-annotate (file rev &optional display-mode buf)
"Display the edit history of the current file using colors.
This command creates a buffer that shows, for each line of the current
＠＠ -3095,48 +3091,44 ＠＠ Customization variables:
mode-specific menu. `vc-annotate-color-map' and
`vc-annotate-very-old-color' defines the mapping of time to
colors. `vc-annotate-background' specifies the background color."
- (interactive "P")
+ (interactive
+ (save-current-buffer
+ (vc-ensure-vc-buffer)
+ (list buffer-file-name
+ (let ((def (vc-workfile-version buffer-file-name)))
+ (if (null current-prefix-arg) def
+ (read-string
+ (format "Annotate from version (default %s): " def)
+ nil nil def)))
+ (if (null current-prefix-arg)
+ vc-annotate-display-mode
+ (float (string-to-number
+ (read-string "Annotate span days (default 20): "
+ nil nil "20")))))))
(vc-ensure-vc-buffer)
- (let* ((temp-buffer-name nil)
- (temp-buffer-show-function 'vc-annotate-display-select)
- (rev (or revision (vc-workfile-version buffer-file-name)))
- (bfn buffer-file-name)
- (vc-annotate-version
- (if prefix (read-string
- (format "Annotate from version (default %s): " rev)
- nil nil rev)
- rev)))
- (if display-mode
- (setq vc-annotate-display-mode display-mode)
- (if prefix
- (setq vc-annotate-display-mode
- (float (string-to-number
- (read-string "Annotate span days (default 20): "
- nil nil "20"))))))
- (setq temp-buffer-name (format "*Annotate %s (rev %s)*"
- (buffer-name) vc-annotate-version))
- (setq vc-annotate-backend (vc-backend buffer-file-name))
+ (setq vc-annotate-display-mode display-mode) ;Not sure why. --Stef
+ (let* ((temp-buffer-name (format "*Annotate %s (rev %s)*" (buffer-name) rev))
+ (temp-buffer-show-function 'vc-annotate-display-select))
(message "Annotating...")
+ ;; If BUF is specified it tells in which buffer we should put the
+ ;; annotations. This is used when switching annotations to another
+ ;; revision, so we should update the buffer's name.
+ (if buf (with-current-buffer buf
+ (rename-buffer temp-buffer-name t)
+ ;; In case it had to be uniquified.
+ (setq temp-buffer-name (buffer-name))))
(if (not (vc-find-backend-function vc-annotate-backend 'annotate-command))
(error "Sorry, annotating is not implemented for %s"
vc-annotate-backend))
(with-output-to-temp-buffer temp-buffer-name
- (vc-call-backend vc-annotate-backend 'annotate-command
- buffer-file-name
- (get-buffer temp-buffer-name)
- vc-annotate-version))
- (save-excursion
- (set-buffer temp-buffer-name)
- (set (make-local-variable 'vc-annotate-parent-file) bfn)
- (set (make-local-variable 'vc-annotate-parent-rev) vc-annotate-version)
+ (vc-call annotate-command file (get-buffer temp-buffer-name) rev))
+ (with-current-buffer temp-buffer-name
+ (set (make-local-variable 'vc-annotate-backend) (vc-backend file))
+ (set (make-local-variable 'vc-annotate-parent-file) file)
+ (set (make-local-variable 'vc-annotate-parent-rev) rev)
(set (make-local-variable 'vc-annotate-parent-display-mode)
- vc-annotate-display-mode))
+ display-mode))
- ;; Don't use the temp-buffer-name until the buffer is created
- ;; (only after `with-output-to-temp-buffer'.)
- (setq vc-annotate-buffers
- (append vc-annotate-buffers
- (list (cons (get-buffer temp-buffer-name) vc-annotate-backend))))
(message "Annotating... done")))
(defun vc-annotate-prev-version (prefix)
＠＠ -3261,21 +3253,13 ＠＠ revision."
((stringp revspec) (setq newrev revspec))
(t (error "Invalid argument to vc-annotate-warp-version")))
(when newrev
- (save-window-excursion
- (find-file vc-annotate-parent-file)
- (vc-annotate nil newrev vc-annotate-parent-display-mode))
- (kill-buffer (current-buffer)) ;; kill the buffer we started from
- (switch-to-buffer (car (car (last vc-annotate-buffers))))
+ (vc-annotate vc-annotate-parent-file newrev
+ vc-annotate-parent-display-mode
+ (current-buffer))
(goto-line (min oldline (progn (goto-char (point-max))
;; XEmacs: previous-line needs 1 arg
(previous-line 1)
(line-number-at-pos))))))))
-
-(defun vc-annotate-car-last-cons (a-list)
- "Return car of last cons in association list A-LIST."
- (if (not (eq nil (cdr a-list)))
- (vc-annotate-car-last-cons (cdr a-list))
- (car (car a-list))))
(defun vc-annotate-time-span (a-list span &optional quantize)
"Apply factor SPAN to the time-span of association list A-LIST.
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/12/25 23:51:08
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1388 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1387
retrieving revision 1.1388
diff -u -p -r1.1387 -r1.1388
--- version.sh 2005/12/24 22:50:54 1.1387
+++ version.sh 2005/12/25 22:51:07 1.1388
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051224)"
+xemacs_extra_name="(+CVS-20051225)"
xemacs_release_date="2005-12-19"
- 1 participants
- 0 comments
CVS update by aidan xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: aidan
Date: 05/12/25 12:21:48
Modified: xemacs/src ChangeLog alloc.c
Log:
Revert the alloc warning bugfix
Revision Changes Path
1.916 +9 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -p -r1.915 -r1.916
--- ChangeLog 2005/12/24 22:31:52 1.915
+++ ChangeLog 2005/12/25 11:21:45 1.916
＠＠ -1,3 +1,12 ＠＠
+2005-12-25 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * alloc.c:
+ * alloc.c (malloc_warning):
+ * alloc.c (MALLOC_BEGIN):
+ * alloc.c (FREE_OR_REALLOC_BEGIN):
+ Revert the alloc warning bugfix, in response to Stephen's mail
+ 87acepzl6e.fsf(a)tleepslib.sk.tsukuba.ac.jp .
+
2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
* objects-x.c (x_font_instance_truename):
1.122 +18 -28 XEmacs/xemacs/src/alloc.c
Index: alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- alloc.c 2005/12/24 19:06:05 1.121
+++ alloc.c 2005/12/25 11:21:46 1.122
＠＠ -231,6 +231,22 ＠＠ release_breathing_space (void)
}
#endif /* not MC_ALLOC */
+/* malloc calls this if it finds we are near exhausting storage */
+void
+malloc_warning (const char *str)
+{
+ if (ignore_malloc_warnings)
+ return;
+
+ warn_when_safe
+ (Qmemory, Qemergency,
+ "%s\n"
+ "Killing some buffers may delay running out of memory.\n"
+ "However, certainly by the time you receive the 95%% warning,\n"
+ "you should clean up, kill this Emacs, and start a new one.",
+ str);
+}
+
/* Called if malloc returns zero */
DOESNT_RETURN
memory_full (void)
＠＠ -274,21 +290,18 ＠＠ set_alloc_mins_and_maxes (void *val, Byt
}
#ifdef ERROR_CHECK_MALLOC
-static int in_malloc, in_malloc_warning;
+static int in_malloc;
extern int regex_malloc_disallowed;
#define MALLOC_BEGIN() \
do \
{ \
- assert (!in_malloc || in_malloc_warning); \
+ assert (!in_malloc); \
assert (!regex_malloc_disallowed); \
in_malloc = 1; \
} \
while (0)
-#define MALLOC_WARNING_BEGIN() (++in_malloc_warning)
-#define MALLOC_WARNING_END() (--in_malloc_warning)
-
#ifdef MC_ALLOC
#define FREE_OR_REALLOC_BEGIN(block) \
do \
＠＠ -328,33 +341,10 ＠＠ while (0)
#else /* ERROR_CHECK_MALLOC */
#define MALLOC_BEGIN()
-#define MALLOC_WARNING_BEGIN()
-#define MALLOC_WARNING_END()
#define FREE_OR_REALLOC_BEGIN(block)
#define MALLOC_END()
#endif /* ERROR_CHECK_MALLOC */
-
-/* malloc calls this if it finds we are near exhausting storage */
-void
-malloc_warning (const char *str)
-{
- if (ignore_malloc_warnings)
- return;
-
- MALLOC_WARNING_BEGIN();
-
- warn_when_safe
- (Qmemory, Qemergency,
- "%s\n"
- "Killing some buffers may delay running out of memory.\n"
- "However, certainly by the time you receive the 95%% warning,\n"
- "you should clean up, kill this Emacs, and start a new one.\n"
- "On Unix, look into your resource limits; ulimit -d, especially.",
- str);
-
- MALLOC_WARNING_END();
-}
static void
malloc_after (void *val, Bytecount size)
- 1 participants
- 0 comments
CVS update by youngs packages/xemacs-packages/xetla/ChangeLog.d ChangeLog-0.1 packages/xemacs-packages/xetla smerge.el
18 years, 4 months
CVS Monitor
CVS Monitor
User: youngs
Date: 05/12/25 11:56:41
Added: packages/xemacs-packages/xetla/ChangeLog.d ChangeLog-0.1
ChangeLog-0.2 ChangeLog-1.0 ChangeLog-1.1
Removed: packages/xemacs-packages/xetla smerge.el
Log:
2005-12-24 Steve Youngs <steve(a)sxemacs.org>
* steve(a)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(a)eicq.org--2005/xetla--main--1.1--version-0
(ELCS): Remove smerge.el, it isn't part of XEtla anymore.
Revision Changes Path
1.3 +15 -0 XEmacs/packages/xemacs-packages/xetla/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ChangeLog 2005/04/04 19:05:48 1.2
+++ ChangeLog 2005/12/25 10:56:36 1.3
＠＠ -1,3 +1,18 ＠＠
+2005-12-24 Steve Youngs <steve(a)sxemacs.org>
+
+ * steve(a)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(a)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(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.00 released.
1.3 +1 -2 XEmacs/packages/xemacs-packages/xetla/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile 2005/04/04 19:05:48 1.2
+++ Makefile 2005/12/25 10:56:36 1.3
＠＠ -18,7 +18,7 ＠＠
# Boston, MA 02111-1307, USA.
VERSION = 1.00
-AUTHOR_VERSION = steve(a)eicq.org--2005/xetla--main--1.0--version-0
+AUTHOR_VERSION = steve(a)eicq.org--2005/xetla--main--1.1--version-0
MAINTAINER = Steve Youngs <steve(a)youngs.au.com>
PACKAGE = xetla
PKG_TYPE = regular
＠＠ -27,7 +27,6 ＠＠ CATEGORY = standard
ELCS = \
ewoc.elc \
- smerge.elc \
xetla-version.elc \
xetla-browse.elc \
xetla-core.elc \
1.2 +2 -2 XEmacs/packages/xemacs-packages/xetla/package-info.in
Index: package-info.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/package-info.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- package-info.in 2005/04/04 13:27:19 1.1
+++ package-info.in 2005/12/25 10:56:36 1.2
＠＠ -9,11 +9,11 ＠＠
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
1.2 +2 -1 XEmacs/packages/xemacs-packages/xetla/xetla-browse.el
Index: xetla-browse.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/xetla-browse.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xetla-browse.el 2005/04/04 13:27:20 1.1
+++ xetla-browse.el 2005/12/25 10:56:36 1.2
＠＠ -63,7 +63,8 ＠＠
;;; Code:
(eval-when-compile
(require 'cl)
- (autoload 'easy-mmode-define-keymap "easy-mmode"))
+ (autoload 'easy-mmode-define-keymap "easy-mmode")
+ (autoload 'ad-add-advice "advice"))
(require 'tree-widget)
(require 'xetla)
1.2 +10 -4 XEmacs/packages/xemacs-packages/xetla/xetla-core.el
Index: xetla-core.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/xetla-core.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xetla-core.el 2005/04/04 13:27:20 1.1
+++ xetla-core.el 2005/12/25 10:56:36 1.2
＠＠ -402,12 +402,18 ＠＠ ones are killed.")
It will eventually be killed when the number of buffers in
`xetla-dead-process-buffer-queue'exceeds `xetla-number-of-dead-process-buffer'."
(add-to-list 'xetla-dead-process-buffer-queue buffer t)
+ (setq xetla-dead-process-buffer-queue
+ (remove-if-not #'buffer-live-p xetla-dead-process-buffer-queue))
(when xetla-number-of-dead-process-buffer
(while (> (length xetla-dead-process-buffer-queue)
(max 2 xetla-number-of-dead-process-buffer))
- (kill-buffer (car xetla-dead-process-buffer-queue))
- (setq xetla-dead-process-buffer-queue
- (cdr xetla-dead-process-buffer-queue)))))
+ (let ((currbuf (car xetla-dead-process-buffer-queue)))
+ ;; just to be completely certain
+ (when (buffer-live-p currbuf)
+ (kill-buffer currbuf))
+ ;; now remove that killed buffer
+ (setq xetla-dead-process-buffer-queue
+ (cdr xetla-dead-process-buffer-queue))))))
(defvar xetla-last-process-buffer nil
"The last created process buffer.")
＠＠ -695,7 +701,7 ＠＠ with `xetla-open-internal-log-buffer'."
(toggle-read-only 1))
(define-derived-mode xetla-process-buffer-mode fundamental-mode
- "Xetla Process"
+ "XEtla Process"
"Major mode for process buffers. Mainly defines \\[bury-buffer]
to quit the buffer"
(toggle-read-only 1))
1.2 +38 -26 XEmacs/packages/xemacs-packages/xetla/xetla-tips.el
Index: xetla-tips.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/xetla-tips.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xetla-tips.el 2005/04/04 13:27:20 1.1
+++ xetla-tips.el 2005/12/25 10:56:36 1.2
＠＠ -59,7 +59,7 ＠＠
to show you interesting features that you may have missed! Disable me
by setting the variable `xetla-tips-enabled' to nil.
-Press q to exit, n to view next tip, p to view previous tip."
+Press `q' to exit, `n' to view next tip, `p' to view previous tip."
"For the available xetla commands Xetla provides a corresponding interactive
function.
Some examples:
＠＠ -70,57 +70,69 ＠＠ M-x xetla-changes ... runs tla chang
XEtla prompts for the needed parameters."
"Most interesting commands are available through a global keyboard
-shortcut. Try \"C-x T C-h\" to get a list"
+shortcut. Try `C-x T C-h' to get a list"
"XEtla provides several major modes for different buffers. Each mode
-has its own keybindings. Get help with \"C-h m\""
- "When XEtla is loaded, C-M-h in a minibuffer prompt gives you help
+has its own keybindings. Get help with `\\[describe-mode]'"
+ "When XEtla is loaded, `C-M-h' in a minibuffer prompt gives you help
about the command being run."
"When you are prompted for an archive, category, branch, version or
-revision name, lots of keybindings are available. Get a list with \"C-h\"."
- "XEtla allows you to manage a list of bookmarks. Try \"C-x T b\" and add
+revision name, lots of keybindings are available. Get a list with `C-h'."
+ "XEtla allows you to manage a list of bookmarks. Try `\\[xetla-bookmarks]' and add
bookmarks from the menu. You may also add bookmarks from an archives,
category, version or revision buffer as well as from the xetla-browse
buffer."
"From the bookmark buffer, you can select some bookmarks and make
-them partners with M-p. Afterwards, pressing 'M m' on a bookmark will
+them partners with \\<xetla-bookmarks-mode-map>`\\[xetla-bookmarks-marked-are-partners]'. Afterwards, pressing `\\[xetla-bookmarks-missing]' on a bookmark will
show you the missing patches from his partners."
- "You can add changelog style comments to your commit log by \"C-x T a\"."
+ "You can add changelog style comments to your commit log by `\\[xetla-add-log-entry]'."
"You can enable ispell, flyspell or other useful mode for editing
-log files by \"M-x customize-variable RET xetla-log-edit-mode-hook RET\"."
+log files by `M-x customize-variable RET xetla-log-edit-mode-hook RET'."
"By default, XEtla caches any log file you retrieve with
`xetla-cat-log' or `xetla-cat-archive-log' in ~/.arch-log-library. This
speeds up many XEtla operations.
You can disable this by setting `xetla-log-library-greedy' to nil."
"XEtla is highly customizable.
-Start it by \"M-x customize-group RET xetla RET\"."
+Start it by `M-x customize-group RET xetla RET'."
"In an *xetla-changes* buffer you can quickly jump to the source file by
-\"RET\", or view the source file in another window by \"v\", or start
-an ediff session by \"e\" to inspect/reject parts of the changes."
+`RET', or view the source file in another window by `v', or start
+an ediff session by `e' to inspect/reject parts of the changes."
"In a *xetla-changes* buffer, you can quickly jump from the list of
-files to the corresponding patch hunk, and come back with \"j\""
+files to the corresponding patch hunk, and come back with `j'"
"After committing, you can review the last committed patch with
-\"M-x xetla-changes-last-revision RET\".
+`M-x xetla-changes-last-revision RET'.
Usefull to review and fix a patch you've just merged without mixing
manual modifications and merge in the same patch."
- "After a merge, typing \"C-c m\" in the log buffer will generate
+ "After a merge, typing \\<xetla-log-edit-mode-map> `\\[xetla-log-edit-insert-log-for-merge-and-headers]' in the log buffer will generate
for you a summary line, keyword and body. This is highly
customizable."
- "Report bugs using M-x xetla-submit-bug-report RET"
- "You've got a nice, graphical, archive browser one M-x xetla-browse
-RET away."
- "In the bookmark buffer, pressing \"C-x C-f\" starts with the local
+ "Report bugs using `M-x xetla-submit-bug-report RET'"
+ "You've got a nice, graphical, archive browser one
+`M-x xetla-browse RET' away."
+ "In the bookmark buffer, pressing\\<xetla-bookmarks-mode-map> `\\[xetla-bookmarks-find-file] starts with the local
tree of the bookmark at point for the default directory."
- "SMerge mode is an Emacs minor mode usefull to resolve conflicts
-after a -three-way merge. XEtla will enter this mode automatically
-when you open a file with conflicts. Type M-x xetla-conflicts-finish RET
-to exit smerge mode and delete the corresponding .rej file."
- "\"C-x T e\" in a source file will open an ediff session with the
+ "`\\[xetla-file-ediff]' in a source file will open an ediff session with the
unmodified version of the file. From here, you can undo patch hunks
-one by one with the key \"b\""
+one by one with the key `b'"
"In the *tree-lint* buffer, with your cursor on a message, most
commands will apply to all the files listed under this message."
+ "Many XEtla commands accept one or more prefix arguments. For example,
+from the *xetla-log-edit* buffer:
+\\<xetla-log-edit-mode-map>
+ `\\[xetla-log-edit-done]' -- Save and kill the log buffer
+ `\\[universal-argument] \\[xetla-log-edit-done]' -- Save and kill the log, plus commit the changes
+ `\\[universal-argument] \\[universal-argument] \\[xetla-log-edit-done]' -- Save and kill the log, plus commit and \"seal\"
+`\\[universal-argument] \\[universal-argument] \\[universal-argument] \\[xetla-log-edit-done]' -- Save and kill the log, plus commit and \"fix\"
+
+All of the XEtla commands that accept prefix arguments are documented,
+so use `\\[describe-function] xetla-[command] RET' to see more nifty
+tricks."
+ "Give a prefix argument to M-x xetla-changelog and you'll be prompted
+for a version to display a ChangeLog for. This is handy if you want to
+see a ChangeLog for a previous version of a project."
+ "In a *xetla-changes* buffer, hit RET with point somewhere in the diff
+and you'll be taken to that exact spot in the source file."
]
"List of tips. Add more !")
＠＠ -152,7 +164,7 ＠＠ Commands:
"************************* Did you know? *************************"
'xetla-messages)
"\n\n")
- (insert message)
+ (insert (substitute-command-keys message))
(newline 2)
(insert (xetla-face-add
"*********************************************************************"
1.2 +1 -1 XEmacs/packages/xemacs-packages/xetla/xetla-version.el
Index: xetla-version.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/xetla-version.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xetla-version.el 2005/04/04 13:27:21 1.1
+++ xetla-version.el 2005/12/25 10:56:36 1.2
＠＠ -1,5 +1,5 ＠＠
;;; Automatically generated file -- DO NOT EDIT OR DELETE
;;;###autoload
(defconst xetla-version
- "steve(a)eicq.org--2005/xetla--main--1.0--version-0")
+ "steve(a)eicq.org--2005/xetla--main--1.1--version-0")
(provide 'xetla-version)
1.2 +421 -83 XEmacs/packages/xemacs-packages/xetla/xetla.el
Index: xetla.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xetla/xetla.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xetla.el 2005/04/04 13:27:21 1.1
+++ xetla.el 2005/12/25 10:56:36 1.2
＠＠ -1,7 +1,7 ＠＠
;;; xetla.el --- Arch (tla) interface for XEmacs
;; Copyright (C) 2003-2004 by Stefan Reichoer (GPL)
-;; Copyright (C) 2004 Steve Youngs (BSD)
+;; Copyright (C) 2004 2005 Steve Youngs (BSD)
;; Author: Steve Youngs <steve(a)eicq.org>
;; Maintainer: Steve Youngs <steve(a)eicq.org>
＠＠ -94,6 +94,123 ＠＠
;;; Code:
+;;; XEtla/Xtla safety code
+;; You can run into some problems if you have both XEtla and Xtla
+;; installed at the same time. The following attempts to guard
+;; against it by warning the user and giving them a couple of
+;; functions for disabling one of XEtla or Xtla in their current
+;; session. Dangerous stuff!!
+(defvar xetla-dont-warn-about-xtla nil)
+
+(when (and (featurep 'xtla)
+ (not xetla-dont-warn-about-xtla))
+ (xetla-warn-about-xtla))
+
+(defconst xetla-warn-about-xtla-text
+ "We have detected that you have both XEtla and Xtla installed.
+
+This is never a very good idea (unless you _really_ know what you are
+doing) because both packages share similar key bindings and install
+similar hooks.
+
+Our suggestion is that you remove either XEtla or Xtla and just use the
+other. For your convenience there is `xetla-attempt-xetla-removal' and
+`xetla-attempt-xtla-removal', which will attempt to disable one of the
+packages for the current session only.
+
+Use those functions at your own risk. The best answer is to not load
+one of XEtla or Xtla in the first place.
+
+To disable this warning: (setq xetla-dont-warn-about-xtla t).")
+
+(defun xetla-warn-about-xtla ()
+ "Pop up a big fat warning about trying to use XEtla and xtla together."
+ (get-buffer-create "*XEtla/Xtla Warning*")
+ (with-current-buffer "*XEtla/Xtla Warning*"
+ (erase-buffer)
+ (insert xetla-warn-about-xtla-text))
+ (pop-to-buffer "*XEtla/Xtla Warning*"))
+
+(defun xetla-attempt-xetla-removal ()
+ "Attempt to disable xetla.
+
+**** This is dangerous, use at your own risk. ****
+
+This function attempts to unload all the XEtla features, remove the
+`xetla-find-file-hook', remove entries from `auto-mode-alist', and
+finally, remove the XEtla lisp directory from the `load-path'. After
+all of this has happened, Xtla should run without problems. Please
+note that we do _NOT_ guarantee that this will work perfectly and you
+really should physically remove either XEtla or Xtla.
+
+Use of this function is only valid in the current session, in other
+words, it ain't saved."
+ (interactive)
+ ;; unload the features
+ (when (featurep 'xetla-tips) (unload-feature 'xetla-tips t))
+ (when (featurep 'xetla-browse) (unload-feature 'xetla-browse t))
+ (when (featurep 'xetla) (unload-feature 'xetla t))
+ (when (featurep 'xetla-core) (unload-feature 'xetla-core t))
+ (when (featurep 'xetla-defs) (unload-feature 'xetla-defs t))
+ (when (featurep 'xetla-autoloads) (unload-feature 'xetla-autoloads t))
+ ;; remove the hooks
+ (remove-hook 'find-file-hooks 'xetla-find-file-hook)
+ ;; clean out auto-mode-alist
+ (setq auto-mode-alist
+ (delete '("\\+\\+log\\." . xetla-log-edit-mode) auto-mode-alist))
+ (setq auto-mode-alist
+ (delete '("/\\(=tagging-method\\|\\.arch-inventory\\)$" . xetla-inventory-file-mode)
+ auto-mode-alist))
+ ;; clean out the load-path
+ (setq load-path
+ (remove (file-name-directory (locate-library "xetla")) load-path))
+ ;; did I miss anything?
+ ;; what can we do about key bindings?
+
+ (message "To ensure correct key bindings, please reload Xtla"))
+
+(defun xetla-attempt-xtla-removal ()
+ "Attempt to disable Xtla.
+
+**** This is dangerous, use at your own risk. ****
+
+This function attempts to unload all the Xtla features, remove the
+`tla-find-file-hook', remove entries from `auto-mode-alist', and
+finally, remove the XEtla lisp directory from the `load-path'. After
+all of this has happened, XEtla should run without problems. Please
+note that we do _NOT_ guarantee that this will work perfectly and you
+really should physically remove either XEtla or Xtla.
+
+Use of this function is only valid in the current session, in other
+words, it ain't saved."
+ (interactive)
+ ;; unload the features
+ (when (featurep 'xtla-tips) (unload-feature 'xtla-tips t))
+ (when (featurep 'xtla-browse) (unload-feature 'xtla-browse t))
+ (when (featurep 'xtla) (unload-feature 'xtla t))
+ (when (featurep 'xtla-core) (unload-feature 'xtla-core t))
+ (when (featurep 'xtla-defs) (unload-feature 'xtla-defs t))
+ (when (featurep 'xtla-emacs) (unload-feature 'xtla-emacs t))
+ (when (featurep 'xtla-xemacs) (unload-feature 'xtla-xemacs t))
+ (when (featurep 'xtla-autoloads) (unload-feature 'xtla-autoloads t))
+ ;; remove the hooks
+ (remove-hook 'find-file-hooks 'tla-find-file-hook)
+ ;; clean out auto-mode-alist
+ (setq auto-mode-alist
+ (delete '("\\+\\+log\\." . tla-log-edit-mode) auto-mode-alist))
+ (setq auto-mode-alist
+ (delete '("/\\(=tagging-method\\|\\.arch-inventory\\)$" . tla-inventory-file-mode)
+ auto-mode-alist))
+ ;; clean out the load-path
+ (setq load-path
+ (remove (file-name-directory (locate-library "xtla")) load-path))
+ ;; did I miss anything?
+ ;; what can we do about key bindings?
+ (message "To ensure correct key bindings, please reload XEtla"))
+
+;;; End XEtls/Xtla safety code
+
+
(eval-and-compile
(when (locate-library "xetla-version")
(require 'xetla-version)))
＠＠ -2731,9 +2848,72 ＠＠ correctly filled in."
(dolist (function xetla-commit-check-log-buffer-functions)
(funcall function)))
+(defcustom xetla-warn-about-conflict-files t
+ "*When non-`nil' ask whether to commit if conflict files are present.
+When `nil' commit anyway."
+:group 'xetla)
+
+(defun xetla-commit-find-conflict-files (dir)
+ "Searches for conflict files in the current working directory."
+ (when (file-readable-p dir)
+ (let* ((dirs (directory-files dir t "^[^.]+$" nil 'subdirs))
+ (cur (directory-files dir t "\\.rej"))
+ (sub (mapcar #'xetla-commit-find-conflict-files dirs)))
+ (setq cur (delete nil cur))
+ (setq sub (delete nil sub))
+ (if sub
+ (append cur sub)
+ cur))))
+
+(defun xetla-commit-seal (&optional force)
+ "Commit a `version-0' revision to seal a repo.
+
+This calls `tla commit --seal'. With optional argument FORCE, don't
+prompt for confirmation."
+ (interactive)
+ (when (or force
+ (y-or-n-p
+ (format "Do you really want to seal `%s'? "
+ (xetla-tree-version))))
+ (if (string-match "--version\\(-\\|fix-\\)+"
+ (xetla-get-current-revision default-directory))
+ (error "Revision already sealed, use `xetla-commit-fix' instead")
+ (xetla-commit
+ (lambda (output error status args)
+ (xetla-tips-popup-maybe))
+ 'seal))))
+
+(defun xetla-commit-fix (&optional force)
+ "Commit a `versionfix' revision.
+
+This calls `tla commit --fix'. With optional argument FORCE, don't
+prompt for confirmation."
+ (interactive)
+ (when (or force
+ (y-or-n-p
+ (format "Do you really want to versionfix `%s'? "
+ (xetla-tree-version))))
+ (if (not (string-match "--version\\(-\\|fix-\\)+"
+ (xetla-get-current-revision default-directory)))
+ (error "Revision not sealed")
+ (xetla-commit
+ (lambda (output error status args)
+ (xetla-tips-popup-maybe))
+ 'fix))))
+
;;;###autoload
-(defun xetla-commit (&optional handler)
- "Run tla commit."
+(defun xetla-commit (&optional handler version-flag)
+ "Run tla commit.
+
+Optional argument HANDLER is the process handler for the commit
+command.
+
+Optional argument VERSION-FLAG may be one of the symbols
+'seal to commit a sealed version
+'fix to commit a fix version
+If omitted it defaults to a normal commit.
+
+When the commit finishes successful, `tla-commit-done-hook' is called."
(interactive)
(with-current-buffer
(find-file-noselect (xetla-make-log))
＠＠ -2745,6 +2925,16 ＠＠ correctly filled in."
(y-or-n-p
"Commit with unsaved changes is a bad idea. Continue anyway? ")
(error "Not committing"))
+ (and xetla-warn-about-conflict-files
+ ;; fsck it, actually we dont need all the .rej files (yet), so
+ ;; speed up would be to unwind the recursion after the first
+ ;; occurrence of a .rej
+ (xetla-commit-find-conflict-files ".")
+ (or (y-or-n-p
+ (concat
+ "Commit with unresolved conflicts is a bad idea. "
+ "Continue anyway? "))
+ (error "Not committing")))
(let* ((file-list (and (buffer-live-p xetla-buffer-source-buffer)
(with-current-buffer xetla-buffer-source-buffer
xetla-buffer-marked-file-list)))
＠＠ -2755,8 +2945,13 ＠＠ correctly filled in."
(xetla-run-tla-async
(cons "commit"
(cons (when xetla-strict-commits "--strict")
- (when file-list (cons "--"
- file-list))))
+ (cons (cond
+ ((eq version-flag 'fix) "--fix")
+ ((eq version-flag 'seal) "--seal")
+ ((eq version-flag nil) nil)
+ (t (error "Wrong version flag: %s" version-flag)))
+ (when file-list (cons "--"
+ file-list)))))
:finished handler))))
(defun xetla-import ()
＠＠ -2782,16 +2977,23 ＠＠ correctly filled in."
(xetla-run-tla-sync '("pristines")))
;;;###autoload
-(defun xetla-changelog ()
+(defun xetla-changelog (&optional version)
"Run \"tla changelog\".
-display the result in an improved ChangeLog mode."
- (interactive)
- (let ((default-directory (xetla-read-project-tree-maybe)))
- (xetla-run-tla-sync '("changelog")
+Display the result in an improved ChangeLog mode.
+With prefix arg, VERSION, display that version's changelog."
+ (interactive "p")
+ (let ((default-directory (xetla-read-project-tree-maybe))
+ (version (when current-prefix-arg
+ (xetla-name-construct
+ (xetla-name-read "ChangeLog for version: "
+ 'prompt 'prompt 'prompt 'prompt)))))
+ (xetla-run-tla-sync (list "changelog" version)
:finished 'xetla-null-handler)
(xetla-show-last-process-buffer 'changelog 'xetla-changelog-mode)
- (goto-char (point-min))))
+ (goto-char (point-min))
+ (view-mode nil (lambda (&rest args)
+ (xetla-buffer-quit)))))
;;;###autoload
(defun xetla-logs ()
＠＠ -2820,6 +3022,39 ＠＠ display the result in an improved Change
(set (make-local-variable 'xetla-buffer-refresh-function)
'xetla-logs))))))
+(defun xetla-help-via-keyb ()
+ (interactive)
+ (let ((ext (extent-string (extent-at (point)))))
+ (xetla-help ext)))
+
+(defun xetla-help-via-mouse (event)
+ (interactive "e")
+ (goto-char (event-point event))
+ (let ((ext (extent-string (extent-at (point)))))
+ (xetla-help ext)))
+
+(defconst xetla-help-extent-map
+ (let* ((map (make-sparse-keymap 'xetla-help-extent-map)))
+ (define-key map [button2] 'xetla-help-via-mouse)
+ (define-key map [return] 'xetla-help-via-keyb)
+ map)
+ "A keymap for the extents in output from `tla help'.")
+
+(defun xetla-display-global-help (buffer &rest args)
+ (switch-to-buffer buffer)
+ (xetla-process-buffer-mode)
+ (goto-char (point-min))
+ (save-excursion
+ (while (re-search-forward "\\(\\w+.*\\) : " nil t)
+ (let ((extent (make-extent (match-beginning 1) (match-end 1)))
+ (echo "RET or button2 for help on this command."))
+ (set-extent-property extent 'face 'widget-button-face)
+ (set-extent-property extent 'mouse-face 'highlight)
+ (set-extent-property extent 'keymap xetla-help-extent-map)
+ (set-extent-property extent 'help-echo echo)
+ (set-extent-property extent 'balloon-help echo)
+ (set-extent-property extent 'duplicable t)))))
+
;;;###autoload
(defun xetla-help (command)
"Run tla COMMAND -H."
＠＠ -2839,7 +3074,11 ＠＠ display the result in an improved Change
(cons (list (match-string 1))
listcmd)))
listcmd)))))))
- (xetla-run-tla-sync (list command "-H")))
+ (if (string= command "")
+ (xetla-run-tla-sync
+ '("help")
+:finished 'xetla-display-global-help)
+ (xetla-run-tla-sync (list command "-H"))))
(defun xetla-tree-version-list-tla ()
"Return the tree version, or nil if not in a project tree."
＠＠ -3155,6 +3394,10 ＠＠ Limit to CATEGORY-BRANCH-VERSION. If FRO
(defun xetla-star-merge (from &optional to-tree)
"Star merge from version/revision FROM to local tree TO-TREE."
+ (interactive (list (xetla-name-construct
+ (xetla-name-read "Star merge from (version or revision): "
+ 'prompt 'prompt 'prompt 'prompt 'maybe))
+ (read-directory-name "In tree: ")))
(let ((to-tree (when to-tree (expand-file-name to-tree))))
(or (xetla-save-some-buffers (or to-tree default-directory))
(y-or-n-p
＠＠ -3320,35 +3563,14 ＠＠ Can be
(defvar xetla-bookmarks-marked-list nil
"A list of marked bookmarks.")
-(defun xetla-bookmarks-load-from-file-OBSOLETE (&optional force)
- "Load bookmarks from the bookmarks file.
-If FORCE is non-nil, reload the file even if it was loaded before."
- (when (or force (not xetla-bookmarks-loaded))
- (let ((file (xetla-config-file-full-path xetla-bookmarks-file-name t)))
- (save-excursion
- (unless (file-exists-p file)
- (with-temp-buffer
- (insert "()")
- (write-file file)))
- (unless (file-readable-p file)
- (error "Xetla bookmark file not readable"))
- (with-temp-buffer
- (insert-file-contents file)
- (setq xetla-bookmarks-alist (read (current-buffer))
- xetla-bookmarks-loaded t))))))
-
(defun xetla-bookmarks-load-from-file (&optional force)
"Load bookmarks from the file `xetla-bookmarks-file-name'.
If FORCE is non-nil, reload the file even if it was loaded before."
- ;; TODO remove condition case (after some time)
- (condition-case nil
- (when (or force (not xetla-bookmarks-loaded))
- (xetla-load-state (xetla-config-file-full-path
- xetla-bookmarks-file-name t))
- (setq xetla-bookmarks-loaded t))
- (error (progn
- (xetla-bookmarks-load-from-file-OBSOLETE force)))))
+ (when (or force (not xetla-bookmarks-loaded))
+ (xetla-load-state (xetla-config-file-full-path
+ xetla-bookmarks-file-name t))
+ (setq xetla-bookmarks-loaded t)))
(defun xetla-bookmarks-save-to-file ()
"Save `xetla-bookmarks-alist' to the file `xetla-bookmarks-file-name'."
＠＠ -3479,8 +3701,8 ＠＠ If prefix argument ARG is specified, the
if already set in the bookmarks."
(interactive "P")
(unless xetla-bookmarks-cookie
- (error "Please, run this command from the bookmarks buffer%s"
- " (M-x xetla-bookmarks RET)"))
+ (error "Wrong buffer, run: `%s' and try again"
+ (substitute-command-keys "\\[xetla-bookmarks]")))
(let ((list (or xetla-bookmarks-marked-list
(list (ewoc-data (ewoc-locate
xetla-bookmarks-cookie))))))
＠＠ -3873,17 +4095,30 ＠＠ parsed."
local-tree)))))))
(defun xetla-bookmarks-open-tree ()
- "Open a local tree in a dired buffer."
+ "Open a local tree in a dired buffer.
+
+With a prefix arg, prompt for a local tree to use."
(interactive)
- (dired-other-window (xetla-bookmarks-read-local-tree)))
+ (let ((x-dired (if (eq xetla-switch-to-buffer-mode 'single-window)
+ 'dired
+ 'dired-other-window))
+ (open (if current-prefix-arg
+ (xetla-bookmarks-read-local-tree nil 'ask)
+ (xetla-bookmarks-read-local-tree))))
+ (funcall x-dired open)))
(defun xetla-bookmarks-find-file ()
"Find a file starting from the local tree of the current bookmark.
+
This way, you can type C-x C-f in the bookmarks buffer to open a file
-of a bookmarked project."
+of a bookmarked project.
+
+With a prefix arg, prompt for the local tree to use."
(interactive)
(let ((default-directory (xetla-uniquify-file-name
- (xetla-bookmarks-read-local-tree))))
+ (if current-prefix-arg
+ (xetla-bookmarks-read-local-tree nil 'ask)
+ (xetla-bookmarks-read-local-tree)))))
(call-interactively 'find-file)))
(defun xetla-bookmarks-tag (arg)
＠＠ -3894,8 +4129,8 ＠＠ prefix argument ARG is given, explicitly
from."
(interactive "P")
(unless xetla-bookmarks-cookie
- (error "Please, run this command from the bookmarks buffer%s"
- " (M-x xetla-bookmarks RET)"))
+ (error "Not in bookmarks buffer, run: `%s' and try again"
+ (substitute-command-keys "\\[xetla-bookmarks]")))
(let ((list (or xetla-bookmarks-marked-list
(list (ewoc-data (ewoc-locate xetla-bookmarks-cookie))))))
(let ((tags (mapcar
＠＠ -3932,15 +4167,32 ＠＠ from."
(defun xetla-bookmarks-inventory ()
"Run `tla inventory' on a local tree."
- (interactive)
- (let ((default-directory (xetla-bookmarks-read-local-tree)))
- (xetla-inventory nil t)))
-
-(defun xetla-bookmarks-changes ()
- "Run `xetla-changes' on a local tree."
(interactive)
- (let ((default-directory (xetla-bookmarks-read-local-tree)))
- (xetla-changes nil nil)))
+ (let ((default-directory (if current-prefix-arg
+ (xetla-bookmarks-read-local-tree nil 'ask)
+ (xetla-bookmarks-read-local-tree))))
+ (xetla-inventory nil
+ (unless (eq xetla-switch-to-buffer-mode 'single-window)
+ t))))
+
+(defun xetla-bookmarks-changes (arg)
+ "Run `xetla-changes' on a local tree.
+
+Prefix argument, ARG, determines whether or not to use a full format or
+summary format and if it should prompt for the local tree to use.
+
+ 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."
+ (interactive "p")
+ (let* ((arg (car current-prefix-arg))
+ (default-directory (if (or (eq arg 16) (eq arg 64))
+ (xetla-bookmarks-read-local-tree nil 'ask)
+ (xetla-bookmarks-read-local-tree))))
+ (if (or (eq arg 4) (eq arg 64))
+ (xetla-changes t)
+ (xetla-changes))))
(defmacro xetla-make-move-fn (ewoc-direction function cookie
&optional only-unmerged)
＠＠ -3993,11 +4245,14 ＠＠ merged by another revision in the same l
;;;###autoload
(defun xetla-bookmarks (&optional arg)
- "Display xetla bookmarks in a buffer.
+ "Display XEtla bookmarks in a buffer.
+
With prefix argument ARG, reload the bookmarks file from disk."
(interactive "P")
(xetla-bookmarks-load-from-file arg)
- (pop-to-buffer "*xetla-bookmarks*")
+ (if (eq xetla-switch-to-buffer-mode 'single-window)
+ (switch-to-buffer (get-buffer-create "*xetla-bookmarks*"))
+ (pop-to-buffer (get-buffer-create "*xetla-bookmarks*")))
(let ((pos (point)))
(toggle-read-only -1)
(erase-buffer)
＠＠ -4015,11 +4270,7 ＠＠ With prefix argument ARG, reload the boo
(defun xetla-bookmarks-mode ()
- "Major mode to show xetla bookmarks.
-
-You can add a bookmark with '\\<xetla-bookmarks-mode-map>\\[xetla-bookmarks-add]', and remove one with '\\[xetla-bookmarks-delete]'. After
-marking a set of files with '\\[xetla-bookmarks-mark]', make them partners with '\\[xetla-bookmarks-marked-are-partners]', and
-you will then be able to use '\\[xetla-bookmarks-missing]' to view the missing patches.
+ "Major mode to show XEtla bookmarks.
Commands:
\\{xetla-bookmarks-mode-map}"
＠＠ -5237,6 +5488,20 ＠＠ Sets the archive location to LOCATION."
" ***")
'xetla-separator) "\n")))))))
+(defun xetla-get-current-revision (&optional directory)
+ "Return the current revision in DIRECTORY."
+ (interactive)
+ (let* ((directory (or directory
+ (xetla-read-project-tree-maybe
+ "Get current revision in: ")))
+ (revision (shell-command-to-string
+ (concat "tla revisions --full "
+ (xetla-tree-version directory)
+ "|tail -n1"))))
+ (if (interactive-p)
+ (message revision)
+ revision)))
+
(defun xetla-tree-revisions ()
"Call `xetla-revisions' in the current tree."
(interactive)
＠＠ -5521,7 +5786,7 ＠＠ Otherwise, run dired."
;;
;; Add
;;
-(defun xetla-add (id &rest files)
+(defun xetla-add-id (id &rest files)
"Using ID, add FILES to this tree."
(interactive (let ((name
(read-file-name "Add file as source: "
＠＠ -5533,11 +5798,19 ＠＠ Otherwise, run dired."
(if (and id (string= id ""))
(setq id nil))
(setq files (mapcar 'expand-file-name files))
- (if id
- (xetla-run-tla-sync `("add" "--id" ,id . ,files)
-:finished 'xetla-null-handler)
- (xetla-run-tla-sync `("add" . ,files)
-:finished 'xetla-null-handler)))
+ (let* ((arch-ver (or xetla-arch-version-number
+ (xetla-arch-version-number)))
+ (add-id-string
+ (cond ((> 2 (or (cdr-safe (assoc 'minor arch-ver)) 0))
+ "add")
+ (t "add-id"))))
+ (if id
+ (xetla-run-tla-sync `(,add-id-string "--id" ,id . ,files)
+:finished 'xetla-null-handler)
+ (xetla-run-tla-sync `(,add-id-string . ,files)
+:finished 'xetla-null-handler))))
+
+(defalias 'xetla-add 'xetla-add-id)
;;
;; Remove
＠＠ -5880,7 +6153,7 ＠＠ If INSERT-CHANGELOG is non-nil, insert a
(list (read-file-name "Add file: " default-directory
nil nil
(xetla-get-file-info-at-point))))))
- (apply 'xetla-add nil files)
+ (apply 'xetla-add-id nil files)
(xetla-inventory))
(defun xetla-inventory-remove-files (files id-only)
＠＠ -6466,7 +6739,7 ＠＠ When the list has been filled in, CALLBA
(point-at-bol) (point)))))
(if (and in-field
(string-match "^[A-Z][A-Za-z]*: $"
- (buffer-substring
+
(point-at-bol) (point))))
(forward-line))
(if in-field (beginning-of-line) (forward-line 1))
＠＠ -6534,21 +6807,49 ＠＠ Commands:
Pops up a buffer with a tip if tips are enabled (see
`xetla-tips-enabled')" nil nil)
-(defun xetla-log-edit-done (&optional commit)
- "Finish the current log edit.
+(defun xetla-log-edit-done (&optional commit version-flag)
+ "Save the current log edit.
-With optional prefix arg, COMMIT, also run `tla commit'."
- (interactive "P")
+When optional argument COMMIT is non-nil, run `tla commit'.
+
+Optional argument VERSION-FLAG is for specifying either a `seal'
+commit or a `fix' commit. It is a symbol and can be either `seal' or
+`fix'.
+
+Both COMMIT and VERSION-FLAG are really meant for non-interactive
+use. When this function is called interactively the same thing can
+be achieved through prefix arguments...
+
+With a single prefix arg, run `tla commit'.
+With 2 prefix args, run `tla commit --seal'.
+With 3 prefix args, run `tla commit --fix'."
+ (interactive "p")
(save-buffer)
(let ((log-buffer (current-buffer))
- (commit (or current-prefix-arg commit)))
+ (commit (car current-prefix-arg))
+ (type version-flag)
+ (dir default-directory))
(pop-window-configuration)
+ (when (interactive-p)
+ (cond ((eq commit 4)
+ (setq type nil))
+ ((eq commit 16)
+ (setq type 'seal))
+ ((eq commit 64)
+ (setq type 'fix))
+ (t
+ (setq type nil))))
(if (not commit)
(bury-buffer log-buffer)
- (kill-buffer log-buffer)
- (xetla-commit
- (lambda (output error status args)
- (xetla-tips-popup-maybe))))))
+ (if type
+ (funcall (intern (format "xetla-commit-%s" type)))
+ (if (string-match "--version\\(-\\|fix-\\)+"
+ (xetla-get-current-revision dir))
+ (error "Can't commit to sealed archive without --fix")
+ (kill-buffer log-buffer)
+ (xetla-commit
+ (lambda (output error status args)
+ (xetla-tips-popup-maybe))))))))
(defun xetla-archive-maintainer-name (version)
"Return the maintainer name for a given VERSION.
＠＠ -8335,9 +8636,9 ＠＠ that visits the link."
(set-buffer true-buffer)
(kill-buffer this-buffer))))
-(eval-when-compile
- (defvar vc-ignore-vc-files))
+(defvar vc-ignore-vc-files)
+
;;;###autoload
(defun xetla-find-file-hook ()
"Hook executed when opening a file.
＠＠ -8495,7 +8796,7 ＠＠ FILE must be an absolute filename. It c
(progn
(delete-file (concat (file-name-as-directory file)
".arch-ids/=id"))
- (xetla-add nil file))
+ (xetla-add-id nil file))
(let* ((dir (file-name-directory file))
(basename (file-name-nondirectory file))
(id-file (concat dir
＠＠ -8503,7 +8804,7 ＠＠ FILE must be an absolute filename. It c
basename ".id")))
(if (file-exists-p id-file)
(progn (delete-file id-file)
- (xetla-add nil file))
+ (xetla-add-id nil file))
(with-current-buffer
(find-file-noselect file)
(let ((modif (buffer-modified-p)))
＠＠ -8882,7 +9183,7 ＠＠ If on a message field, add all the files
"Add %s files? "
"Not adding any file"
"Add file: ")))
- (apply 'xetla-add nil files)
+ (apply 'xetla-add-id nil files)
(xetla-tree-lint default-directory))
(defun xetla-tree-lint-delete-files (files)
＠＠ -8963,7 +9264,15 ＠＠ Visited buffer associations also updated
;; end tree-lint-mode
(defvar xetla-arch-version nil
- "Version of xetla version.")
+ "Version of the underlying tla binary.")
+
+(defvar xetla-arch-version-number nil
+ "Version _number_ of the underlying tla binary.
+It is stored in an alist in the form
+\(\(major . <major>\)
+ \(minor . <minor>\)
+ \(minor-minor . <minor-minor>\)
+ \(fix . <fix>\)\)")
(defun xetla-arch-version ()
"Return the TLA (arch) version."
＠＠ -8976,6 +9285,35 ＠＠ Visited buffer associations also updated
(if (interactive-p)
(message xetla-arch-version))
xetla-arch-version)
+
+(defun xetla-arch-version-number ()
+ "Return the TLA (arch) version number.
+This is extremely mandatory since tla 1.3 parameters differ from
+those used in tla 1.2 for example."
+ (interactive)
+ (unless xetla-arch-version
+ (xetla-arch-version))
+ (setq xetla-arch-version-number
+ (when (string-match
+ (concat "([^0-9]+"
+ "\\([0-9]\\)"
+ "\\.\\([0-9]\\)"
+ "\\.?\\([0-9]\\)?"
+ ".*\\(?:fix-?\\)?\\([0-9]\\)?.*)")
+ xetla-arch-version)
+ (mapcar* #'cons
+ '(major minor minor-minor fix)
+ (mapcar #'string-to-number
+ (list (match-string 1 xetla-arch-version)
+ (match-string 2 xetla-arch-version)
+ (or (match-string 3 xetla-arch-version)
+ "")
+ (or (match-string 4 xetla-arch-version)
+ ""))))))
+ (if (interactive-p)
+ (message "%S" xetla-arch-version-number))
+ xetla-arch-version-number)
+
;;;###autoload
(defun xetla-version ()
1.1 XEmacs/packages/xemacs-packages/xetla/ChangeLog.d/ChangeLog-0.1
Index: ChangeLog-0.1
===================================================================
# do not edit -- automatically generated by arch changelog
# non-id: automatic-ChangeLog--steve(a)eicq.org--2004/xetla--main--0.1
#
2004-12-21 04:18:48 GMT Steve Youngs <steve(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)eicq.org> patch-15
Summary:
merge from hrop (finish removing buffers menu crap)
Revision:
xetla--main--0.1--patch-15
Patches applied:
* hroptatyr(a)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(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
2004-12-16 05:20:45 GMT Steve Youngs <steve(a)eicq.org> patch-14
Summary:
merge from hrop (remove buffers menu)
Revision:
xetla--main--0.1--patch-14
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
star merge from steve --patch-12 --patch-13
* hroptatyr(a)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(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
2004-12-09 09:09:55 GMT Steve Youngs <steve(a)eicq.org> patch-13
Summary:
merge from hrop... yet another -- to - fubar
Revision:
xetla--main--0.1--patch-13
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
fix, some more s/-/--/ issue
modified files:
xetla.el
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
2004-12-06 23:34:26 GMT Steve Youngs <steve(a)eicq.org> patch-12
Summary:
merge from hrop
Revision:
xetla--main--0.1--patch-12
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
fix, some more parsing corrections for dealing with tla archive strings
* hroptatyr(a)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(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
2004-12-02 09:00:45 GMT Steve Youngs <steve(a)eicq.org> patch-11
Summary:
merge from hrop
Revision:
xetla--main--0.1--patch-11
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
abstraction
modified files:
xetla-core.el
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
2004-11-29 21:19:36 GMT Steve Youngs <steve(a)eicq.org> patch-10
Summary:
merge from hrop (fix xetla-tree-version-list)
Revision:
xetla--main--0.1--patch-10
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
minor fix to correctly identify tree version
modified files:
xetla.el
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
2004-11-27 00:36:28 GMT Steve Youngs <steve(a)eicq.org> patch-9
Summary:
merge from hrop (overlay -> extent conversion)
Revision:
xetla--main--0.1--patch-9
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
star-merge <=patch-8 of steve-line
* hroptatyr(a)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(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
2004-11-25 11:28:01 GMT Steve Youngs <steve(a)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(a)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(a)youngs.au.com.
* xetla.el (xetla-submit-bug-report): Send bugs to
xetla-devel(a)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(a)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(a)eicq.org> patch-5
Summary:
syncing up patch logs from hrop
Revision:
xetla--main--0.1--patch-5
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
tag of steve(a)eicq.org--2004/xetla--main--0.1--base-0
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
bypass compiler warnings
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
fixing my fuckups
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
2004-11-25 01:26:24 GMT Steve Youngs <steve(a)eicq.org> patch-4
Summary:
merge from hrop (ewoc.el warning fix)
Revision:
xetla--main--0.1--patch-4
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
bypass compiler warnings
modified files:
ewoc.el
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
2004-11-24 23:42:57 GMT Steve Youngs <steve(a)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(a)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(a)eicq.org> patch-1
Summary:
from hrop... minor renaming fixes
Revision:
xetla--main--0.1--patch-1
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
minor fixes
modified files:
xetla-core.el xetla-defs.el xetla.el
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
2004-11-24 15:43:59 GMT Steve Youngs <steve(a)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
1.1 XEmacs/packages/xemacs-packages/xetla/ChangeLog.d/ChangeLog-0.2
Index: ChangeLog-0.2
===================================================================
# do not edit -- automatically generated by arch changelog
# non-id: automatic-ChangeLog--steve(a)eicq.org--2005/xetla--main--0.2
#
2005-03-11 13:31:17 GMT Steve Youngs <steve(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)eicq.org> base-0
Summary:
tag of steve(a)eicq.org--2004/xetla--main--0.1--patch-24
Revision:
xetla--main--0.2--base-0
(automatically generated log message)
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
steve(a)eicq.org--2004/xetla--main--0.1--base-0
steve(a)eicq.org--2004/xetla--main--0.1--patch-1
steve(a)eicq.org--2004/xetla--main--0.1--patch-2
steve(a)eicq.org--2004/xetla--main--0.1--patch-3
steve(a)eicq.org--2004/xetla--main--0.1--patch-4
steve(a)eicq.org--2004/xetla--main--0.1--patch-5
steve(a)eicq.org--2004/xetla--main--0.1--patch-6
steve(a)eicq.org--2004/xetla--main--0.1--patch-7
steve(a)eicq.org--2004/xetla--main--0.1--patch-8
steve(a)eicq.org--2004/xetla--main--0.1--patch-9
steve(a)eicq.org--2004/xetla--main--0.1--patch-10
steve(a)eicq.org--2004/xetla--main--0.1--patch-11
steve(a)eicq.org--2004/xetla--main--0.1--patch-12
steve(a)eicq.org--2004/xetla--main--0.1--patch-13
steve(a)eicq.org--2004/xetla--main--0.1--patch-14
steve(a)eicq.org--2004/xetla--main--0.1--patch-15
steve(a)eicq.org--2004/xetla--main--0.1--patch-16
steve(a)eicq.org--2004/xetla--main--0.1--patch-17
steve(a)eicq.org--2004/xetla--main--0.1--patch-18
steve(a)eicq.org--2004/xetla--main--0.1--patch-19
steve(a)eicq.org--2004/xetla--main--0.1--patch-20
steve(a)eicq.org--2004/xetla--main--0.1--patch-21
steve(a)eicq.org--2004/xetla--main--0.1--patch-22
steve(a)eicq.org--2004/xetla--main--0.1--patch-23
steve(a)eicq.org--2004/xetla--main--0.1--patch-24
1.1 XEmacs/packages/xemacs-packages/xetla/ChangeLog.d/ChangeLog-1.0
Index: ChangeLog-1.0
===================================================================
# do not edit -- automatically generated by arch changelog
# non-id: automatic-ChangeLog--steve(a)eicq.org--2005/xetla--main--1.0
#
2005-03-30 22:03:25 GMT Steve Youngs <steve(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)eicq.org> base-0
Summary:
tag of steve(a)eicq.org--2005/xetla--main--0.2--version-0
Revision:
xetla--main--1.0--base-0
(automatically generated log message)
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
steve(a)eicq.org--2004/xetla--main--0.1--base-0
steve(a)eicq.org--2004/xetla--main--0.1--patch-1
steve(a)eicq.org--2004/xetla--main--0.1--patch-2
steve(a)eicq.org--2004/xetla--main--0.1--patch-3
steve(a)eicq.org--2004/xetla--main--0.1--patch-4
steve(a)eicq.org--2004/xetla--main--0.1--patch-5
steve(a)eicq.org--2004/xetla--main--0.1--patch-6
steve(a)eicq.org--2004/xetla--main--0.1--patch-7
steve(a)eicq.org--2004/xetla--main--0.1--patch-8
steve(a)eicq.org--2004/xetla--main--0.1--patch-9
steve(a)eicq.org--2004/xetla--main--0.1--patch-10
steve(a)eicq.org--2004/xetla--main--0.1--patch-11
steve(a)eicq.org--2004/xetla--main--0.1--patch-12
steve(a)eicq.org--2004/xetla--main--0.1--patch-13
steve(a)eicq.org--2004/xetla--main--0.1--patch-14
steve(a)eicq.org--2004/xetla--main--0.1--patch-15
steve(a)eicq.org--2004/xetla--main--0.1--patch-16
steve(a)eicq.org--2004/xetla--main--0.1--patch-17
steve(a)eicq.org--2004/xetla--main--0.1--patch-18
steve(a)eicq.org--2004/xetla--main--0.1--patch-19
steve(a)eicq.org--2004/xetla--main--0.1--patch-20
steve(a)eicq.org--2004/xetla--main--0.1--patch-21
steve(a)eicq.org--2004/xetla--main--0.1--patch-22
steve(a)eicq.org--2004/xetla--main--0.1--patch-23
steve(a)eicq.org--2004/xetla--main--0.1--patch-24
steve(a)eicq.org--2005/xetla--main--0.2--base-0
steve(a)eicq.org--2005/xetla--main--0.2--patch-1
steve(a)eicq.org--2005/xetla--main--0.2--patch-2
steve(a)eicq.org--2005/xetla--main--0.2--patch-3
steve(a)eicq.org--2005/xetla--main--0.2--patch-4
steve(a)eicq.org--2005/xetla--main--0.2--patch-5
steve(a)eicq.org--2005/xetla--main--0.2--patch-6
steve(a)eicq.org--2005/xetla--main--0.2--patch-7
steve(a)eicq.org--2005/xetla--main--0.2--version-0
1.1 XEmacs/packages/xemacs-packages/xetla/ChangeLog.d/ChangeLog-1.1
Index: ChangeLog-1.1
===================================================================
# do not edit -- automatically generated by arch changelog
# non-id: automatic-ChangeLog--steve(a)eicq.org--2005/xetla--main--1.1
#
2005-12-24 03:53:37 GMT Steve Youngs <steve(a)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(a)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(a)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(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-10
minor fix, improve handling of killed buffers
modified files:
xetla-core.el
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-10
2005-11-27 03:27:38 GMT Steve Youngs <steve(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)eicq.org> patch-10
Summary:
Merged from hroptatyr(a)sxemacs.org--sxemacs (patch 6-7) -- seal/fix
Revision:
xetla--main--1.1--patch-10
Patches applied:
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-6
new, add support for --seal and --fix commits
* hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-7
fix, minor enhancement to xetla-log-edit-done
modified files:
xetla.el
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-6
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-7
2005-05-26 02:49:43 GMT Steve Youngs <steve(a)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(a)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(a)eicq.org> patch-7
Summary:
Merged from hroptatyr(a)sxemacs.org--sxemacs (patch 4) -- conflict handling
Revision:
xetla--main--1.1--patch-7
Patches applied:
* hroptatyr(a)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(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-4
2005-04-18 03:20:36 GMT Steve Youngs <steve(a)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(a)eicq.org> patch-5
Summary:
Merged from hroptatyr(a)sxemacs.org--sxemacs (patch 2) -- fix tla add
Revision:
xetla--main--1.1--patch-5
Patches applied:
* hroptatyr(a)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(a)sxemacs.org--sxemacs/xetla--hrop--1.1--patch-2
2005-04-09 02:52:17 GMT Steve Youngs <steve(a)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(a)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(a)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(a)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(a)eicq.org> base-0
Summary:
tag of steve(a)eicq.org--2005/xetla--main--1.0--version-0
Revision:
xetla--main--1.1--base-0
(automatically generated log message)
new patches:
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--base-0
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-1
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-2
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-3
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-4
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-5
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-6
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-7
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-8
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-9
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-10
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-11
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-12
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-13
hroptatyr(a)sxemacs.org--sxemacs/xetla--hrop--0.1--patch-14
steve(a)eicq.org--2004/xetla--main--0.1--base-0
steve(a)eicq.org--2004/xetla--main--0.1--patch-1
steve(a)eicq.org--2004/xetla--main--0.1--patch-2
steve(a)eicq.org--2004/xetla--main--0.1--patch-3
steve(a)eicq.org--2004/xetla--main--0.1--patch-4
steve(a)eicq.org--2004/xetla--main--0.1--patch-5
steve(a)eicq.org--2004/xetla--main--0.1--patch-6
steve(a)eicq.org--2004/xetla--main--0.1--patch-7
steve(a)eicq.org--2004/xetla--main--0.1--patch-8
steve(a)eicq.org--2004/xetla--main--0.1--patch-9
steve(a)eicq.org--2004/xetla--main--0.1--patch-10
steve(a)eicq.org--2004/xetla--main--0.1--patch-11
steve(a)eicq.org--2004/xetla--main--0.1--patch-12
steve(a)eicq.org--2004/xetla--main--0.1--patch-13
steve(a)eicq.org--2004/xetla--main--0.1--patch-14
steve(a)eicq.org--2004/xetla--main--0.1--patch-15
steve(a)eicq.org--2004/xetla--main--0.1--patch-16
steve(a)eicq.org--2004/xetla--main--0.1--patch-17
steve(a)eicq.org--2004/xetla--main--0.1--patch-18
steve(a)eicq.org--2004/xetla--main--0.1--patch-19
steve(a)eicq.org--2004/xetla--main--0.1--patch-20
steve(a)eicq.org--2004/xetla--main--0.1--patch-21
steve(a)eicq.org--2004/xetla--main--0.1--patch-22
steve(a)eicq.org--2004/xetla--main--0.1--patch-23
steve(a)eicq.org--2004/xetla--main--0.1--patch-24
steve(a)eicq.org--2005/xetla--main--0.2--base-0
steve(a)eicq.org--2005/xetla--main--0.2--patch-1
steve(a)eicq.org--2005/xetla--main--0.2--patch-2
steve(a)eicq.org--2005/xetla--main--0.2--patch-3
steve(a)eicq.org--2005/xetla--main--0.2--patch-4
steve(a)eicq.org--2005/xetla--main--0.2--patch-5
steve(a)eicq.org--2005/xetla--main--0.2--patch-6
steve(a)eicq.org--2005/xetla--main--0.2--patch-7
steve(a)eicq.org--2005/xetla--main--0.2--version-0
steve(a)eicq.org--2005/xetla--main--1.0--base-0
steve(a)eicq.org--2005/xetla--main--1.0--patch-1
steve(a)eicq.org--2005/xetla--main--1.0--patch-2
steve(a)eicq.org--2005/xetla--main--1.0--patch-3
steve(a)eicq.org--2005/xetla--main--1.0--patch-4
steve(a)eicq.org--2005/xetla--main--1.0--patch-5
steve(a)eicq.org--2005/xetla--main--1.0--patch-6
steve(a)eicq.org--2005/xetla--main--1.0--patch-7
steve(a)eicq.org--2005/xetla--main--1.0--version-0
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/12/24 23:50:54
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1387 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1386
retrieving revision 1.1387
diff -u -p -r1.1386 -r1.1387
--- version.sh 2005/12/23 22:51:11 1.1386
+++ version.sh 2005/12/24 22:50:54 1.1387
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051223)"
+xemacs_extra_name="(+CVS-20051224)"
xemacs_release_date="2005-12-19"
- 1 participants
- 0 comments
CVS update by aidan xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: aidan
Date: 05/12/24 23:31:55
Modified: xemacs/src ChangeLog objects-x.c
Log:
Revert a couple of changes from those last commits.
Revision Changes Path
1.716 +6 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.715
retrieving revision 1.716
diff -u -p -r1.715 -r1.716
--- ChangeLog 2005/12/24 21:59:18 1.715
+++ ChangeLog 2005/12/24 22:31:47 1.716
＠＠ -1,5 +1,11 ＠＠
2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+ * mule/chinese.el:
+ * mule/chinese.el ('euc-china): Removed. Shouldn't have been
+ uncommented in the first place.
+
+2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
* mule/mule-cmds.el (set-language-environment-coding-systems):
* mule/mule-cmds.el (init-locale-at-early-startup):
Call set-current-locale (the wrapper for setlocale(3)) before
1.12 +0 -2 XEmacs/xemacs/lisp/mule/chinese.el
Index: chinese.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/chinese.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- chinese.el 2005/12/24 21:24:27 1.11
+++ chinese.el 2005/12/24 22:31:51 1.12
＠＠ -266,8 +266,6 ＠＠ G1: Chinese-GB2312
G2: Sisheng (PinYin - ZhuYin)"
))
-(define-coding-system-alias 'euc-china 'chinese-iso-8bit)
-
;; For consistency with euc-jp, euc-ko
(define-coding-system-alias 'euc-cn 'cn-gb-2312)
1.915 +7 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -p -r1.914 -r1.915
--- ChangeLog 2005/12/24 19:53:59 1.914
+++ ChangeLog 2005/12/24 22:31:52 1.915
＠＠ -1,5 +1,12 ＠＠
2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+ * objects-x.c (x_font_instance_truename):
+ * objects-x.c (x_find_charset_font):
+ Reintroduce my change of 2005-12-20 and Stephen's of 2005-12-23,
+ which my last commit overrode.
+
+2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
* event-Xt.c:
Add two new lisp variables, x-us-keymap-description and
x-us-keymap-first-keycode to better provide a fallback to the US
1.35 +4 -3 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- objects-x.c 2005/12/24 17:33:34 1.34
+++ objects-x.c 2005/12/24 22:31:53 1.35
＠＠ -808,7 +808,8 ＠＠ x_font_instance_truename (Lisp_Font_Inst
FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern);
if (res)
{
- FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res));
+ FONT_INSTANCE_TRUENAME (f) =
+ build_ext_string (res, Qxft_font_name_encoding);
free (res);
return FONT_INSTANCE_TRUENAME (f);
}
＠＠ -1176,7 +1177,7 ＠＠ x_find_charset_font (Lisp_Object device,
Extbyte **names;
int count = 0;
const Extbyte *patternext;
- Lisp_Object result = Qunbound;
+ Lisp_Object result = Qnil;
int i;
/* #### with Xft need to handle second stage here -- sjt
＠＠ -1442,7 +1443,7 ＠＠ x_find_charset_font (Lisp_Object device,
if (x_font_spec_matches_charset (XDEVICE (device), charset,
intname, Qnil, 0, -1, 0))
{
- result = make_string (intname, intlen);
+ result = build_ext_string (intname, Qx_font_name_encoding);
break;
}
}
- 1 participants
- 0 comments