3:51 a.m.
SL Baur <steve(a)xemacs.org> writes in xemacs-beta(a)xemacs.org:
Andy Piper <andy(a)xemacs.org> writes in xemacs-beta(a)xemacs.org:
> At 09:46 PM 6/23/99 +0900, SL Baur wrote:
>> Maybe Andy Piper can comment on what went wrong. There is probably
>> something wrong with file-coding/no-Mule.
> Its not a file-coding problem, CHAR_ASCII_P and word_boundary_p
have been
> used unconditionally but are only defined for mule builds.
O.K.
> All non-mule builds will fail. Someone should fix this quick.
O.K. I'm looking at it.
> The temporary fix to to back up syntax.c a version to 1.7.2.2.
This patch restores the non-Mule code that was removed by the extword
patch. Patch tested with file-coding on Unix.
1999-06-24 SL Baur <steve(a)miho.m17n.org>
* syntax.c (scan_words): Restore non-Mule code.
(word_constituent_p): Restore.
Index: src/syntax.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/syntax.c,v
retrieving revision 1.7.2.3
diff -u -r1.7.2.3 syntax.c
--- src/syntax.c 1999/06/23 08:05:00 1.7.2.3
+++ src/syntax.c 1999/06/24 02:43:21
＠＠ -327,7 +327,7 ＠＠
}
-
+#ifdef MULE
/* Return 1 if there is a word boundary between two word-constituent
characters C1 and C2 if they appear in this order, else return 0.
There is no word boundary between two word-constituent ASCII
＠＠ -337,6 +337,17 ＠＠
&& word_boundary_p (c1, c2))
extern int word_boundary_p (Emchar c1, Emchar c2);
+#else
+static int
+word_constituent_p (struct buffer *buf, Bufpos pos,
+ struct Lisp_Char_Table *tab)
+{
+ enum syntaxcode code = SYNTAX_UNSAFE (tab, BUF_FETCH_CHAR (buf, pos));
+ return ((words_include_escapes &&
+ (code == Sescape || code == Scharquote))
+ || (code == Sword));
+}
+#endif
/* Return the position across COUNT words from FROM.
If that many words cannot be found before the end of the buffer, return 0.
＠＠ -347,8 +358,10 ＠＠
{
Bufpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#ifdef MULE
Emchar ch0, ch1;
enum syntaxcode code;
+#endif
while (count > 0)
{
＠＠ -358,28 +371,41 ＠＠
{
if (from == limit)
return 0;
+#ifdef MULE
ch0 = BUF_FETCH_CHAR (buf, from);
code = SYNTAX_UNSAFE (mirrortab, ch0);
+#else
+ if (word_constituent_p (buf, from, mirrortab))
+ break;
+#endif
from++;
+#ifdef MULE
if (words_include_escapes
&& (code == Sescape || code == Scharquote))
break;
if (code == Sword)
break;
+#endif
}
QUIT;
- while ( from != limit )
+ while ((from != limit)
+#ifndef MULE
+ && word_constituent_p (buf, from, mirrortab)
+#endif
+ )
{
+#ifdef MULE
ch1 = BUF_FETCH_CHAR (buf, from);
code = SYNTAX_UNSAFE (mirrortab, ch1);
if (!(words_include_escapes
&& (code == Sescape || code == Scharquote)))
if (code != Sword || WORD_BOUNDARY_P (ch0, ch1))
break;
- from++;
ch0 = ch1;
+#endif
+ from++;
}
count--;
}
＠＠ -392,7 +418,12 ＠＠
{
if (from == limit)
return 0;
+#ifndef MULE
+ if (word_constituent_p (buf, from - 1, mirrortab))
+ break;
+#endif
from--;
+#ifdef MULE
ch1 = BUF_FETCH_CHAR (buf, from - 1);
code = SYNTAX_UNSAFE (mirrortab, ch1);
if (words_include_escapes
＠＠ -400,20 +431,27 ＠＠
break;
if (code == Sword)
break;
+#endif
}
QUIT;
- while ( from != limit )
+ while ((from != limit)
+#ifndef MULE
+ && word_constituent_p (buf, from - 1, mirrortab)
+#endif
+ )
{
+#ifdef MULE
ch0 = BUF_FETCH_CHAR (buf, from - 1);
code = SYNTAX_UNSAFE (mirrortab, ch0);
if (!(words_include_escapes
&& (code == Sescape || code == Scharquote)))
if (code != Sword || WORD_BOUNDARY_P (ch0, ch1))
break;
- from--;
ch1 = ch0;
+#endif
+ from--;
}
count++;
}
--
弱り目に祟り目
8:40 a.m.
New subject: [Success] XEmacs 21.2-b17 "Chiyoda", i586-pc-win32
After applying Steven's patch to src\syntax.c, I can build 21.2-b17.
Thanks!
Adrian
XEmacs Build Report as generated with
M-x build-report RET
by build-report-version $Revision: 1.1.1.1 $ follows:
Contents of e:\export\home\tmp\21.2\xemacs\Installation:
(Output from most recent run of ./configure)
OS: Windows_NT
XEmacs 21.2-b17 \"Chiyoda\" configured for `i586-pc-win32'.
Building XEmacs in \"e:\\export\\home\\tmp\\21.2\\xemacs\\nt\".
Using compiler \"cl -nologo -W3 -O2 -G5\".
Installing XEmacs in \"c:\\Program Files\\XEmacs\\XEmacs-21.2-b17\".
Package path is \"~\\.xemacs;;c:\\Program Files\\XEmacs\\site-packages;c:\\Program
Files\\XEmacs\\xemacs-packages\".
Compiling in support for Microsoft Windows native GUI.
Compiling in support for XPM images.
Compiling in support for GIF images.
Compiling in support for PNG images.
Compiling in support for TIFF images.
Compiling in support for JPEG images.
Compiling in support for X-Face message headers.
Compiling in support for toolbars.
Compiling in support for dialogs.
Compiling in support for native sounds.
Compiling in fast dired implementation.
Using minimal tagbits.
Using indexed lrecord implementation.
Using union type for Lisp object storage.
Contents of
e:\export\home\tmp\21.2\xemacs\nt\xemacs-make-install.err
keeping lines matching
"^--\[\[\|\]\]$\|^\(cd\|n?make\)\s-\|errors?\|warnings?\|pure.*\(space\|size\)\|hides\b\|strange\|shadowings\|^Compil\(ing\s-+in\|ation\)\|^Using\|not\s-+found\|^While\s-+compiling.*\(
\s-+.+\)*\|^Note:\|Installing\|[Ff]ile(s) copied\|\s-+tests\s-+"
and then deleting lines matching
"confl.*with.*auto-inlining"
cd e:\export\home\tmp\21.2\xemacs\nt\
nmake /f xemacs.mak HAVE_XPM="1" HAVE_PNG="1" HAVE_TIFF="1"
HAVE_JPEG="1" HAVE_XFACE="1" USE_UNION_TYPE="1"
GUNG_HO="1"
COMPFACE_DIR="e:\\export\\home\\tmp\\libs4xemacs\\compface"
JPEG_DIR="e:\\export\\home\\tmp\\libs4xemacs\\jpeg-6b"
TIFF_DIR="e:\\export\\home\\tmp\\libs4xemacs\\tiff-v3.4"
ZLIB_DIR="e:\\export\\home\\tmp\\libs4xemacs\\zlib"
PNG_DIR="e:\\export\\home\\tmp\\libs4xemacs\\libpng-1.0.2"
XPM_DIR="e:\\export\\home\\tmp\\libs4xemacs\\xpm-3.4k" install
Compilation started at Thu Jun 24 09:27:04 1999
..\src\unexnt.c(265) : warning C4028: formal parameter 2 different from declaration
Using load-path (..\lisp ~\.xemacs c:\Program Files\XEmacs\site-packages c:\Program
Files\XEmacs\xemacs-packages)
Using module-load-path (..\modules)
While compiling x-font-menu-font-data in file
e:\export\home\tmp\21.2\xemacs\lisp\auto-autoloads.el:
** reference to free variable x-font-regexp-foundry-and-family
** reference to free variable x-font-regexp
While compiling the end of the data:
** the function vassoc is not known to be defined.
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\toolbar-items.el:
** The following functions are not known to be defined:
pending-delete-pre-hook, gnus, x-init-specifier-from-resources
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\dragdrop.el:
** the function mime/viewer-mode is not known to be defined.
While compiling get-selection-no-error in file
e:\export\home\tmp\21.2\xemacs\lisp\select.el:
** variable err bound but not referenced
While compiling select-convert-to-class:
** reference to free variable x-emacs-application-class
While compiling the end of the data:
** the function x-yank-clipboard-selection is not known to be defined.
While compiling the end of the data in file e:\export\home\tmp\21.2\xemacs\lisp\mouse.el:
** the function x-store-cutbuffer is not known to be defined.
While compiling the end of the data in file e:\export\home\tmp\21.2\xemacs\lisp\gui.el:
** The following functions are not known to be defined:
set-annotation-action, set-annotation-data
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\coding.el:
** the function set-console-tty-coding-system is not known to be defined.
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\scrollbar.el:
** the function x-init-scrollbar-from-resources is not known to be defined.
While compiling press-toolbar-button in file
e:\export\home\tmp\21.2\xemacs\lisp\toolbar.el:
** reference to free variable toolbar-blank-press-function
While compiling itimer-edit-mode in file e:\export\home\tmp\21.2\xemacs\lisp\itimer.el:
** buffer-flush-undo is an obsolete function; use buffer-disable-undo instead.
While compiling nt-shell-mode-hook in file e:\export\home\tmp\21.2\xemacs\lisp\winnt.el:
** assignment to free variable comint-completion-addsuffix
** assignment to free variable comint-process-echoes
While compiling find-space-insertable-point in file
e:\export\home\tmp\21.2\xemacs\lisp\fill.el:
** reference to free variable space-insertable
While compiling the end of the data:
** The following functions are not known to be defined:
kinsoku-process-extend, kinsoku-process
While compiling isearch-help-or-delete-char in file
e:\export\home\tmp\21.2\xemacs\lisp\isearch-mode.el:
** reference to free variable tty-erase-char
While compiling the end of the data:
** The following functions are not known to be defined:
x-keysym-on-keyboard-sans-modifiers-p, x-get-selection,
x-get-clipboard
While compiling set-visited-file-name in file
e:\export\home\tmp\21.2\xemacs\lisp\files.el:
** reference to free variable vc-mode
While compiling find-backup-file-name:
** variable bv-length bound but not referenced
While compiling save-some-buffers-1:
** assignment to free variable view-exit-action
While compiling the end of the data:
** The following functions are not known to be defined:
vc-after-save, dired-get-filename, dired-expunge-deletions,
ange-ftp-ftp-path
While compiling the end of the data in file e:\export\home\tmp\21.2\xemacs\lisp\help.el:
** The following functions are not known to be defined:
Info-find-node, compiled-function-annotation
While compiling command-line-1 in file e:\export\home\tmp\21.2\xemacs\lisp\startup.el:
** variable first-file-buffer bound but not referenced
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\modeline.el:
** the function vc-toggle-read-only is not known to be defined.
While compiling read-file-name-1 in file e:\export\home\tmp\21.2\xemacs\lisp\minibuf.el:
** reference to free variable rfhookfun
While compiling mouse-read-file-name-1:
** reference to free variable rfhookfun
While compiling the end of the data:
** The following functions are not known to be defined:
ange-ftp-ftp-path, user-name-all-completions,
user-name-completion-1, tty-color-list
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\simple.el:
** The following functions are not known to be defined:
x-keysym-on-keyboard-sans-modifiers-p, kinsoku-process
While compiling the end of the data in file e:\export\home\tmp\21.2\xemacs\lisp\frame.el:
** the function console-tty-controlling-process is not known to be defined.
While compiling set-face-stipple in file e:\export\home\tmp\21.2\xemacs\lisp\faces.el:
** reference to free variable x-bitmap-file-path
While compiling the end of the data:
** The following functions are not known to be defined:
x-init-face-from-resources, x-init-device-faces,
x-init-frame-faces, x-init-global-faces
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\console.el:
** the function console-tty-controlling-process is not known to be defined.
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\syntax.el:
** The following functions are not known to be defined:
charset-name, char-charset
While compiling the end of the data in file
e:\export\home\tmp\21.2\xemacs\lisp\cl-extra.el:
** The following functions are not known to be defined:
overlay-lists, overlay-start, overlay-end, overlays-at,
next-overlay-change
While compiling paths-find-superlock-file in file
e:\export\home\tmp\21.2\xemacs\lisp\setup-paths.el:
** reference to free variable configure-superlock-file
Using load-path (..\lisp ~\.xemacs c:\Program Files\XEmacs\site-packages c:\Program
Files\XEmacs\xemacs-packages)
Using module-load-path (..\modules)
Note: Strange doc (not fboundp) for function user-name-completion-1 ＠ 529663
Note: Strange doc (not fboundp) for function user-name-all-completions ＠ 529927
Note: Strange doc (not fboundp) for function make-symbolic-link ＠ 681376
Installing in c:\Program Files\XEmacs\XEmacs-21.2-b17 ...
1 File(s) copied
1 File(s) copied
7 File(s) copied
1 file(s) copied.
1 file(s) copied.
1 file(s) copied.
1 file(s) copied.
406 File(s) copied
113 File(s) copied
343 File(s) copied
1 File(s) copied
1 File(s) copied
1 File(s) copied
Compilation finished at Thu Jun 24 09:34:05
--
Adrian Aichner Teradyne GmbH, European Design Center
Integra Test Division Telephone +49/89/41861(0)-208
Dingolfinger Strasse 2 Fax +49/89/41861-217 (What is a Fax?)
D-81673 MUENCHEN E-mail adrian.aichner(a)teradyne.com
9096
days inactive
9096
days old
1 comments
2 participants
participants (2)
-
Adrian Aichner -
SL Baur