[PATCH perl-modes] Sync cperl-mode with upstream 5.23
17 years, 7 months
Ville Skyttä
I've synced cperl-mode with upstream 5.23, appears to work fine here (and has
much faster syntax highlighting than earlier versions). The diff is about
220kB uncompressed, so attached is a gzipped version.
The vast majority of XEmacs customizations have been integrated upstream, and
I reverted some cosmetic "RMS Emacs" -> "Emacs" changes because the former is
the way upstream appears to want it spelled, and following that makes future
syncs easier.
I intend to commit early next week unless there are objections.
2007-05-27 Ville Skyttä <scop(a)xemacs.org>
* cperl-mode.el: Sync with upstream version 5.23.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH psgml] Sync with upstream 1.3.2
17 years, 7 months
Ville Skyttä
Here's a sync of psgml with upstream 1.3.2 plus a couple of trivial changes to
psgml-html.el. Will commit early next week unless there are objections.
2007-05-26 Ville Skyttä <scop(a)xemacs.org>
* Sync with upstream 1.3.2.
* psgml-ids.el: New.
* Makefile: Update FSF's address.
(AUTHOR_VERSION): 1.3.2.
(ELCS): Add psgml-ids.elc.
* package-info.in (provides): Add psgml-ids.
* psgml-html.el (sgml-html-netscape-file): Use browse-url.
(sgml-html-kfm-file): Ditto.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] xemacs-21.5-clean: Downcase words in `expand-region-abbrevs' before lookup, like other functions do
17 years, 7 months
Adrian Aichner
I'd like to suggest following harmonizing change.
It still leaves the issue of making expansion case depend on case of
abbreviation expanded.
Might be worth the bring abbrev case handling in line with the
seemingly superior handling of case in dabbrev.
Suggestions from heavy d?abbreviation users?
Adrian
xemacs-21.5-clean ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: lisp/ChangeLog
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.802
diff -u -U0 -r1.802 ChangeLog
--- lisp/ChangeLog 25 May 2007 15:47:55 -0000 1.802
+++ lisp/ChangeLog 28 May 2007 22:57:12 -0000
＠＠ -0,0 +1,7 ＠＠
+2007-05-29 Adrian Aichner <adrian(a)xemacs.org>
+
+ * abbrev.el (expand-region-abbrevs): Downcase word before
+ abbreviation lookup, since `inverse-add-abbrev', `add-abbrev',
+ `define-mode-abbrev', and `define-global-abbrev' also downcase to
+ normalize abbreviations.
+
xemacs-21.5-clean source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: lisp/abbrev.el
===================================================================
RCS
Index: lisp/abbrev.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/abbrev.el,v
retrieving revision 1.7
diff -u -w -r1.7 abbrev.el
--- lisp/abbrev.el 19 May 2007 18:41:59 -0000 1.7
+++ lisp/abbrev.el 28 May 2007 22:49:18 -0000
＠＠ -582,9 +582,9 ＠＠
(<= (setq pnt (point)) (- (point-max) lim))))
(if (abbrev-expansion
(setq string
- (buffer-substring
+ (downcase (buffer-substring
(save-excursion (backward-word) (point))
- pnt)))
+ pnt))))
(if (or noquery (y-or-n-p (format "Expand `%s'? " string)))
(expand-abbrev)))))))
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH 21.5] Ensure correct finder* is used during build
17 years, 7 months
Ville Skyttä
21.5
Without this patch, if I have already an XEmacs built and installed using the
same paths as the currently being built one (usually the same dir config,
same XEmacs version), the build ends up using finder.el from the installed
dir -- or at least trying to write finder-inf.el there, haven't checked that
closely -- rather than using/writing to the source tree currently being
built.
2007-05-22 Ville Skyttä <scop(a)xemacs.org>
* Makefile.in.in ($(LISP)/finder-inf.el): Set lisp-directory
to $(LISP) to ensure we're working with the correct finder*.
Index: src/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.125
diff -u -r1.125 Makefile.in.in
--- src/Makefile.in.in 23 Apr 2006 16:11:32 -0000 1.125
+++ src/Makefile.in.in 22 May 2007 19:49:51 -0000
＠＠ -649,6 +649,7 ＠＠
＠echo "Building finder database ..."
$(RM) $(LISP)/finder-inf.el
$(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \
+ -eval "(setq lisp-directory \"$(LISP)\")" \
-l finder -f finder-compile-keywords
＠echo "Building finder database ...(done)"
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] Small speed improvement to eval, from Sebastian Freundt
17 years, 7 months
Aidan Kehoe
src/ChangeLog addition:
2007-05-24 Aidan Kehoe <kehoea(a)parhasard.net>
* eval.c (Feval):
Small optimisations from Sebastian Freundt's SXEmacs work; don't
do the unnecessary book-keeping in the trivial cases, only look
for an indirect function if the stored function is a bound
symbol.
XEmacs Trunk source patch:
Diff command: cvs -q diff -Nu
Files affected: src/eval.c
===================================================================
RCS
Index: src/eval.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v
retrieving revision 1.95
diff -u -u -r1.95 eval.c
--- src/eval.c 2007/02/22 16:53:26 1.95
+++ src/eval.c 2007/05/24 07:27:15
＠＠ -3539,6 +3539,16 ＠＠
check_proper_critical_section_lisp_protection ();
#endif
+ if (!CONSP (form))
+ {
+ if (SYMBOLP (form))
+ {
+ return Fsymbol_value (form);
+ }
+
+ return form;
+ }
+
/* I think this is a pretty safe place to call Lisp code, don't you? */
while (!in_warnings && !NILP (Vpending_warnings)
/* well, perhaps not so safe after all! */
＠＠ -3571,14 +3581,6 ＠＠
unbind_to (speccount);
}
- if (!CONSP (form))
- {
- if (SYMBOLP (form))
- return Fsymbol_value (form);
- else
- return form;
- }
-
QUIT;
if (need_to_garbage_collect)
{
＠＠ -3622,7 +3624,13 ＠＠
/* At this point, only original_fun and original_args
have values that will be used below. */
retry:
- fun = indirect_function (original_fun, 1);
+ /* Optimise for no indirection. */
+ fun = original_fun;
+ if (SYMBOLP (fun) && !EQ (fun, Qunbound)
+ && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
+ {
+ fun = indirect_function(original_fun, 1);
+ }
if (SUBRP (fun))
{
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] Make double-free checks 64-bit safe, from Sebastian Freundt
17 years, 7 months
Aidan Kehoe
Original patch here:
http://www.sxemacs.org/list-archives/html/sxemacs-patches/2007-01/msg0000...
This varies quite a bit from that patch, since the 21.5 code is
significantly different.
src/ChangeLog addition:
2007-05-24 Aidan Kehoe <kehoea(a)parhasard.net>
* free-hook.c (check_free):
* lisp.h:
* lisp.h (xfree):
Inspired by some of Sebastian Freundt's SXEmacs work, use a 64-bit
constant on 64-bit platforms when making sure pointers haven't
been freed twice.
XEmacs Trunk source patch:
Diff command: cvs -q diff -Nu
Files affected: src/lisp.h
===================================================================
RCS src/free-hook.c
===================================================================
RCS
Index: src/free-hook.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/free-hook.c,v
retrieving revision 1.13
diff -u -u -r1.13 free-hook.c
--- src/free-hook.c 2005/01/26 10:36:08 1.13
+++ src/free-hook.c 2007/05/24 07:35:03
＠＠ -179,6 +179,8 ＠＠
/ sizeof (long);
unsigned long i;
+ /* Not using the DEADBEEF_CONSTANT #define, since we don't know
+ * that allocation sizes will be multiples of eight. */
for (i = 0; i < long_length; i++)
((unsigned long *) ptr)[i] = 0xdeadbeef;
}
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.144
diff -u -u -r1.144 lisp.h
--- src/lisp.h 2006/11/05 22:31:44 1.144
+++ src/lisp.h 2007/05/24 07:35:05
＠＠ -250,6 +250,14 ＠＠
typedef unsigned long uintptr_t;
#endif
+#if SIZEOF_VOID_P == 8
+#define DEADBEEF_CONSTANT 0xCAFEBABEDEADBEEF
+#elif SIZEOF_VOID_P == 4
+#define DEADBEEF_CONSTANT 0xDEADBEEF
+#else
+#error "What size are your pointers, really?"
+#endif /* SIZEOF_VOID_P == 8 */
+
/* ---------------------- definition of EMACS_INT --------------------- */
/* EMACS_INT is the underlying integral type into which a Lisp_Object must fit.
＠＠ -1084,7 +1092,7 ＠＠
#define xfree(lvalue, type) do \
{ \
xfree_1 (lvalue); \
- VOIDP_CAST (lvalue) = (void *) 0xDEADBEEF; \
+ VOIDP_CAST (lvalue) = (void *) DEADBEEF_CONSTANT; \
} while (0)
#else
#define xfree(lvalue,type) xfree_1 (lvalue)
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC] Print more stuff on -debug-paths
17 years, 7 months
Michael Sperber
2007-05-25 Mike Sperber <mike(a)xemacs.org>
* startup.el (startup-setup-paths): Print the configure-xxx
variables as well.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
Index: lisp/startup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/startup.el,v
retrieving revision 1.57
diff -u -r1.57 startup.el
--- lisp/startup.el 30 Oct 2006 11:17:46 -0000 1.57
+++ lisp/startup.el 25 May 2007 15:44:31 -0000
＠＠ -1496,7 +1496,8 ＠＠
(setq lisp-directory (paths-find-lisp-directory emacs-roots))
(if debug-paths
- (princ (format "lisp-directory:\n%S\n" lisp-directory)
+ (princ (format "configure-lisp-directory and lisp-directory:\n%S\n%S\n"
+ configure-lisp-directory lisp-directory)
'external-debugging-output))
(if (featurep 'mule)
＠＠ -1505,8 +1506,8 ＠＠
(paths-find-mule-lisp-directory emacs-roots
lisp-directory))
(if debug-paths
- (princ (format "mule-lisp-directory:\n%S\n"
- mule-lisp-directory)
+ (princ (format "configure-mule-lisp-directory and mule-lisp-directory:\n%S\n%S\n"
+ configure-mule-lisp-directory mule-lisp-directory)
'external-debugging-output)))
(setq mule-lisp-directory '()))
＠＠ -1514,20 +1515,21 ＠＠
(paths-find-site-lisp-directory emacs-roots)))
(if (and debug-paths (null inhibit-site-lisp))
- (princ (format "site-directory:\n%S\n" site-directory)
+ (princ (format "configure-site-directory and site-directory:\n%S\n%S\n"
+ configure-site-directory site-directory)
'external-debugging-output))
(setq load-path (startup-find-load-path inhibit-packages t))
(when debug-paths
- (princ (format "early-package-hierarchies and early-package-load-path:\n%S\n%S\n"
- early-package-hierarchies early-package-load-path)
+ (princ (format "configure-early-package-directories, early-package-hierarchies and early-package-load-path:\n%S\n%S\n%S\n"
+ configure-early-package-directories early-package-hierarchies early-package-load-path)
'external-debugging-output)
- (princ (format "late-package-hierarchies and late-package-load-path:\n%S\n%S\n"
- late-package-hierarchies late-package-load-path)
+ (princ (format "configure-late-package-directories, late-package-hierarchies and late-package-load-path:\n%S\n%S\n"
+ configure-late-package-directories late-package-hierarchies late-package-load-path)
'external-debugging-output)
- (princ (format "last-package-hierarchies and last-package-load-path:\n%S\n%S\n"
- last-package-hierarchies last-package-load-path)
+ (princ (format "configure-last-package-directories, last-package-hierarchies and last-package-load-path:\n%S\n%S\n"
+ configure-last-package-directories last-package-hierarchies last-package-load-path)
'external-debugging-output))
(if debug-paths
＠＠ -1535,14 +1537,15 ＠＠
'external-debugging-output))
(setq module-directory (paths-find-module-directory emacs-roots))
(if debug-paths
- (princ (format "module-directory:\n%S\n" module-directory)
+ (princ (format "configure-module-directory and module-directory:\n%S\n"
+ configure-module-directory module-directory)
'external-debugging-output))
(setq site-module-directory (and (null inhibit-site-modules)
(paths-find-site-module-directory
emacs-roots)))
(if (and debug-paths (null inhibit-site-modules))
- (princ (format "site-module-directory:\n%S\n"
- site-module-directory)
+ (princ (format "configure-site-module-directory and site-module-directory:\n%S\n%S\n"
+ configure-site-module-directory site-module-directory)
'external-debugging-output))
(setq module-load-path (paths-construct-module-load-path
＠＠ -1557,13 +1560,15 ＠＠
early-package-hierarchies late-package-hierarchies last-package-hierarchies))
(if debug-paths
- (princ (format "Info-directory-list:\n%S\n" Info-directory-list)
+ (princ (format "configure-info-directory, configure-info-path and Info-directory-list:\n%S\n%S\n%S\n"
+ configure-info-directory configure-info-path Info-directory-list)
'external-debugging-output))
(setq exec-directory (paths-find-exec-directory emacs-roots))
(if debug-paths
- (princ (format "exec-directory:\n%s\n" exec-directory)
+ (princ (format "configure-exec-directory and exec-directory:\n%S\n%S\n"
+ configure-exec-directory exec-directory)
'external-debugging-output))
(setq exec-path
＠＠ -1578,13 +1583,15 ＠＠
(setq doc-directory (paths-find-doc-directory emacs-roots))
(if debug-paths
- (princ (format "doc-directory:\n%S\n" doc-directory)
+ (princ (format "configure-doc-directory and doc-directory:\n%S\n%S\n"
+ configure-doc-directory doc-directory)
'external-debugging-output))
(setq data-directory (paths-find-data-directory emacs-roots))
(if debug-paths
- (princ (format "data-directory:\n%S\n" data-directory)
+ (princ (format "configure-data-directory and data-directory:\n%S\n%S\n"
+ configure-data-directory data-directory)
'external-debugging-output))
(setq data-directory-list (paths-construct-data-directory-list
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
