[AC] Expand @PREFIX@ in paths.h.
15 years, 5 months
Michael Sperber
Michael Sperber
This was simply missing.
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* configure.ac: Expand ＠PREFIX＠ in paths.h.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
＠＠ -5746,6 +5746,7 ＠＠
AC_SUBST(prefix)
AC_SUBST(PREFIX_USER_DEFINED)
XE_EXPAND_VARIABLE(prefix,PREFIX)
+AC_SUBST(PREFIX)
AC_SUBST(exec_prefix)
AC_SUBST(EXEC_PREFIX_USER_DEFINED)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[AC] More accurate tests for explicitly-set paths
15 years, 5 months
Michael Sperber
Michael Sperber
I did this a long time ago - I solicited feedback at the time but never
got any, so I guess it's OK.
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* configure.ac: More accurate tests if paths have been set
explicitly on the configure command line.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
+++ b/configure.ac
＠＠ -1075,24 +1075,23 ＠＠
XE_EXPAND_VARIABLE(datadir,datadir_expanded)
XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
XE_EXPAND_VARIABLE(libdir,libdir_expanded)
-XE_EXPAND_VARIABLE(mandir,mandir_expanded)
XE_EXPAND_VARIABLE(infodir,infodir_expanded)
-if test "x$datadir_expanded" != "x$prefix_expanded/share"
+if test "x$datadir" != "x\${datarootdir}"
then
AC_DEFINE(INFODIR_USER_DEFINED)
AC_DEFINE(LISPDIR_USER_DEFINED)
AC_DEFINE(ETCDIR_USER_DEFINED)
fi
-if test "x$libdir_expanded" != "x$prefix_expanded/lib"
+if test "x$libdir" != "x\${exec_prefix}/lib"
then
AC_DEFINE(MODULEDIR_USER_DEFINED)
AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
AC_DEFINE(DOCDIR_USER_DEFINED)
fi
-if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
+if test "x$infodir" != "x\${datarootdir}/info"
then
AC_DEFINE(INFODIR_USER_DEFINED)
else
＠＠ -5746,25 +5745,11 ＠＠
AC_SUBST(prefix)
AC_SUBST(PREFIX_USER_DEFINED)
-dnl Yo, Stephen Bourne! I want to marry you!
-PREFIX=$prefix
-while true; do
- case "$PREFIX" in
- *\$* ) eval "PREFIX=$PREFIX" ;;
- *) break ;;
- esac
-done
-AC_SUBST(PREFIX)
+XE_EXPAND_VARIABLE(prefix,PREFIX)
AC_SUBST(exec_prefix)
AC_SUBST(EXEC_PREFIX_USER_DEFINED)
-EXEC_PREFIX=$exec_prefix
-while true; do
- case "$EXEC_PREFIX" in
- *\$* ) eval "EXEC_PREFIX=$EXEC_PREFIX" ;;
- *) break ;;
- esac
-done
+XE_EXPAND_VARIABLE(exec_prefix,EXEC_PREFIX)
AC_SUBST(EXEC_PREFIX)
AC_SUBST(infodir)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Use `emacs-data-roots' instead of `emacs-roots' where appropriate.
15 years, 5 months
Michael Sperber
Michael Sperber
changeset: 4664:d71d2cefa42d
tag: tip
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Tue Jul 28 15:56:22 2009 +0200
files: lisp/ChangeLog lisp/startup.el
description:
Use `emacs-data-roots' instead of `emacs-roots' where appropriate.
diff -r 5220dbba8ccd -r d71d2cefa42d lisp/ChangeLog
--- a/lisp/ChangeLog Tue Jul 28 15:55:18 2009 +0200
+++ b/lisp/ChangeLog Tue Jul 28 15:56:22 2009 +0200
＠＠ -1,3 +1,8 ＠＠
+2009-07-28 Mike Sperber <mike(a)xemacs.org>
+
+ * startup.el (startup-setup-paths): Use `emacs-data-roots' instead
+ of `emacs-roots' where appropriate.
+
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* startup.el (startup-setup-paths): Print a few more variables
diff -r 5220dbba8ccd -r d71d2cefa42d lisp/startup.el
--- a/lisp/startup.el Tue Jul 28 15:55:18 2009 +0200
+++ b/lisp/startup.el Tue Jul 28 15:56:22 2009 +0200
＠＠ -1540,7 +1540,7 ＠＠
'external-debugging-output)
)
- (setq lisp-directory (paths-find-lisp-directory emacs-roots))
+ (setq lisp-directory (paths-find-lisp-directory emacs-data-roots))
(if debug-paths
(princ (format "configure-lisp-directory and lisp-directory:\n%S\n%S\n"
＠＠ -1550,7 +1550,7 ＠＠
(if (featurep 'mule)
(progn
(setq mule-lisp-directory
- (paths-find-mule-lisp-directory emacs-roots
+ (paths-find-mule-lisp-directory emacs-data-roots
lisp-directory))
(if debug-paths
(princ (format "configure-mule-lisp-directory and mule-lisp-directory:\n%S\n%S\n"
＠＠ -1559,7 +1559,7 ＠＠
(setq mule-lisp-directory '()))
(setq site-directory (and (null inhibit-site-lisp)
- (paths-find-site-lisp-directory emacs-roots)))
+ (paths-find-site-lisp-directory emacs-data-roots)))
(if (and debug-paths (null inhibit-site-lisp))
(princ (format "configure-site-directory and site-directory:\n%S\n%S\n"
＠＠ -1603,7 +1603,7 ＠＠
(unless called-early
(setq Info-directory-list
(paths-construct-info-path
- emacs-roots
+ emacs-data-roots
early-package-hierarchies late-package-hierarchies last-package-hierarchies))
(if debug-paths
＠＠ -1634,7 +1634,7 ＠＠
configure-doc-directory doc-directory)
'external-debugging-output))
- (setq data-directory (paths-find-data-directory emacs-roots))
+ (setq data-directory (paths-find-data-directory emacs-data-roots))
(if debug-paths
(princ (format "configure-data-directory and data-directory:\n%S\n%S\n"
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Don't install silly symlinks when $(prefix) != $(exec_prefix).
15 years, 5 months
Michael Sperber
Michael Sperber
changeset: 4663:5220dbba8ccd
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Tue Jul 28 15:55:18 2009 +0200
files: ChangeLog Makefile.in.in
description:
Don't install silly symlinks when $(prefix) != $(exec_prefix).
diff -r a597b89c2db9 -r 5220dbba8ccd ChangeLog
--- a/ChangeLog Tue Jul 28 15:49:37 2009 +0200
+++ b/ChangeLog Tue Jul 28 15:55:18 2009 +0200
＠＠ -1,3 +1,8 ＠＠
+2009-07-28 Mike Sperber <mike(a)xemacs.org>
+
+ * Makefile.in.in: Don't install silly symlinks when $(prefix) !=
+ $(exec_prefix).
+
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* configure.ac: Expand ＠PREFIX＠ in paths.h.
diff -r a597b89c2db9 -r 5220dbba8ccd Makefile.in.in
--- a/Makefile.in.in Tue Jul 28 15:49:37 2009 +0200
+++ b/Makefile.in.in Tue Jul 28 15:55:18 2009 +0200
＠＠ -423,17 +423,6 ＠＠
cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
# endif /* CYGWIN */
#endif /* WIN32_NATIVE */
- if test "${prefix}" != "${exec_prefix}"; then \
- $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
- for dir in \
- lib/${inststaticdir} \
- lib/${instvardir}/etc \
- lib/${instvardir}/info \
- lib/${instvardir}/lisp; do \
- if test ! -d ${exec_prefix}/$${dir}; then \
- $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
- done; \
- fi
#ifdef HAVE_SHLIB
$(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir)
#endif
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Print a few more variables upon --debug-paths.
15 years, 5 months
Michael Sperber
Michael Sperber
changeset: 4662:a597b89c2db9
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Tue Jul 28 15:49:37 2009 +0200
files: lisp/ChangeLog lisp/startup.el
description:
Print a few more variables upon --debug-paths.
diff -r 24224362882c -r a597b89c2db9 lisp/ChangeLog
--- a/lisp/ChangeLog Tue Jul 28 15:43:08 2009 +0200
+++ b/lisp/ChangeLog Tue Jul 28 15:49:37 2009 +0200
＠＠ -1,3 +1,8 ＠＠
+2009-07-28 Mike Sperber <mike(a)xemacs.org>
+
+ * startup.el (startup-setup-paths): Print a few more variables
+ upon --debug-paths.
+
2009-07-18 Aidan Kehoe <kehoea(a)parhasard.net>
* files.el (find-file-create-switch-thunk):
diff -r 24224362882c -r a597b89c2db9 lisp/startup.el
--- a/lisp/startup.el Tue Jul 28 15:43:08 2009 +0200
+++ b/lisp/startup.el Tue Jul 28 15:49:37 2009 +0200
＠＠ -1524,13 +1524,19 ＠＠
" inhibit-packages inhibit-site-lisp called-early)
'external-debugging-output)
(princ (format
-"emacs-roots:
+"invocation-directory: %S
+invocation-name: %S
+configure-prefix-directory: %S
+configure-exec-prefix-directory: %S
+emacs-roots:
%S
emacs-data-roots:
%S
user-init-directory: %S
configure-package-path: %S
-" emacs-roots emacs-data-roots user-init-directory configure-package-path)
+" invocation-directory invocation-name
+ configure-prefix-directory configure-exec-prefix-directory
+ emacs-roots emacs-data-roots user-init-directory configure-package-path)
'external-debugging-output)
)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Expand @PREFIX@ in paths.h.
15 years, 5 months
Michael Sperber
Michael Sperber
changeset: 4661:24224362882c
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Tue Jul 28 15:43:08 2009 +0200
files: ChangeLog configure configure.ac
description:
Expand ＠PREFIX＠ in paths.h.
diff -r 32be564c53dd -r 24224362882c ChangeLog
--- a/ChangeLog Tue Jul 28 15:09:05 2009 +0200
+++ b/ChangeLog Tue Jul 28 15:43:08 2009 +0200
＠＠ -1,3 +1,7 ＠＠
+2009-07-28 Mike Sperber <mike(a)xemacs.org>
+
+ * configure.ac: Expand ＠PREFIX＠ in paths.h.
+
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* configure.ac: More accurate tests if paths have been set
diff -r 32be564c53dd -r 24224362882c configure
--- a/configure Tue Jul 28 15:09:05 2009 +0200
+++ b/configure Tue Jul 28 15:43:08 2009 +0200
＠＠ -794,6 +794,7 ＠＠
srcdir
extra_includes
PREFIX_USER_DEFINED
+PREFIX
EXEC_PREFIX_USER_DEFINED
EXEC_PREFIX
INFODIR_USER_DEFINED
＠＠ -40696,6 +40697,7 ＠＠
+
EXEC_PREFIX=$exec_prefix
while true; do
case "$EXEC_PREFIX" in
diff -r 32be564c53dd -r 24224362882c configure.ac
--- a/configure.ac Tue Jul 28 15:09:05 2009 +0200
+++ b/configure.ac Tue Jul 28 15:43:08 2009 +0200
＠＠ -5746,6 +5746,7 ＠＠
AC_SUBST(prefix)
AC_SUBST(PREFIX_USER_DEFINED)
XE_EXPAND_VARIABLE(prefix,PREFIX)
+AC_SUBST(PREFIX)
AC_SUBST(exec_prefix)
AC_SUBST(EXEC_PREFIX_USER_DEFINED)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[AC21.5] Document interaction of process filters with debug-on-error
15 years, 5 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
RECOMMEND 21.4 -- note that the implementation of error trapping is
different in 21.5, I think so this may not behave the same way. If
you specifically want this patch, Vin, let me know and I'll
investigate the exact situation in 21.4.
This ended up being two commits because I forgot the ChangeLog. I
really wish we were using git....
diff -r fd2495d78aac src/ChangeLog
--- a/src/ChangeLog Mon Jul 27 01:29:49 2009 +0900
+++ b/src/ChangeLog Mon Jul 27 01:47:01 2009 +0900
＠＠ -0,0 +1,4 ＠＠
+2009-07-27 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * eval.c (debug-on-error): Document interaction with process filters.
+
diff -r 79d1a0524b5f -r f8d7d8202635 src/eval.c
--- a/src/eval.c Sun Jul 26 19:58:40 2009 +0900
+++ b/src/eval.c Mon Jul 27 01:18:47 2009 +0900
＠＠ -6732,6 +6732,11 ＠＠
This variable is overridden by `debug-ignored-errors'.
See also variables `debug-on-quit' and `debug-on-signal'.
+Process filters are considered to be outside of condition-case forms
+(unless contained in the process filter itself). To prevent the
+debugger from being called from a process filter, use a list value, or
+put the expected error\(s) in `debug-ignored-errors'.
+
If this variable is set while XEmacs is running noninteractively (using
`-batch'), and XEmacs was configured with `--debug' (#define XEMACS_DEBUG
in the C code), instead of trying to invoke the Lisp debugger (which
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[AC21.5] Document DNS lookup delays at startup in FAQ
15 years, 5 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
RECOMMEND 21.4. I haven't checked whether it applies, though.
Note that this patch applies the ChangeLog out of order. Sorry about
that, I didn't realize until after I'd committed, and Mercurial does
not make it easy to rewrite this kind of history.
diff -r f8d7d8202635 man/ChangeLog
--- a/man/ChangeLog Mon Jul 27 01:18:47 2009 +0900
+++ b/man/ChangeLog Mon Jul 27 01:32:34 2009 +0900
＠＠ -7,6 +7,15 ＠＠
* internals/internals.texi: s/＠urlref/＠uref/g.
(Lstreams): Add urefs to David Beasley tutorials.
+2009-04-20 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * xemacs-faq.texi (Q2.5.3):
+ Add information about resolver configuration to Q2.5.3.
+ Thanks to Guillaume MULLER <gm.work.lists(a)gmail.com>.
+
+ * xemacs-faq.texi (Top): Update menu.
+ * xemacs-faq.texi (Installation): Update menu.
+
2009-02-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* xemacs-faq.texi (Q3.0.12): New node for Meta key on Mac.
diff -r f8d7d8202635 man/xemacs-faq.texi
--- a/man/xemacs-faq.texi Mon Jul 27 01:18:47 2009 +0900
+++ b/man/xemacs-faq.texi Mon Jul 27 01:32:34 2009 +0900
＠＠ -322,7 +322,7 ＠＠
2.5: Startup-Related Problems
* Q2.5.1:: XEmacs cannot connect to my X Terminal!
* Q2.5.2:: Startup problems related to paths or package locations.
-* Q2.5.3:: XEmacs won't start without network.
+* Q2.5.3:: XEmacs won't start without network, or starts slowly.
* Q2.5.4:: Startup warnings about deducing proper fonts?
* Q2.5.5:: Warnings from incorrect key modifiers.
* Q2.5.6:: XEmacs 21.1 on Windows used to spawn an ugly console window on every startup. Has that been fixed?
＠＠ -3124,7 +3124,7 ＠＠
2.5: Startup-Related Problems
* Q2.5.1:: XEmacs cannot connect to my X Terminal!
* Q2.5.2:: Startup problems related to paths or package locations.
-* Q2.5.3:: XEmacs won't start without network.
+* Q2.5.3:: XEmacs won't start without network, or starts slowly.
* Q2.5.4:: Startup warnings about deducing proper fonts?
* Q2.5.5:: Warnings from incorrect key modifiers.
* Q2.5.6:: XEmacs 21.1 on Windows used to spawn an ugly console window on every startup. Has that been fixed?
＠＠ -4471,7 +4471,7 ＠＠
this means that no value was compiled into XEmacs using these parameters.
＠node Q2.5.3, Q2.5.4, Q2.5.2, Installation
-＠unnumberedsubsec Q2.5.3: XEmacs won't start without network.
+＠unnumberedsubsec Q2.5.3: XEmacs won't start without network, or starts slowly.
If XEmacs starts when you're on the network, but fails when you're not
on the network, you may be missing a "localhost" entry in your
＠＠ -4481,7 +4481,16 ＠＠
127.0.0.1 localhost
＠end example
-Add that line, and XEmacs will be happy.
+Add that line, and XEmacs will be happy. If your network is unreliable,
+such as a Wifi network, you may experience delays but eventually XEmacs
+starts up. This may be due to having the lookup order give precedence
+to DNS over the hosts file (often lookup order is defined in one of the
+files ＠file{/etc/host.conf}, ＠file{/etc/nsswitch.conf}, or
+(a)file{/etc/resolv.conf}, depending on OS). See your system
+documentation for this configuration. Note that changing the lookup
+order is a workaround; there are good reasons to have DNS come earlier
+by default. Make sure those reasons are less important to you than a
+quick XEmacs startup.
＠node Q2.5.4, Q2.5.5, Q2.5.3, Installation
＠unnumberedsubsec Q2.5.4: Startup warnings about deducing proper fonts?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[AC 21.5] configure doesn't know its own options
15 years, 5 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
Stephen J. Turnbull writes:
> Hm. It appears that there is code already in configure.ac to spoof
> the Seal of Approval, but that it doesn't work because, rather than
> the usual use of ":" as a sequence separator, the autoconf implementor
> chose to use a newline as separator in the list of declared options.
I've implemented and pushed this patch. It does *not* fix the problem
with not finding GNU dbm's ndbm.h; that will come in a separate patch
shortly. (It takes longer because I plan to audit configure.ac for
other libraries with the same kind of issue.)
It does, however, commit a version of configure without the bug. "hg
pull -u" or "hg fetch" (fetch requires the fetch extension), and
you're ready to go.
diff -r 13273cffca2a ChangeLog
--- a/ChangeLog Sat Jul 18 23:51:21 2009 +0100
+++ b/ChangeLog Mon Jul 27 01:18:27 2009 +0900
＠＠ -0,0 +1,5 ＠＠
+2009-07-26 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (XE_MERGED_ARG): Use correct separator when
+ registering options to _AC_USER_OPTS.
+
diff -r 13273cffca2a configure
--- a/configure Sat Jul 18 23:51:21 2009 +0100
+++ b/configure Mon Jul 27 01:18:27 2009 +0900
＠＠ -859,7 +859,214 ＠＠
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_compiler:with_compiler:enable_xemacs_compiler:with_xemacs_compiler:enable_gcc:with_gcc:enable_cflags:with_cflags:enable_cflags_warning:with_cflags_warning:enable_optimization:with_optimization:enable_cflags_optimization:with_cflags_optimization:enable_cflags_debugging:with_cflags_debugging:enable_cpp:with_cpp:enable_cppflags:with_cppflags:enable_libs=LIBS:with_libs=LIBS:enable_ldflags=FLAGS:with_ldflags=FLAGS:enable_site_includes:with_site_includes:enable_site_libraries:with_site_libraries:enable_site_prefixes:with_site_prefixes:enable_site_runtime_libraries:with_site_runtime_libraries:enable_dynamic:with_dynamic:enable_prefix:with_prefix:enable_netinstall:with_netinstall:enable_statedir:with_statedir:enable_lispdir:with_lispdir:enable_archlibdir:with_archlibdir:enable_moduledir:with_moduledir:enable_etcdir:with_etcdir:enable_docdir:with_docdir:enable_site_lisp:with_site_lisp:enable_site_modules:with_site_modules:enable_early_packages:with_early_packages:enable_user_!
packages:with_user_packages:enable_late_packages:with_late_packages:enable_system_packages:with_system_packages:enable_last_packages:with_last_packages:enable_legacy_packages:with_legacy_packages:enable_package_path:with_package_path:enable_infopath:with_infopath:enable_xft:with_xft:enable_gtk:with_gtk:enable_gnome:with_gnome:enable_msw:with_msw:enable_toolbars:with_toolbars:enable_wmcommand:with_wmcommand:enable_athena:with_athena:enable_menubars:with_menubars:enable_scrollbars:with_scrollbars:enable_dialogs:with_dialogs:enable_widgets:with_widgets:enable_dragndrop:with_dragndrop:enable_cde:with_cde:enable_offix:with_offix:enable_xmu:with_xmu:enable_external_widget:with_external_widget:enable_tty:with_tty:enable_ncurses:with_ncurses:enable_gpm:with_gpm:enable_xpm:with_xpm:enable_png:with_png:enable_jpeg:with_jpeg:enable_tiff:with_tiff:enable_xface:with_xface:enable_gif:with_gif:enable_sound:with_sound:enable_native_sound_lib:with_native_sound_lib:enable_mule:with_mule:enab!
le_xim:with_xim:enable_canna:with_canna:enable_wnn:with_wnn:en!
able_wnn
6:with_wnn6:enable_xfs:with_xfs:enable_default_eol_detection:with_default_eol_detection:enable_clash_detection:with_clash_detection:enable_zlib:with_zlib:enable_database:with_database:enable_ldap:with_ldap:enable_postgresql:with_postgresql:enable_mail_locking:with_mail_locking:enable_pop:with_pop:enable_kerberos:with_kerberos:enable_hesiod:with_hesiod:enable_tooltalk:with_tooltalk:enable_socks:with_socks:enable_dnet:with_dnet:enable_ipv6_cname:with_ipv6_cname:enable_rel_alloc:with_rel_alloc:enable_dlmalloc:with_dlmalloc:enable_system_malloc:with_system_malloc:enable_debug_malloc:with_debug_malloc:enable_pdump:with_pdump:enable_dump_in_exec:with_dump_in_exec:enable_kkcc:with_kkcc:enable_newgc:with_newgc:enable_vdb:with_vdb:enable_modules:with_modules:enable_bignum:with_bignum:enable_workshop:with_workshop:enable_sparcworks:with_sparcworks:enable_infodock:with_infodock:enable_debug:with_debug:enable_error_checking:with_error_checking:enable_assertions:with_assertions:enable_me!
mory_usage_stats:with_memory_usage_stats:enable_quick_build:with_quick_build:enable_union_type:with_union_type:enable_quantify:with_quantify:enable_purify:with_purify
+enable_compiler
+with_compiler
+enable_xemacs_compiler
+with_xemacs_compiler
+enable_gcc
+with_gcc
+enable_cflags
+with_cflags
+enable_cflags_warning
+with_cflags_warning
+enable_optimization
+with_optimization
+enable_cflags_optimization
+with_cflags_optimization
+enable_cflags_debugging
+with_cflags_debugging
+enable_cpp
+with_cpp
+enable_cppflags
+with_cppflags
+enable_libs=LIBS
+with_libs=LIBS
+enable_ldflags=FLAGS
+with_ldflags=FLAGS
+enable_site_includes
+with_site_includes
+enable_site_libraries
+with_site_libraries
+enable_site_prefixes
+with_site_prefixes
+enable_site_runtime_libraries
+with_site_runtime_libraries
+enable_dynamic
+with_dynamic
+enable_prefix
+with_prefix
+enable_netinstall
+with_netinstall
+enable_statedir
+with_statedir
+enable_lispdir
+with_lispdir
+enable_archlibdir
+with_archlibdir
+enable_moduledir
+with_moduledir
+enable_etcdir
+with_etcdir
+enable_docdir
+with_docdir
+enable_site_lisp
+with_site_lisp
+enable_site_modules
+with_site_modules
+enable_early_packages
+with_early_packages
+enable_user_packages
+with_user_packages
+enable_late_packages
+with_late_packages
+enable_system_packages
+with_system_packages
+enable_last_packages
+with_last_packages
+enable_legacy_packages
+with_legacy_packages
+enable_package_path
+with_package_path
+enable_infopath
+with_infopath
+enable_xft
+with_xft
+enable_gtk
+with_gtk
+enable_gnome
+with_gnome
+enable_msw
+with_msw
+enable_toolbars
+with_toolbars
+enable_wmcommand
+with_wmcommand
+enable_athena
+with_athena
+enable_menubars
+with_menubars
+enable_scrollbars
+with_scrollbars
+enable_dialogs
+with_dialogs
+enable_widgets
+with_widgets
+enable_dragndrop
+with_dragndrop
+enable_cde
+with_cde
+enable_offix
+with_offix
+enable_xmu
+with_xmu
+enable_external_widget
+with_external_widget
+enable_tty
+with_tty
+enable_ncurses
+with_ncurses
+enable_gpm
+with_gpm
+enable_xpm
+with_xpm
+enable_png
+with_png
+enable_jpeg
+with_jpeg
+enable_tiff
+with_tiff
+enable_xface
+with_xface
+enable_gif
+with_gif
+enable_sound
+with_sound
+enable_native_sound_lib
+with_native_sound_lib
+enable_mule
+with_mule
+enable_xim
+with_xim
+enable_canna
+with_canna
+enable_wnn
+with_wnn
+enable_wnn6
+with_wnn6
+enable_xfs
+with_xfs
+enable_default_eol_detection
+with_default_eol_detection
+enable_clash_detection
+with_clash_detection
+enable_zlib
+with_zlib
+enable_database
+with_database
+enable_ldap
+with_ldap
+enable_postgresql
+with_postgresql
+enable_mail_locking
+with_mail_locking
+enable_pop
+with_pop
+enable_kerberos
+with_kerberos
+enable_hesiod
+with_hesiod
+enable_tooltalk
+with_tooltalk
+enable_socks
+with_socks
+enable_dnet
+with_dnet
+enable_ipv6_cname
+with_ipv6_cname
+enable_rel_alloc
+with_rel_alloc
+enable_dlmalloc
+with_dlmalloc
+enable_system_malloc
+with_system_malloc
+enable_debug_malloc
+with_debug_malloc
+enable_pdump
+with_pdump
+enable_dump_in_exec
+with_dump_in_exec
+enable_kkcc
+with_kkcc
+enable_newgc
+with_newgc
+enable_vdb
+with_vdb
+enable_modules
+with_modules
+enable_bignum
+with_bignum
+enable_workshop
+with_workshop
+enable_sparcworks
+with_sparcworks
+enable_infodock
+with_infodock
+enable_debug
+with_debug
+enable_error_checking
+with_error_checking
+enable_assertions
+with_assertions
+enable_memory_usage_stats
+with_memory_usage_stats
+enable_quick_build
+with_quick_build
+enable_union_type
+with_union_type
+enable_quantify
+with_quantify
+enable_purify
+with_purify
with_x
'
ac_precious_vars='build_alias
diff -r 13273cffca2a configure.ac
--- a/configure.ac Sat Jul 18 23:51:21 2009 +0100
+++ b/configure.ac Mon Jul 27 01:18:27 2009 +0900
＠＠ -254,8 +254,10 ＠＠
m4_divert_once([HELP_ENABLE], m4_bpatsubst([[$2]],[--enable\([^ ]+\) ],[--with\1 ]))dnl
dnl Register both forms with the option checking list.
dnl Options are only checked with autoconf > 2.61.
-m4_append_uniq([_AC_USER_OPTS], [enable_]m4_bpatsubst([$1], -, _), [:])dnl
-m4_append_uniq([_AC_USER_OPTS], [with_]m4_bpatsubst([$1], -, _), [:])dnl
+m4_append_uniq([_AC_USER_OPTS], [enable_]m4_bpatsubst([$1], -, _), [
+])dnl
+m4_append_uniq([_AC_USER_OPTS], [with_]m4_bpatsubst([$1], -, _), [
+])dnl
# If --with-$1 or --without-$1 were given then copy the value to the
# equivalent enable_$1 variable.
if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
ruby-modes sync to upstream 1.8.7
15 years, 5 months
Hans de Graaff
Hans de Graaff
I've just committed the following patch to ruby-modes to sync with
upstream's ruby 1.8.7.
Index: ChangeLog
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ruby-modes/ChangeLog,v
retrieving revision 1.12
diff -u -B -r1.12 ChangeLog
--- ChangeLog 20 Jul 2009 19:02:24 -0000 1.12
+++ ChangeLog 24 Jul 2009 09:34:08 -0000
＠＠ -1,3 +1,7 ＠＠
+2009-07-24 Hans de Graaff <graaff(a)xemacs.org>
+
+ * Sync with upstream 1.8.7
+
2009-07-20 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.03 released.
Index: Makefile
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ruby-modes/Makefile,v
retrieving revision 1.11
diff -u -B -r1.11 Makefile
--- Makefile 20 Jul 2009 19:02:24 -0000 1.11
+++ Makefile 24 Jul 2009 09:34:08 -0000
＠＠ -18,7 +18,7 ＠＠
# Boston, MA 02111-1307, USA.
VERSION = 1.03
-AUTHOR_VERSION = 1.8.5_pre4
+AUTHOR_VERSION = 1.8.7
MAINTAINER = Hans de Graaff <graaff(a)xemacs.org>
PACKAGE = ruby-modes
PKG_TYPE = regular
Index: inf-ruby.el
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ruby-modes/inf-ruby.el,v
retrieving revision 1.4
diff -u -B -r1.4 inf-ruby.el
--- inf-ruby.el 19 Jul 2009 08:18:14 -0000 1.4
+++ inf-ruby.el 24 Jul 2009 09:34:08 -0000
＠＠ -1,8 +1,8 ＠＠
;;; -*-Emacs-Lisp-*-
;;;
-;;; $Id: inf-ruby.el,v 1.6.2.1 2004/07/27 07:51:28 matz Exp $
-;;; $Author: matz $
-;;; $Date: 2004/07/27 07:51:28 $
+;;; $Id: inf-ruby.el 12031 2007-03-11 10:01:15Z knu $
+;;; $Author: knu $
+;;; $Date: 2007-03-11 19:01:15 +0900 (Sun, 11 Mar 2007) $
;;;
;;; Inferior Ruby Mode - ruby process in a buffer.
;;; adapted from cmuscheme.el
＠＠ -34,11 +34,19 ＠＠
;;;
;;; HISTORY
;;; senda - 8 Apr 1998: Created.
-;;; $Log: inf-ruby.el,v $
-;;; Revision 1.6.2.1 2004/07/27 07:51:28 matz
+;;; $Log$
+;;; Revision 1.7 2004/07/27 08:11:36 matz
+;;; * eval.c (rb_eval): copy on write for argument local variable
+;;; assignment.
+;;;
+;;; * eval.c (assign): ditto.
+;;;
+;;; * eval.c (rb_call0): update ruby_frame->argv with the default
+;;; value used for the optional arguments.
+;;;
;;; * object.c (Init_Object): "===" calls rb_obj_equal() directly.
;;; [ruby-list:39937]
-;;;
+;;;
;;; Revision 1.6 2002/09/07 14:35:46 nobu
;;; * misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
;;; alist for error message from ruby.
Index: inf-ruby.el.upstream
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ruby-modes/inf-ruby.el.upstream,v
retrieving revision 1.3
diff -u -B -r1.3 inf-ruby.el.upstream
--- inf-ruby.el.upstream 19 Jul 2009 08:18:14 -0000 1.3
+++ inf-ruby.el.upstream 24 Jul 2009 09:34:08 -0000
＠＠ -1,8 +1,8 ＠＠
;;; -*-Emacs-Lisp-*-
;;;
-;;; $Id: inf-ruby.el,v 1.6.2.1 2004/07/27 07:51:28 matz Exp $
-;;; $Author: matz $
-;;; $Date: 2004/07/27 07:51:28 $
+;;; $Id: inf-ruby.el 12031 2007-03-11 10:01:15Z knu $
+;;; $Author: knu $
+;;; $Date: 2007-03-11 19:01:15 +0900 (Sun, 11 Mar 2007) $
;;;
;;; Inferior Ruby Mode - ruby process in a buffer.
;;; adapted from cmuscheme.el
＠＠ -34,11 +34,19 ＠＠
;;;
;;; HISTORY
;;; senda - 8 Apr 1998: Created.
-;;; $Log: inf-ruby.el,v $
-;;; Revision 1.6.2.1 2004/07/27 07:51:28 matz
+;;; $Log$
+;;; Revision 1.7 2004/07/27 08:11:36 matz
+;;; * eval.c (rb_eval): copy on write for argument local variable
+;;; assignment.
+;;;
+;;; * eval.c (assign): ditto.
+;;;
+;;; * eval.c (rb_call0): update ruby_frame->argv with the default
+;;; value used for the optional arguments.
+;;;
;;; * object.c (Init_Object): "===" calls rb_obj_equal() directly.
;;; [ruby-list:39937]
-;;;
+;;;
;;; Revision 1.6 2002/09/07 14:35:46 nobu
;;; * misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
;;; alist for error message from ruby.
Index: ruby-mode.el
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ruby-modes/ruby-mode.el,v
retrieving revision 1.4
diff -u -B -r1.4 ruby-mode.el
--- ruby-mode.el 19 Jul 2009 08:18:15 -0000 1.4
+++ ruby-mode.el 24 Jul 2009 09:34:08 -0000
＠＠ -1,12 +1,12 ＠＠
;;;
;;; ruby-mode.el -
;;;
-;;; $Author: matz $
-;;; $Date: 2005/11/30 15:56:57 $
+;;; $Author: knu $
+;;; $Date: 2008-05-19 00:02:36 +0900 (Mon, 19 May 2008) $
;;; created at: Fri Feb 4 14:49:13 JST 1994
;;;
-(defconst ruby-mode-revision "$Revision: 1.74.2.14 $")
+(defconst ruby-mode-revision "$Revision: 16458 $")
(defconst ruby-mode-version
(progn
＠＠ -28,7 +28,7 ＠＠
)
(defconst ruby-non-block-do-re
- "\\(while\\|until\\|for\\|rescue\\)\\>"
+ "\\(while\\|until\\|for\\|rescue\\)\\>[^_]"
)
(defconst ruby-indent-beg-re
＠＠ -55,7 +55,7 ＠＠
(concat ruby-modifier-beg-re "\\|" ruby-block-op-re)
)
-(defconst ruby-block-end-re "end")
+(defconst ruby-block-end-re "\\<end\\>")
(defconst ruby-here-doc-beg-re
"<<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\
\([^']+\\)[']\\)")
＠＠ -71,13 +71,13 ＠＠
(defconst ruby-delimiter
(concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
ruby-block-beg-re
- "\\|" ruby-block-end-re
- "\\)\\>\\|^=begin\\|" ruby-here-doc-beg-re)
+ "\\)\\>\\|" ruby-block-end-re
+ "\\|^=begin\\|" ruby-here-doc-beg-re)
)
(defconst ruby-negative
- (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|\\("
- ruby-block-end-re "\\)\\>\\|}\\|\\]\\)")
+ (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|"
+ ruby-block-end-re "\\|}\\|\\]\\)")
)
(defconst ruby-operator-chars "-,.+*/%&|^~=<>:")
＠＠ -265,7 +265,12 ＠＠
(make-local-variable 'add-log-current-defun-function)
(setq add-log-current-defun-function 'ruby-add-log-current-method)
- (run-hooks 'ruby-mode-hook))
+ (set (make-local-variable 'font-lock-defaults)
'((ruby-font-lock-keywords) nil nil))
+ (set (make-local-variable 'font-lock-keywords)
ruby-font-lock-keywords)
+ (set (make-local-variable 'font-lock-syntax-table)
ruby-font-lock-syntax-table)
+ (set (make-local-variable 'font-lock-syntactic-keywords)
ruby-font-lock-syntactic-keywords)
+
+ (run-mode-hooks 'ruby-mode-hook))
(defun ruby-current-indentation ()
(save-excursion
＠＠ -393,6 +398,8 ＠＠
(t
(setq in-string (point))
(goto-char end))))
+ ((looking-at "/=")
+ (goto-char pnt))
((looking-at "/")
(cond
((and (not (eobp)) (ruby-expr-beg 'expr-re))
＠＠ -462,7 +469,7 ＠＠
(setq depth (1- depth)))
(setq nest (cdr nest))
(goto-char pnt))
- ((looking-at (concat "\\<\\(" ruby-block-end-re "\\)\\>"))
+ ((looking-at ruby-block-end-re)
(if (or (and (not (bolp))
(progn
(forward-char -1)
＠＠ -514,8 +521,9 ＠＠
(setq nest (cons (cons nil pnt) nest))
(setq depth (1+ depth)))
(goto-char pnt))
- ((looking-at ":\\(['\"]\\)\\(\\\\.\\|[^\\\\]\\)*\\1")
- (goto-char (match-end 0)))
+ ((looking-at ":\\(['\"]\\)")
+ (goto-char (match-beginning 1))
+ (ruby-forward-string (buffer-substring (match-beginning 1) (match-end
1)) end))
((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\)")
(goto-char (match-end 0)))
((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
＠＠ -533,7 +541,7 ＠＠
((looking-at "<<")
(cond
((and (ruby-expr-beg 'heredoc)
- (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\sw+\
\)"))
+ (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\
\sw\\|\\s_\\)+\\)"))
(setq re (regexp-quote (or (match-string 4) (match-string 2))))
(if (match-beginning 1) (setq re (concat "\\s *" re)))
(let* ((id-end (goto-char (match-end 0)))
＠＠ -790,7 +798,8 ＠＠
(defun ruby-move-to-block (n)
(let (start pos done down)
(setq start (ruby-calculate-indent))
- (setq down (looking-at (concat "\\<\\(" (if (< n 0)
ruby-block-end-re ruby-block-beg-re) "\\)\\>")))
+ (setq down (looking-at (if (< n 0) ruby-block-end-re
+ (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))))
(while (and (not done) (not (if (< n 0) (bobp) (eobp))))
(forward-line n)
(cond
＠＠ -901,7 +910,7 ＠＠
(?:
(forward-char -1)
(eq (char-before) :)))))
- (if (looking-at (concat "\\<\\(" ruby-block-end-re "\\)\\>"))
+ (if (looking-at ruby-block-end-re)
(ruby-beginning-of-block))
nil))
(setq i (1- i)))
＠＠ -1020,30 +1029,19 ＠＠
;; ?' ?" ?` are ascii codes
("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
;; regexps
- ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|
until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\
\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+ ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\
\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s
*\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
(4 (7 . ?/))
(6 (7 . ?/)))
("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
- (cond ((featurep 'xemacs)
- (put 'ruby-mode 'font-lock-defaults
- '((ruby-font-lock-keywords)
- nil nil nil
- beginning-of-line
- (font-lock-syntactic-keywords
- . ruby-font-lock-syntactic-keywords))))
- (t
- (add-hook 'ruby-mode-hook
- '(lambda ()
- (make-local-variable 'font-lock-defaults)
- (make-local-variable 'font-lock-keywords)
- (make-local-variable 'font-lock-syntax-table)
- (make-local-variable 'font-lock-syntactic-keywords)
- (setq font-lock-defaults '((ruby-font-lock-keywords) nil nil))
- (setq font-lock-keywords ruby-font-lock-keywords)
- (setq font-lock-syntax-table ruby-font-lock-syntax-table)
- (setq font-lock-syntactic-keywords
ruby-font-lock-syntactic-keywords)))))
+ (if (featurep 'xemacs)
+ (put 'ruby-mode 'font-lock-defaults
+ '((ruby-font-lock-keywords)
+ nil nil nil
+ beginning-of-line
+ (font-lock-syntactic-keywords
+ . ruby-font-lock-syntactic-keywords))))
(defun ruby-font-lock-docs (limit)
(if (re-search-forward "^=begin\\(\\s \\|$\\)" limit t)
Index: ruby-mode.el.upstream
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ruby-modes/ruby-mode.el.upstream,v
retrieving revision 1.3
diff -u -B -r1.3 ruby-mode.el.upstream
--- ruby-mode.el.upstream 19 Jul 2009 08:18:15 -0000 1.3
+++ ruby-mode.el.upstream 24 Jul 2009 09:34:09 -0000
＠＠ -1,12 +1,12 ＠＠
;;;
;;; ruby-mode.el -
;;;
-;;; $Author: matz $
-;;; $Date: 2005/11/30 15:56:57 $
+;;; $Author: knu $
+;;; $Date: 2008-05-19 00:02:36 +0900 (Mon, 19 May 2008) $
;;; created at: Fri Feb 4 14:49:13 JST 1994
;;;
-(defconst ruby-mode-revision "$Revision: 1.74.2.14 $")
+(defconst ruby-mode-revision "$Revision: 16458 $")
(defconst ruby-mode-version
(progn
＠＠ -18,7 +18,7 ＠＠
)
(defconst ruby-non-block-do-re
- "\\(while\\|until\\|for\\|rescue\\)\\>"
+ "\\(while\\|until\\|for\\|rescue\\)\\>[^_]"
)
(defconst ruby-indent-beg-re
＠＠ -45,7 +45,7 ＠＠
(concat ruby-modifier-beg-re "\\|" ruby-block-op-re)
)
-(defconst ruby-block-end-re "end")
+(defconst ruby-block-end-re "\\<end\\>")
(defconst ruby-here-doc-beg-re
"<<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\
\([^']+\\)[']\\)")
＠＠ -61,13 +61,13 ＠＠
(defconst ruby-delimiter
(concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
ruby-block-beg-re
- "\\|" ruby-block-end-re
- "\\)\\>\\|^=begin\\|" ruby-here-doc-beg-re)
+ "\\)\\>\\|" ruby-block-end-re
+ "\\|^=begin\\|" ruby-here-doc-beg-re)
)
(defconst ruby-negative
- (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|\\("
- ruby-block-end-re "\\)\\>\\|}\\|\\]\\)")
+ (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|"
+ ruby-block-end-re "\\|}\\|\\]\\)")
)
(defconst ruby-operator-chars "-,.+*/%&|^~=<>:")
＠＠ -255,7 +255,12 ＠＠
(make-local-variable 'add-log-current-defun-function)
(setq add-log-current-defun-function 'ruby-add-log-current-method)
- (run-hooks 'ruby-mode-hook))
+ (set (make-local-variable 'font-lock-defaults)
'((ruby-font-lock-keywords) nil nil))
+ (set (make-local-variable 'font-lock-keywords)
ruby-font-lock-keywords)
+ (set (make-local-variable 'font-lock-syntax-table)
ruby-font-lock-syntax-table)
+ (set (make-local-variable 'font-lock-syntactic-keywords)
ruby-font-lock-syntactic-keywords)
+
+ (run-mode-hooks 'ruby-mode-hook))
(defun ruby-current-indentation ()
(save-excursion
＠＠ -383,6 +388,8 ＠＠
(t
(setq in-string (point))
(goto-char end))))
+ ((looking-at "/=")
+ (goto-char pnt))
((looking-at "/")
(cond
((and (not (eobp)) (ruby-expr-beg 'expr-re))
＠＠ -452,7 +459,7 ＠＠
(setq depth (1- depth)))
(setq nest (cdr nest))
(goto-char pnt))
- ((looking-at (concat "\\<\\(" ruby-block-end-re "\\)\\>"))
+ ((looking-at ruby-block-end-re)
(if (or (and (not (bolp))
(progn
(forward-char -1)
＠＠ -504,8 +511,9 ＠＠
(setq nest (cons (cons nil pnt) nest))
(setq depth (1+ depth)))
(goto-char pnt))
- ((looking-at ":\\(['\"]\\)\\(\\\\.\\|[^\\\\]\\)*\\1")
- (goto-char (match-end 0)))
+ ((looking-at ":\\(['\"]\\)")
+ (goto-char (match-beginning 1))
+ (ruby-forward-string (buffer-substring (match-beginning 1) (match-end
1)) end))
((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\)")
(goto-char (match-end 0)))
((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
＠＠ -523,7 +531,7 ＠＠
((looking-at "<<")
(cond
((and (ruby-expr-beg 'heredoc)
- (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\sw+\
\)"))
+ (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\
\sw\\|\\s_\\)+\\)"))
(setq re (regexp-quote (or (match-string 4) (match-string 2))))
(if (match-beginning 1) (setq re (concat "\\s *" re)))
(let* ((id-end (goto-char (match-end 0)))
＠＠ -780,7 +788,8 ＠＠
(defun ruby-move-to-block (n)
(let (start pos done down)
(setq start (ruby-calculate-indent))
- (setq down (looking-at (concat "\\<\\(" (if (< n 0)
ruby-block-end-re ruby-block-beg-re) "\\)\\>")))
+ (setq down (looking-at (if (< n 0) ruby-block-end-re
+ (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))))
(while (and (not done) (not (if (< n 0) (bobp) (eobp))))
(forward-line n)
(cond
＠＠ -891,7 +900,7 ＠＠
(?:
(forward-char -1)
(eq (char-before) :)))))
- (if (looking-at (concat "\\<\\(" ruby-block-end-re "\\)\\>"))
+ (if (looking-at ruby-block-end-re)
(ruby-beginning-of-block))
nil))
(setq i (1- i)))
＠＠ -1010,30 +1019,19 ＠＠
;; ?' ?" ?` are ascii codes
("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
;; regexps
- ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|
until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\
\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+ ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\
\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s
*\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
(4 (7 . ?/))
(6 (7 . ?/)))
("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
- (cond ((featurep 'xemacs)
- (put 'ruby-mode 'font-lock-defaults
- '((ruby-font-lock-keywords)
- nil nil nil
- beginning-of-line
- (font-lock-syntactic-keywords
- . ruby-font-lock-syntactic-keywords))))
- (t
- (add-hook 'ruby-mode-hook
- '(lambda ()
- (make-local-variable 'font-lock-defaults)
- (make-local-variable 'font-lock-keywords)
- (make-local-variable 'font-lock-syntax-table)
- (make-local-variable 'font-lock-syntactic-keywords)
- (setq font-lock-defaults '((ruby-font-lock-keywords) nil nil))
- (setq font-lock-keywords ruby-font-lock-keywords)
- (setq font-lock-syntax-table ruby-font-lock-syntax-table)
- (setq font-lock-syntactic-keywords
ruby-font-lock-syntactic-keywords)))))
+ (if (featurep 'xemacs)
+ (put 'ruby-mode 'font-lock-defaults
+ '((ruby-font-lock-keywords)
+ nil nil nil
+ beginning-of-line
+ (font-lock-syntactic-keywords
+ . ruby-font-lock-syntactic-keywords))))
(defun ruby-font-lock-docs (limit)
(if (re-search-forward "^=begin\\(\\s \\|$\\)" limit t)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments