[PATCH COMMIT] Tramp 2.0.47 sync
19 years, 11 months
Michael Albinus
Michael Albinus
Hello,
I've committed the following Tramp patch to CVS. It upgrades Tramp from
2.0.46 to 2.0.47.
Best regards, Michael.
- 1 participants
- 0 comments
[R21.4] Mac OS X workaround in mule-tests.el
19 years, 11 months
Stephen J. Turnbull
Stephen J. Turnbull
RECOMMEND 21.4
Mac OS X doesn't accept anything but UTF-8 AFAICT, so needs to be
special-cased in this test.
Not for 21.5, I'm working on converting the Lispish regression tests
to a common package. Having surprisingly little version-specific
trouble, too, considering Martin's misgivings.
Index: tests/ChangeLog
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.2.2.37
diff -u -r1.2.2.37 ChangeLog
--- ChangeLog 2004/12/06 01:08:35 1.2.2.37
+++ ChangeLog 2005/01/13 19:09:54
＠＠ -0,0 +1,5 ＠＠
+2005-01-14 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/mule-tests.el (file-system character conversion):
+ Improve Mac OS X compatibility.
+
Index: tests/automated/mule-tests.el
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/tests/automated/mule-tests.el,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 mule-tests.el
--- mule-tests.el 2004/04/20 02:56:39 1.2.2.2
+++ mule-tests.el 2005/01/13 16:26:47
＠＠ -304,6 +304,12 ＠＠
;; This is how you suppress output from `message', called by `write-region'
(flet ((append-message (&rest args) ()))
(Assert (not (equal name1 name2)))
+ ;; Kludge to handle Mac OS X which groks only UTF-8.
+ (cond ((eq system-type 'darwin)
+ (Check-Error-Message 'file-error "Opening output file"
+ (write-region (point-min) (point-max) name1))
+ (require 'un-define)
+ (setq file-name-coding-system 'utf-8)))
(Assert (not (file-exists-p name1)))
(write-region (point-min) (point-max) name1)
(Assert (file-exists-p name1))
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 2 participants
- 1 comments
[R21.4] Minor doc and code clarity improvements in regex.c
19 years, 11 months
Stephen J. Turnbull
Stephen J. Turnbull
RECOMMEND 21.4
Minor, but any clarity in the regex.c code is a worthwhile improvement
IMHO.
Built successfully and tested (make check passes 100% with the
previous patch's new tests/automated test on Mac OS X 10.3.7).
Index: src/ChangeLog
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.83
diff -u -r1.290.2.83 ChangeLog
--- src/ChangeLog 2005/01/11 02:02:11 1.290.2.83
+++ src/ChangeLog 2005/01/13 12:24:53
＠＠ -0,0 +1,19 ＠＠
+2005-01-13 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ Documentation, code clarification, and warning suppression.
+
+ * regex.c (regex_compile):
+ Improve comments.
+ (re_match_2_internal):
+ Improve comments and avoid redundant braces. [Most of the big hunk
+ at l. 4710 is indentation; use diff -w to see the real changes.]
+ (alt_match_null_string_p):
+ (common_op_match_null_string_p):
+ Avoid shadowing global on Mac OS X 10.4, at least.
+
+2004-09-08 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * regex.c (regcomp): Fix "unsigned comparison" warning (maybe
+ introduced with shy groups fix). [Already applied, probably
+ with the second "fix shy groups" patch of 2004-10-07.]
+
Index: src/regex.c
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.25.2.10
diff -u -r1.25.2.10 regex.c
--- src/regex.c 2004/10/08 00:40:33 1.25.2.10
+++ src/regex.c 2005/01/13 12:22:03
＠＠ -1994,6 +1994,7 ＠＠
bufp->re_nsub = 0;
bufp->re_ngroups = 0;
+ /* Allocate index translation array if needed. */
if (bufp->external_to_internal_register == 0)
{
bufp->external_to_internal_register_size = INIT_REG_TRANSLATE_SIZE;
＠＠ -2002,6 +2003,7 ＠＠
int);
}
+ /* Initialize translations to impossible value to aid debugging. */
{
int i;
＠＠ -2614,6 +2616,8 ＠＠
r = ++regnum;
bufp->re_ngroups++;
if (!shy)
+ /* Record the translation from capturing group index to
+ register number, reallocating table as needed. */
{
bufp->re_nsub++;
while (bufp->external_to_internal_register_size <=
＠＠ -4710,62 +4714,62 ＠＠
succeed_label:
DEBUG_PRINT1 ("Accepting match.\n");
- /* If caller wants register contents data back, do it. */
- {
- int num_nonshy_regs = bufp->re_nsub + 1;
- if (regs && !bufp->no_sub)
- {
- /* Have the register data arrays been allocated? */
- if (bufp->regs_allocated == REGS_UNALLOCATED)
- { /* No. So allocate them with malloc. We need one
- extra element beyond `num_regs' for the `-1' marker
- GNU code uses. */
- regs->num_regs = MAX (RE_NREGS, num_nonshy_regs + 1);
- regs->start = TALLOC (regs->num_regs, regoff_t);
- regs->end = TALLOC (regs->num_regs, regoff_t);
- if (regs->start == NULL || regs->end == NULL)
- {
- FREE_VARIABLES ();
- return -2;
- }
- bufp->regs_allocated = REGS_REALLOCATE;
- }
- else if (bufp->regs_allocated == REGS_REALLOCATE)
- { /* Yes. If we need more elements than were already
- allocated, reallocate them. If we need fewer, just
- leave it alone. */
- if (regs->num_regs < num_nonshy_regs + 1)
- {
- regs->num_regs = num_nonshy_regs + 1;
- RETALLOC (regs->start, regs->num_regs, regoff_t);
- RETALLOC (regs->end, regs->num_regs, regoff_t);
- if (regs->start == NULL || regs->end == NULL)
- {
- FREE_VARIABLES ();
- return -2;
- }
- }
- }
- else
- {
- /* The braces fend off a "empty body in an else-statement"
- warning under GCC when assert expands to nothing. */
- assert (bufp->regs_allocated == REGS_FIXED);
- }
+ /* If caller wants register contents data back, fill REGS. */
+ if (regs && !bufp->no_sub)
+ {
+ int num_nonshy_regs = bufp->re_nsub + 1;
+ /* Have the register data arrays been allocated? */
+ if (bufp->regs_allocated == REGS_UNALLOCATED)
+ { /* No. So allocate them with malloc. We need one
+ extra element beyond `num_regs' for the `-1' marker
+ GNU code uses. */
+ regs->num_regs = MAX (RE_NREGS, num_nonshy_regs + 1);
+ regs->start = TALLOC (regs->num_regs, regoff_t);
+ regs->end = TALLOC (regs->num_regs, regoff_t);
+ if (regs->start == NULL || regs->end == NULL)
+ {
+ FREE_VARIABLES ();
+ return -2;
+ }
+ bufp->regs_allocated = REGS_REALLOCATE;
+ }
+ else if (bufp->regs_allocated == REGS_REALLOCATE)
+ { /* Yes. If we need more elements than were already
+ allocated, reallocate them. If we need fewer, just
+ leave it alone. */
+ if (regs->num_regs < num_nonshy_regs + 1)
+ {
+ regs->num_regs = num_nonshy_regs + 1;
+ RETALLOC (regs->start, regs->num_regs, regoff_t);
+ RETALLOC (regs->end, regs->num_regs, regoff_t);
+ if (regs->start == NULL || regs->end == NULL)
+ {
+ FREE_VARIABLES ();
+ return -2;
+ }
+ }
+ }
+ else
+ {
+ /* The braces fend off a "empty body in an else-statement"
+ warning under GCC when assert expands to nothing. */
+ assert (bufp->regs_allocated == REGS_FIXED);
+ }
- /* Convert the pointer data in `regstart' and `regend' to
- indices. Register zero has to be set differently,
- since we haven't kept track of any info for it. */
- if (regs->num_regs > 0)
- {
- regs->start[0] = pos;
- regs->end[0] = (MATCHING_IN_FIRST_STRING
- ? ((regoff_t) (d - string1))
- : ((regoff_t) (d - string2 + size1)));
- }
+ /* Convert the pointer data in `regstart' and `regend' to
+ indices. Register zero has to be set differently,
+ since we haven't kept track of any info for it. */
+ if (regs->num_regs > 0)
+ {
+ regs->start[0] = pos;
+ regs->end[0] = (MATCHING_IN_FIRST_STRING
+ ? ((regoff_t) (d - string1))
+ : ((regoff_t) (d - string2 + size1)));
+ }
- /* Go through the first `min (num_regs, regs->num_regs)'
- registers, since that is all we initialized. */
+ /* Map over the NUM_NONSHY_REGS non-shy internal registers.
+ Copy each into the corresponding external register.
+ N.B. MCNT indexes external registers. */
for (mcnt = 1;
mcnt < MIN (num_nonshy_regs, regs->num_regs);
mcnt++)
＠＠ -4783,7 +4787,6 ＠＠
}
}
} /* regs && !bufp->no_sub */
- }
/* If we have regs and the regs structure has more elements than
were in the pattern, set the extra elements to -1. If we
＠＠ -5958,7 +5961,7 ＠＠
static re_bool
group_match_null_string_p (unsigned char **p, unsigned char *end,
- register_info_type *reg_info)
+ register_info_type *register_info)
{
int mcnt;
/* Point to after the args to the start_memory. */
＠＠ -6007,7 +6010,7 ＠＠
its number. */
if (!alt_match_null_string_p (p1, p1 + mcnt - 3,
- reg_info))
+ register_info))
return false;
/* Move to right after this alternative, including the
＠＠ -6036,7 +6039,7 ＠＠
the length of the alternative. */
EXTRACT_NUMBER (mcnt, p1 - 2);
- if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info))
+ if (!alt_match_null_string_p (p1, p1 + mcnt, register_info))
return false;
p1 += mcnt; /* Get past the n-th alternative. */
＠＠ -6051,7 +6054,7 ＠＠
default:
- if (!common_op_match_null_string_p (&p1, end, reg_info))
+ if (!common_op_match_null_string_p (&p1, end, register_info))
return false;
}
} /* while p1 < end */
＠＠ -6066,7 +6069,7 ＠＠
static re_bool
alt_match_null_string_p (unsigned char *p, unsigned char *end,
- register_info_type *reg_info)
+ register_info_type *register_info)
{
int mcnt;
unsigned char *p1 = p;
＠＠ -6086,7 +6089,7 ＠＠
break;
default:
- if (!common_op_match_null_string_p (&p1, end, reg_info))
+ if (!common_op_match_null_string_p (&p1, end, register_info))
return false;
}
} /* while p1 < end */
＠＠ -6102,7 +6105,7 ＠＠
static re_bool
common_op_match_null_string_p (unsigned char **p, unsigned char *end,
- register_info_type *reg_info)
+ register_info_type *register_info)
{
int mcnt;
re_bool ret;
＠＠ -6130,13 +6133,14 ＠＠
case start_memory:
reg_no = *p1;
assert (reg_no > 0 && reg_no <= MAX_REGNUM);
- ret = group_match_null_string_p (&p1, end, reg_info);
+ ret = group_match_null_string_p (&p1, end, register_info);
/* Have to set this here in case we're checking a group which
contains a group and a back reference to it. */
- if (REG_MATCH_NULL_STRING_P (reg_info[reg_no]) == MATCH_NULL_UNSET_VALUE)
- REG_MATCH_NULL_STRING_P (reg_info[reg_no]) = ret;
+ if (REG_MATCH_NULL_STRING_P (register_info[reg_no]) ==
+ MATCH_NULL_UNSET_VALUE)
+ REG_MATCH_NULL_STRING_P (register_info[reg_no]) = ret;
if (!ret)
return false;
＠＠ -6167,7 +6171,7 ＠＠
break;
case duplicate:
- if (!REG_MATCH_NULL_STRING_P (reg_info[*p1]))
+ if (!REG_MATCH_NULL_STRING_P (register_info[*p1]))
return false;
break;
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 2 participants
- 1 comments
[SR21.4] Squash one bug in regex.c
19 years, 11 months
Stephen J. Turnbull
Stephen J. Turnbull
SUPERSEDES RECOMMEND 21.4
Grr. CVS and Mac OS X. The previous patch probably won't apply
because CVS 1.10 doesn't properly set up the file paths except in the
Index: line, which it ignores in favor of the --- line. Grr. Sorry,
caught it in one file but not in the rest.
Not needed in 21.5.
I found one error in my backport of Ben's revision of the shy group
support for 21.5. I don't know if this helps Andrey Slusar's issue;
I'm still trying to figure out exactly how all this stuff works.
Includes the (rather trivial) test that helped me find this bug.
Sorry, Andrey, but would you try applying this patch to see if it
fixes your bug? It's going to be some time before I can take a look
at your full report.
Index: src/ChangeLog
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.83
diff -u -r1.290.2.83 ChangeLog
--- src/ChangeLog 2005/01/11 02:02:11 1.290.2.83
+++ src/ChangeLog 2005/01/13 12:24:53
＠＠ -0,0 +1,7 ＠＠
+2005-01-13 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ Fix backreference bug caught by test suite.
+
+ * regex.c (regex_compile):
+ Make backref duplicate internal register.
+
Index: src/regex.c
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.25.2.10
diff -u -r1.25.2.10 regex.c
--- src/regex.c 2004/10/08 00:40:33 1.25.2.10
+++ src/regex.c 2005/01/13 12:22:03
＠＠ -3053,24 +3057,24 ＠＠
case '6': case '7': case '8': case '9':
{
int reg;
+
if (syntax & RE_NO_BK_REFS)
goto normal_char;
+ /* External register indexing. */
reg = c - '0';
if (reg > bufp->re_nsub)
FREE_STACK_RETURN (REG_ESUBREG);
- {
- int regint = bufp->external_to_internal_register[reg];
- /* Can't back reference to a subexpression if inside it. */
- if (group_in_compile_stack (compile_stack, regint))
- {
- goto normal_char;
- }
- }
+ /* Convert external to internal as soon as possible. */
+ reg = bufp->external_to_internal_register[reg];
+ /* Can't back reference to a subexpression if inside it. */
+ if (group_in_compile_stack (compile_stack, reg))
+ goto normal_char;
+
laststart = buf_end;
BUF_PUSH_2 (duplicate, reg);
}
Index: tests/ChangeLog
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.2.2.37
diff -u -r1.2.2.37 ChangeLog
--- tests/ChangeLog 2004/12/06 01:08:35 1.2.2.37
+++ tests/ChangeLog 2005/01/12 21:33:37
＠＠ -0,0 +1,5 ＠＠
+2005-01-13 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/regexp-tests.el:
+ Test trivial subpatterns and backreferences with shy groups.
+
Index: tests/automated/regexp-tests.el
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/tests/automated/regexp-tests.el,v
retrieving revision 1.2.2.8
diff -u -r1.2.2.8 regexp-tests.el
--- tests/automated/regexp-tests.el 2004/10/08 00:40:38 1.2.2.8
+++ tests/automated/regexp-tests.el 2005/01/12 21:33:03
＠＠ -414,3 +414,33 ＠＠
(Assert (null (match-string 4 text))) ; nil
)
+;; trivial subpatterns and backreferences with shy groups
+(let ((text1 "abb")
+ (text2 "aba")
+ (re0 "\\(a\\)\\(b\\)\\2")
+ (re1 "\\(?:a\\)\\(b\\)\\2")
+ (re2 "\\(?:a\\)\\(b\\)\\1")
+ (re3 "\\(a\\)\\(?:b\\)\\1"))
+
+ (Assert (eq 0 (string-match re0 text1)))
+ (Assert (string= text1 (match-string 0 text1)))
+ (Assert (string= "a" (match-string 1 text1)))
+ (Assert (string= "b" (match-string 2 text1)))
+ (Assert (null (string-match re0 text2)))
+
+ (Check-Error-Message 'invalid-regexp "Invalid back reference"
+ (string-match re1 text1))
+
+ (Assert (eq 0 (string-match re2 text1)))
+ (Assert (string= text1 (match-string 0 text1)))
+ (Assert (string= "b" (match-string 1 text1)))
+ (Assert (null (match-string 2 text1)))
+ (Assert (null (string-match re2 text2)))
+
+ (Assert (null (string-match re3 text1)))
+ (Assert (eq 0 (string-match re3 text2)))
+ (Assert (string= text2 (match-string 0 text2)))
+ (Assert (string= "a" (match-string 1 text2)))
+ (Assert (null (match-string 2 text2)))
+)
+
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 3 participants
- 2 comments
Support multiple package directories per phase
19 years, 11 months
Michael Sperber
Michael Sperber
This should fix the problem reported by Malcolm Purvis. I'll commit
sometime next week if nobody objects.
2005-01-08 Mike Sperber <mike(a)xemacs.org>
* packages.el (packages-find-installation-package-directories): Add.
* find-paths.el (paths-for-each-emacs-directory): Abstract FUNC
parameter out of `paths-find-emacs-directory'.
(paths-find-emacs-directories): Add.
(paths-find-emacs-directory): Redefine in terms of
`paths-for-each-emacs-directory'.
(paths-for-each-site-directory): Add.
(paths-find-site-directory): Redefine in terms of
`paths-for-each-site-directory'.
(paths-find-site-directories): Add.
(paths-for-each-version-directory): Add.
(paths-find-version-directory): Redefine in terms of
`paths-for-each-version-directory'.
(paths-find-version-directories): Add.
Index: lisp/packages.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/packages.el,v
retrieving revision 1.51
diff -u -r1.51 packages.el
--- lisp/packages.el 27 Dec 2004 12:25:14 -0000 1.51
+++ lisp/packages.el 8 Jan 2005 11:46:08 -0000
＠＠ -376,11 +376,8 ＠＠
(defun packages-find-installation-package-directories (roots)
"Find the package directories in the XEmacs installation.
ROOTS is a list of installation roots."
- (let ((version-directory (paths-find-version-directory roots "" nil nil t))
- (site-directory (paths-find-site-directory roots "")))
- (paths-uniq-append
- (and version-directory (list version-directory))
- (and site-directory (list site-directory)))))
+ (paths-uniq-append (paths-find-version-directories roots "" nil nil t)
+ (paths-find-site-directories roots "")))
(defun packages-find-package-hierarchies (package-directories &optional default)
"Find package hierarchies in a list of package directories.
Index: lisp/find-paths.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/find-paths.el,v
retrieving revision 1.28
diff -u -r1.28 find-paths.el
--- lisp/find-paths.el 27 Dec 2004 12:25:14 -0000 1.28
+++ lisp/find-paths.el 8 Jan 2005 11:46:08 -0000
＠＠ -136,9 +136,13 ＠＠
suffix
base))))
-(defun paths-find-emacs-directory (roots suffix base
- &optional envvar default keep-suffix)
- "Find a directory in the XEmacs hierarchy.
+
+(defun paths-for-each-emacs-directory (func
+ roots suffix base
+ &optional envvar default keep-suffix)
+ "Iterate over directories in the XEmacs hierarchy.
+FUNC is a function that called for each directory, with the directory
+as the only argument.
ROOTS must be a list of installation roots.
SUFFIX is the subdirectory from there.
BASE is the base to look for.
＠＠ -152,20 +156,56 ＠＠
(if (and preferred-value
(paths-file-readable-directory-p preferred-value))
(file-name-as-directory preferred-value)
- (catch 'gotcha
- (while roots
- (let* ((root (car roots))
- ;; installed
- (path (paths-construct-emacs-directory root suffix base)))
- (if (paths-file-readable-directory-p path)
- (throw 'gotcha path)
- ;; in-place
- (if (null keep-suffix)
- (let ((path (paths-construct-emacs-directory root "" base)))
- (if (paths-file-readable-directory-p path)
- (throw 'gotcha path))))))
- (setq roots (cdr roots)))
- nil))))
+ (while roots
+ (let* ((root (car roots))
+ ;; installed
+ (path (paths-construct-emacs-directory root suffix base)))
+ (if (paths-file-readable-directory-p path)
+ (funcall func path)
+ ;; in-place
+ (if (null keep-suffix)
+ (let ((path (paths-construct-emacs-directory root "" base)))
+ (if (paths-file-readable-directory-p path)
+ (funcall func path))))))
+ (setq roots (cdr roots))))))
+
+(defun paths-find-emacs-directories (roots
+ suffix base
+ &optional envvar default keep-suffix)
+ "Find a list of directories in the XEmacs hierarchy.
+ROOTS must be a list of installation roots.
+SUFFIX is the subdirectory from there.
+BASE is the base to look for.
+ENVVAR is the name of the environment variable that might also
+specify the directory.
+DEFAULT is the preferred value.
+If KEEP-SUFFIX is non-nil, the suffix must be respected in searching
+the directory."
+ (let ((l '()))
+ (paths-for-each-emacs-directory #'(lambda (dir)
+ (setq l (cons dir l)))
+ roots
+ suffix base
+ envvar default keep-suffix)
+ (reverse l)))
+
+(defun paths-find-emacs-directory (roots suffix base
+ &optional envvar default keep-suffix)
+ "Find a directory in the XEmacs hierarchy.
+ROOTS must be a list of installation roots.
+SUFFIX is the subdirectory from there.
+BASE is the base to look for.
+ENVVAR is the name of the environment variable that might also
+specify the directory.
+DEFAULT is the preferred value.
+If KEEP-SUFFIX is non-nil, the suffix must be respected in searching
+the directory."
+ (catch 'gotcha
+ (paths-for-each-emacs-directory #'(lambda (dir)
+ (throw 'gotcha dir))
+ roots
+ suffix base
+ envvar default keep-suffix)))
(defun paths-find-site-directory (roots base &optional envvar default)
"Find a site-specific directory in the XEmacs hierarchy.
＠＠ -182,10 +222,24 ＠＠
base
envvar default))
+(defun paths-find-site-directories (roots base &optional envvar default)
+ "Find a list of site-specific directories in the XEmacs hierarchy.
+ROOT must be a an installation root.
+BASE is the base to look for.
+ENVVAR is the name of the environment variable that might also
+specify the directory.
+DEFAULT is the preferred value."
+ (paths-find-emacs-directories roots
+ (file-name-as-directory
+ (paths-construct-path (list
+ "lib"
+ emacs-program-name)))
+ base
+ envvar default))
+
(defun paths-find-version-directory (roots base
&optional envvar default enforce-version)
"Find a version-specific directory in the XEmacs hierarchy.
-
ROOT must be a an installation root.
BASE is the base to look for.
ENVVAR is the name of the environment variable that might also
＠＠ -200,6 +254,24 ＠＠
base
envvar default
enforce-version))
+
+(defun paths-find-version-directories (roots base
+ &optional envvar default enforce-version)
+ "Find a list of version-specific directories in the XEmacs hierarchy.
+ROOT must be a an installation root.
+BASE is the base to look for.
+ENVVAR is the name of the environment variable that might also
+specify the directory.
+DEFAULT is the preferred value.
+If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version."
+ (paths-find-emacs-directories roots
+ (file-name-as-directory
+ (paths-construct-path
+ (list "lib"
+ (construct-emacs-version-name))))
+ base
+ envvar default
+ enforce-version))
(defun paths-find-architecture-directory (roots base &optional envvar default)
"Find an architecture-specific directory in the XEmacs hierarchy.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
- 1 participants
- 1 comments
[PACKAGES (dired)] Fix dired for SXEmacs
19 years, 11 months
Steve Youngs
Steve Youngs
Hi Mike!
This or similar is needed to be able to run Dired in SXEmacs. The
reason is because, in SXEmacs, the variable, `emacs-version' has a
value like...
"steve(a)sxemacs.org--2005/sxemacs--main--22.1.1--patch-15"
The others, `emacs-*-version' have what you'd expect...
emacs-major-version => 22
emacs-minor-version => 1
emacs-beta-version => 1
I have tried very hard to maintain the current semantics so that this
patch doesn't affect _any_ currently supported emacsen.
Mike, it would be great if you could include this in you next Dired
release.
(a similar patch to EFS will follow in a moment)
dired patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: dired.el diff.el
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/ChangeLog,v
retrieving revision 1.19
diff -u -U0 -r1.19 ChangeLog
--- ChangeLog 4 Oct 2004 08:54:24 -0000 1.19
+++ ChangeLog 14 Jan 2005 02:37:37 -0000
＠＠ -0,0 +1,7 ＠＠
+2005-01-14 Steve Youngs <steve(a)sxemacs.org>
+
+ * dired.el: Use `emacs-*-version' variables for finding version
+ information instead of string-matching through `emacs-version'.
+
+ * diff.el (diff-emacs-19-p): Ditto.
+
Index: diff.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/diff.el,v
retrieving revision 1.4
diff -u -u -r1.4 diff.el
--- diff.el 2 Oct 2004 14:06:17 -0000 1.4
+++ diff.el 14 Jan 2005 02:37:23 -0000
＠＠ -72,7 +72,7 ＠＠
;;; Internal variables
(defconst diff-emacs-19-p
- (let ((ver (string-to-int (substring emacs-version 0 2))))
+ (let ((ver emacs-major-version))
(>= ver 19)))
(or diff-emacs-19-p (require 'emacs-19))
Index: dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired.el,v
retrieving revision 1.7
diff -u -u -r1.7 dired.el
--- dired.el 2 Oct 2004 14:06:19 -0000 1.7
+++ dired.el 14 Jan 2005 02:37:25 -0000
＠＠ -80,13 +80,15 ＠＠
;; Testing against the string `Lucid' breaks InfoDock. How many years has
;; it been since Lucid went away?
(let ((lucid-p (string-match "XEmacs" emacs-version))
- ver subver)
- (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
- (error "dired does not work with emacs version %s" emacs-version))
- (setq ver (string-to-int (substring emacs-version (match-beginning 1)
- (match-end 1)))
- subver (string-to-int (substring emacs-version (match-beginning 2)
- (match-end 2))))
+ (ver emacs-major-version)
+ (subver emacs-minor-version))
+ (unless ver
+ (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
+ (error "dired does not work with emacs version %s" emacs-version))
+ (setq ver (string-to-int (substring emacs-version (match-beginning 1)
+ (match-end 1)))
+ subver (string-to-int (substring emacs-version (match-beginning 2)
+ (match-end 2)))))
(cond
((= ver 18)
(require 'emacs-19)
＠＠ -6616,11 +6618,12 ＠＠
;;;; --------------------------------------------------------------
(let ((lucid-p (string-match "XEmacs" emacs-version))
- ver)
- (or (string-match "^\\([0-9]+\\)\\." emacs-version)
- (error "Weird emacs version %s" emacs-version))
- (setq ver (string-to-int (substring emacs-version (match-beginning 1)
- (match-end 1))))
+ (ver emacs-major-version))
+ (unless ver
+ (or (string-match "^\\([0-9]+\\)\\." emacs-version)
+ (error "Weird emacs version %s" emacs-version))
+ (setq ver (string-to-int (substring emacs-version (match-beginning 1)
+ (match-end 1)))))
;; Reading with history.
(if (>= ver 19)
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve(a)sxemacs.org>---|
- 2 participants
- 2 comments
[R21.4] Squash one bug in regex.c
19 years, 11 months
Stephen J. Turnbull
Stephen J. Turnbull
RECOMMEND 21.4
Not needed in 21.5.
I found one error in my backport of Ben's revision of the shy group
support for 21.5. I don't know if this helps Andrey Slusar's issue;
I'm still trying to figure out exactly how all this stuff works.
Includes the (rather trivial) test that helped me find this bug.
Sorry, Andrey, but would you try applying this patch to see if it
fixes your bug? It's going to be some time before I can take a look
at your full report.
Index: src/ChangeLog
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.83
diff -u -r1.290.2.83 ChangeLog
--- src/ChangeLog 2005/01/11 02:02:11 1.290.2.83
+++ src/ChangeLog 2005/01/13 12:24:53
＠＠ -0,0 +1,7 ＠＠
+2005-01-13 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ Fix backreference bug caught by test suite.
+
+ * regex.c (regex_compile):
+ Make backref duplicate internal register.
+
Index: src/regex.c
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.25.2.10
diff -u -r1.25.2.10 regex.c
--- regex.c 2004/10/08 00:40:33 1.25.2.10
+++ regex.c 2005/01/13 12:22:03
＠＠ -3053,24 +3057,24 ＠＠
case '6': case '7': case '8': case '9':
{
int reg;
+
if (syntax & RE_NO_BK_REFS)
goto normal_char;
+ /* External register indexing. */
reg = c - '0';
if (reg > bufp->re_nsub)
FREE_STACK_RETURN (REG_ESUBREG);
- {
- int regint = bufp->external_to_internal_register[reg];
- /* Can't back reference to a subexpression if inside it. */
- if (group_in_compile_stack (compile_stack, regint))
- {
- goto normal_char;
- }
- }
+ /* Convert external to internal as soon as possible. */
+ reg = bufp->external_to_internal_register[reg];
+ /* Can't back reference to a subexpression if inside it. */
+ if (group_in_compile_stack (compile_stack, reg))
+ goto normal_char;
+
laststart = buf_end;
BUF_PUSH_2 (duplicate, reg);
}
Index: tests/ChangeLog
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.2.2.37
diff -u -r1.2.2.37 ChangeLog
--- ChangeLog 2004/12/06 01:08:35 1.2.2.37
+++ ChangeLog 2005/01/12 21:33:37
＠＠ -0,0 +1,5 ＠＠
+2005-01-13 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/regexp-tests.el:
+ Test trivial subpatterns and backreferences with shy groups.
+
Index: tests/automated/regexp-tests.el
===================================================================
RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/tests/automated/regexp-tests.el,v
retrieving revision 1.2.2.8
diff -u -r1.2.2.8 regexp-tests.el
--- regexp-tests.el 2004/10/08 00:40:38 1.2.2.8
+++ regexp-tests.el 2005/01/12 21:33:03
＠＠ -414,3 +414,33 ＠＠
(Assert (null (match-string 4 text))) ; nil
)
+;; trivial subpatterns and backreferences with shy groups
+(let ((text1 "abb")
+ (text2 "aba")
+ (re0 "\\(a\\)\\(b\\)\\2")
+ (re1 "\\(?:a\\)\\(b\\)\\2")
+ (re2 "\\(?:a\\)\\(b\\)\\1")
+ (re3 "\\(a\\)\\(?:b\\)\\1"))
+
+ (Assert (eq 0 (string-match re0 text1)))
+ (Assert (string= text1 (match-string 0 text1)))
+ (Assert (string= "a" (match-string 1 text1)))
+ (Assert (string= "b" (match-string 2 text1)))
+ (Assert (null (string-match re0 text2)))
+
+ (Check-Error-Message 'invalid-regexp "Invalid back reference"
+ (string-match re1 text1))
+
+ (Assert (eq 0 (string-match re2 text1)))
+ (Assert (string= text1 (match-string 0 text1)))
+ (Assert (string= "b" (match-string 1 text1)))
+ (Assert (null (match-string 2 text1)))
+ (Assert (null (string-match re2 text2)))
+
+ (Assert (null (string-match re3 text1)))
+ (Assert (eq 0 (string-match re3 text2)))
+ (Assert (string= text2 (match-string 0 text2)))
+ (Assert (string= "a" (match-string 1 text2)))
+ (Assert (null (match-string 2 text2)))
+)
+
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 1 participants
- 0 comments
[PACKAGES (efs)] Fix EFS for SXEmacs
19 years, 11 months
Steve Youngs
Steve Youngs
Hi Mike!
Here's the EFS version of the Dired patch I just sent.
Could you please add this to your next release.
Thanks.
efs patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: efs-fnh.el
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/efs/ChangeLog,v
retrieving revision 1.41
diff -u -U0 -r1.41 ChangeLog
--- ChangeLog 4 Oct 2004 08:54:56 -0000 1.41
+++ ChangeLog 14 Jan 2005 02:43:10 -0000
＠＠ -0,0 +1,6 ＠＠
+2005-01-14 Steve Youngs <steve(a)sxemacs.org>
+
+ * efs-fnh.el (efs-handle-emacs-version): Use `emacs-*-version'
+ variables for version info instead of string-matching through
+ `emacs-version'.
+
Index: efs-fnh.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/efs/efs-fnh.el,v
retrieving revision 1.13
diff -u -u -r1.13 efs-fnh.el
--- efs-fnh.el 2 Oct 2004 14:06:00 -0000 1.13
+++ efs-fnh.el 14 Jan 2005 02:42:59 -0000
＠＠ -36,15 +36,17 ＠＠
(let ((ehev-match-data (match-data)))
(unwind-protect
(let ((xemacsp (string-match "XEmacs" emacs-version))
- ver subver)
- (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
- (error "efs does not work with emacs version %s" emacs-version))
- (setq ver (string-to-int (substring emacs-version
- (match-beginning 1)
- (match-end 1)))
- subver (string-to-int (substring emacs-version
- (match-beginning 2)
- (match-end 2))))
+ (ver emacs-major-version)
+ (subver emacs-minor-version))
+ (unless ver
+ (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
+ (error "efs does not work with emacs version %s" emacs-version))
+ (setq ver (string-to-int (substring emacs-version
+ (match-beginning 1)
+ (match-end 1)))
+ subver (string-to-int (substring emacs-version
+ (match-beginning 2)
+ (match-end 2)))))
(cond
;; XEmacs (emacs-version looks like \"19.xx XEmacs\")
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve(a)sxemacs.org>---|
- 1 participants
- 0 comments
[PACKAGES (eshell)] A more rational test for XEmacs-ness
19 years, 11 months
Steve Youngs
Steve Youngs
I gotta admit, this is the first time I've seen xemacs-logo used to
determine if the running emacs is XEmacs or not. :-)
Of course, an added side benefit to this patch is that it makes Eshell
usable on SXEmacs.
John, would you like me to commit this to the XEmacs CVS repo?
eshell patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: esh-util.el
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/eshell/ChangeLog,v
retrieving revision 1.21
diff -u -U0 -r1.21 ChangeLog
--- ChangeLog 29 Jun 2004 05:16:48 -0000 1.21
+++ ChangeLog 13 Jan 2005 22:14:27 -0000
＠＠ -0,0 +1,6 ＠＠
+2005-01-14 Steve Youngs <steve(a)sxemacs.org>
+
+ * esh-util.el (eshell-under-xemacs-p): Do a featurep test for
+ `xemacs' or `sxemacs' instead of testing whether or not
+ `xemacs-logo' is bound.
+
Index: esh-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/eshell/esh-util.el,v
retrieving revision 1.2
diff -u -u -r1.2 esh-util.el
--- esh-util.el 29 Jun 2004 04:57:54 -0000 1.2
+++ esh-util.el 13 Jan 2005 22:14:15 -0000
＠＠ -129,7 +129,7 ＠＠
(defsubst eshell-under-xemacs-p ()
"Return non-nil if we are running under XEmacs."
- (boundp 'xemacs-logo))
+ (or (featurep 'xemacs) (featurep 'sxemacs)))
(defsubst eshell-under-windows-p ()
"Return non-nil if we are running under MS-DOS/Windows."
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve(a)sxemacs.org>---|
- 2 participants
- 2 comments
[PACKAGES (text-modes)] Make removing blank lines in crontabs optional
19 years, 11 months
Steve Youngs
Steve Youngs
This is one of those things that have annoyed me since the dawn of
time.
Is there such a thing as a cron that doesn't like blank lines in
crontab files? Just in case I made it customisable (default retaining
old behaviour)
text-modes patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: crontab.el
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/ChangeLog,v
retrieving revision 1.140
diff -u -U0 -r1.140 ChangeLog
--- ChangeLog 26 Nov 2004 08:05:35 -0000 1.140
+++ ChangeLog 9 Jan 2005 04:47:37 -0000
＠＠ -0,0 +1,6 ＠＠
+2005-01-09 Steve Youngs <steve(a)sxemacs.org>
+
+ * crontab.el (crontab-delete-blank-lines): New. To make deleting
+ blank lines in crontab files optional.
+ (crontab-save): Use it.
+
Index: crontab.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/crontab.el,v
retrieving revision 1.2
diff -u -u -r1.2 crontab.el
--- crontab.el 6 Oct 2000 09:27:59 -0000 1.2
+++ crontab.el 9 Jan 2005 04:47:27 -0000
＠＠ -61,6 +61,10 ＠＠
:type 'boolean
:group 'crontab)
+(defcustom crontab-delete-blank-lines t
+ "*Non-nil means to delete any blank lines in the crontab file on save."
+:type 'boolean
+:group 'crontab)
;;; Interactive Function called to edit a Crontab Entry. It is called
;;; instead of crontab-edit to allow for future automatic entries.
＠＠ -118,11 +122,12 ＠＠
(defun crontab-save ()
"Submit the edited crontab to the cron daemon for processing."
- (goto-char (point-min))
- (while (not (eobp))
- (delete-blank-lines)
- (forward-line 1))
- (redraw-display)
+ (when crontab-delete-blank-lines
+ (goto-char (point-min))
+ (while (not (eobp))
+ (delete-blank-lines)
+ (forward-line 1))
+ (redraw-display))
(setq write-file-hooks nil)
(let ((crontab-buffer (buffer-name)))
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve(a)sxemacs.org>---|
- 2 participants
- 2 comments