CVS update by scop packages/xemacs-packages/haskell-mode, haskell-indent.el ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: scop
Date: 06/05/24 19:52:08
Modified: packages/xemacs-packages/haskell-mode ChangeLog
haskell-indent.el haskell-simple-indent.el
Log:
Don't use line-{beginning,end}-position <1148121480.2765.70.camel(a)localhost.localdomain>
Revision Changes Path
1.26 +7 -0 XEmacs/packages/xemacs-packages/haskell-mode/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/haskell-mode/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ChangeLog 2006/05/17 08:32:03 1.25
+++ ChangeLog 2006/05/24 17:52:07 1.26
＠＠ -1,3 +1,10 ＠＠
+2006-05-20 Ville Skyttä <scop(a)xemacs.org>
+
+ * haskell-indent.el: Use `point-at-bol' and `point-at-eol' instead
+ of `line-beginning-position' and `line-end-position' for < 21.5
+ compatibility.
+ * haskell-simple-indent.el: Ditto.
+
2006-05-17 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.09 released.
1.5 +25 -13 XEmacs/packages/xemacs-packages/haskell-mode/haskell-indent.el
Index: haskell-indent.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/haskell-mode/haskell-indent.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- haskell-indent.el 2006/03/15 05:18:23 1.4
+++ haskell-indent.el 2006/05/24 17:52:07 1.5
＠＠ -172,7 +172,8 ＠＠ followed by an OFFSET (if present use it
(or (bolp)
(and (eq haskell-literate 'bird)
(<= (current-column) (1+ haskell-indent-literate-Bird-default-offset))
- (eq (char-after (line-beginning-position)) ?\>))))
+ ;; XEmacs: no `line-beginning-position' in < 21.5
+ (eq (char-after (point-at-bol)) ?\>))))
(defun haskell-indent-empty-line-p ()
"Checks if the current line is empty; deals with Bird style scripts."
＠＠ -192,7 +193,8 ＠＠ followed by an OFFSET (if present use it
(progn
(forward-char 1)
(if (not (eolp))
- (skip-chars-forward " \t" (line-end-position))))
+ ;; XEmacs: no `line-end-position' in < 21.5
+ (skip-chars-forward " \t" (point-at-eol))))
(back-to-indentation)))
(back-to-indentation)))
＠＠ -302,8 +304,9 ＠＠ It deals with both Bird style and non Bi
(save-excursion
(goto-char end) ; Remove end.
(if (re-search-backward "^\\\\end{code}[ \t\n]*\\="
- (line-beginning-position -2) t)
- (delete-region (point) (line-beginning-position 2)))
+ ;; XEmacs: no `line-beginning-position' in < 21.5
+ (point-at-bol -2) t)
+ (delete-region (point) (point-at-bol 2)))
(goto-char beg) ; Remove end.
(beginning-of-line)
(if (looking-at "\\\\begin{code}")
＠＠ -864,7 +867,8 ＠＠ and find indentation info for each part.
(let ; guess the type of line
((sep
(haskell-indent-separate-valdef
- (point) (line-end-position))))
+ ;; XEmacs: no `line-end-position' in < 21.5
+ (point) (point-at-eol))))
;; if the first ident is where or the start of a def
;; keep it in a global variable
(setq haskell-indent-current-line-first-ident
＠＠ -877,7 +881,8 ＠＠ and find indentation info for each part.
(while contour-line ; explore the contour points
(setq line-start (pop contour-line))
(goto-char line-start)
- (setq line-end (line-end-position))
+ ;; XEmacs: no `line-end-position' in < 21.5
+ (setq line-end (point-at-eol))
(setq end-visible ; visible until the column of the
(if contour-line ; next contour point
(save-excursion
＠＠ -950,7 +955,8 ＠＠ OPEN is the start position of the commen
(cond
((eq (char-after) ?\{) nil) ;Align as if it were code.
((and (forward-comment -1)
- (> (line-beginning-position 3) open))
+ ;; XEmacs: no `line-beginning-position' in < 21.5
+ (> (point-at-bol 3) open))
;; We're after another comment and there's no empty line
;; between us.
(list (list (haskell-indent-point-to-col (point)))))
＠＠ -1246,15 +1252,18 ＠＠ TYPE is either 'guard or 'rhs."
(setq start-block
(save-excursion
(goto-char (mark))
- (line-beginning-position)))
+ ;; XEmacs: no `line-beginning-position' in < 21.5
+ (point-at-bol)))
(setq end-block
(progn (if (haskell-indent-bolp)
(haskell-indent-forward-line -1))
- (line-end-position))))
+ ;; XEmacs: no `line-end-position' in < 21.5
+ (point-at-eol))))
(error "The mark is not set for aligning definitions"))
;; aligning the current definition
(setq start-block (haskell-indent-start-of-def))
- (setq end-block (line-end-position)))
+ ;; XEmacs: no `line-end-position' in < 21.5
+ (setq end-block (point-at-eol)))
;; find the start of the current valdef using the contour line
;; in reverse order because we need the nearest one from the end
(setq contour
＠＠ -1278,7 +1287,8 ＠＠ TYPE is either 'guard or 'rhs."
(setq defname "\\<\\|("))
(setq defcol (haskell-indent-point-to-col defnamepos))
(goto-char pos)
- (setq end-block (line-end-position))
+ ;; XEmacs: no `line-end-position' in < 21.5
+ (setq end-block (point-at-eol))
(catch 'top-of-buffer
(while (and (not start-found)
(>= (point) start-block))
＠＠ -1308,7 +1318,8 ＠＠ TYPE is either 'guard or 'rhs."
(save-excursion
(goto-char (caadr eqns-start))
(haskell-indent-forward-line -1)
- (line-end-position))
+ ;; XEmacs: no `line-end-position' in < 21.5
+ (point-at-eol))
end-block))
(setq sep (haskell-indent-separate-valdef eqn lastpos)))
(if (eq type 'guard)
＠＠ -1330,7 +1341,8 ＠＠ TYPE is either 'guard or 'rhs."
(goto-char pos)
(skip-chars-backward
" \t"
- (line-beginning-position))
+ ;; XEmacs: no `line-beginning-position' in < 21.5
+ (point-at-bol))
(if (haskell-indent-bolp)
;;if on an empty prefix
(haskell-indent-point-to-col pos) ;keep original indent
1.3 +2 -1 XEmacs/packages/xemacs-packages/haskell-mode/haskell-simple-indent.el
Index: haskell-simple-indent.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/haskell-mode/haskell-simple-indent.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- haskell-simple-indent.el 2006/03/15 05:18:23 1.2
+++ haskell-simple-indent.el 2006/05/24 17:52:08 1.3
＠＠ -100,7 +100,8 ＠＠ column, `tab-to-tab-stop' is done instea
(< this-indentation invisible-from))
(if (> this-indentation start-column)
(setq invisible-from this-indentation)
- (let ((end (line-beginning-position 2)))
+ ;; XEmacs: no `line-beginning-position' in < 21.5
+ (let ((end (point-at-bol 2)))
(move-to-column start-column)
;; Is start-column inside a tab on this line?
(if (> (current-column) start-column)
- 1 participants
- 0 comments
CVS update by james xemacs/src ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: james
Date: 06/05/24 18:30:37
Modified: xemacs/src ChangeLog objects-x.c
Log:
Don't use C99/C++ variable declaration style. <86zmhiax0m.fsf(a)santinel.home.ua>
Revision Changes Path
1.968 +4 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.967
retrieving revision 1.968
diff -u -p -r1.967 -r1.968
--- ChangeLog 2006/05/23 19:38:29 1.967
+++ ChangeLog 2006/05/24 16:30:28 1.968
＠＠ -1,3 +1,7 ＠＠
+2006-05-16 Andrey Slusar <anrays(a)gmail.com>
+
+ * objects-x.c (x_find_charset_font): Fix build with gcc 2.95.
+
2006-05-23 Aidan Kehoe <kehoea(a)parhasard.net>
* file-coding.c (output_bytes_in_ascii_and_hex):
1.41 +1 -1 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- objects-x.c 2006/05/09 10:40:09 1.40
+++ objects-x.c 2006/05/24 16:30:32 1.41
＠＠ -1215,6 +1215,7 ＠＠ x_find_charset_font (Lisp_Object device,
stderr_out ("Failed fontconfig initialization\n");
else
{
+ struct charset_reporter *cr;
FcPattern *fontxft; /* long-lived, freed at end of this block */
FcResult fcresult;
FcConfig *fcc;
＠＠ -1302,7 +1303,6 ＠＠ x_find_charset_font (Lisp_Object device,
Optimization: cache the generated FcCharSet in the Mule charset.
Don't forget to destroy it if the Mule charset gets deallocated. */
- struct charset_reporter *cr;
for (cr = charset_table;
cr->charset && !EQ (*(cr->charset), charset);
cr++)
- 1 participants
- 0 comments
CVS update by stephent xemacsweb/People/jason.mastaler ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: stephent
Date: 06/05/24 09:23:49
Modified: xemacsweb/People/jason.mastaler index.content
Log:
Remove photo per Jason's request. <878xoryjkt.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.9 +5 -0 XEmacs/xemacsweb/People/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/People/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ChangeLog 2006/03/14 08:18:42 1.8
+++ ChangeLog 2006/05/24 07:23:41 1.9
＠＠ -1,3 +1,8 ＠＠
+2006-05-24 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * jason.mastaler/index.content: Remove photo per Jason's request.
+ xemacs-mailmaint: <44720EC1.60701(a)mastaler.com>
+
2006-03-14 Marcus Crestani <crestani(a)xemacs.org>
* marcus.crestani/index.content: Update myself.
1.2 +0 -2 XEmacs/xemacsweb/People/jason.mastaler/index.content
Index: index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/People/jason.mastaler/index.content,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- index.content 2005/01/31 02:48:33 1.1
+++ index.content 2006/05/24 07:23:49 1.2
＠＠ -4,8 +4,6 ＠＠ XEmacs Home Page for Jason Mastaler
Ben Wing, based on generic home page
%main%
- <img src="../photos/jason.png" alt="(photo)" />
-
<h1>XEmacs Home Page for Jason Mastaler</h1>
<p>
- 1 participants
- 0 comments
CVS update by viteno xemacs/src ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/05/23 23:51:36
Modified: xemacs/src depend
Log:
Update src depends
Revision Changes Path
1.63 +1 -1 XEmacs/xemacs/src/depend
Index: depend
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/depend,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- depend 2006/04/23 21:51:28 1.62
+++ depend 2006/05/23 21:51:35 1.63
＠＠ -236,7 +236,7 ＠＠ sysdep.o: $(LISP_H) buffer.h bufslots.h
sysdll.o: $(LISP_H) intl-auto-encap-win32.h sysdll.h sysfile.h syswindows.h
termcap.o: $(LISP_H) console.h device.h
terminfo.o: $(CONFIG_H)
-tests.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h elhash.h lstream.h opaque.h
+tests.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h elhash.h file-coding.h lstream.h opaque.h
text.o: $(LISP_H) backtrace.h buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h file-coding.h lstream.h profile.h
toolbar-common.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h charset.h conslots.h console-gtk-impl.h console-gtk.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h glyphs.h redisplay.h scrollbar.h specifier.h toolbar-common.h toolbar.h window-impl.h window.h winslots.h xintrinsic.h
toolbar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs.h redisplay.h scrollbar.h specifier.h toolbar.h window-impl.h window.h winslots.h
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/05/23 23:51:17
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1540 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1539
retrieving revision 1.1540
diff -u -p -r1.1539 -r1.1540
--- version.sh 2006/05/22 21:50:46 1.1539
+++ version.sh 2006/05/23 21:51:16 1.1540
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20060522)"
+xemacs_extra_name="(+CVS-20060523)"
xemacs_release_date="2006-05-16"
- 1 participants
- 0 comments
CVS update by aidan xemacs/src ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/05/23 21:38:33
Modified: xemacs/src ChangeLog file-coding.c
Log:
Fix Win32 build; cast stderr_out string arguments to const CIbyte *
Revision Changes Path
1.967 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.966
retrieving revision 1.967
diff -u -p -r1.966 -r1.967
--- ChangeLog 2006/05/23 13:18:56 1.966
+++ ChangeLog 2006/05/23 19:38:29 1.967
＠＠ -1,3 +1,8 ＠＠
+2006-05-23 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * file-coding.c (output_bytes_in_ascii_and_hex):
+ Fix a Win32 build failure introduced by my last commit.
+
2006-05-23 Stephen J. Turnbull <stephen(a)xemacs.org>
* .gdbinit.in: Moved to etc.
1.54 +2 -1 XEmacs/xemacs/src/file-coding.c
Index: file-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- file-coding.c 2006/05/22 20:28:01 1.53
+++ file-coding.c 2006/05/23 19:38:30 1.54
＠＠ -3390,7 +3390,8 ＠＠ output_bytes_in_ascii_and_hex (const UEx
eicpy_ext(eistr_hex, hex, Qbinary);
eicpy_ext(eistr_ascii, ascii, Qbinary);
- stderr_out ("%s %s", eidata(eistr_ascii), eidata(eistr_hex));
+ stderr_out ("%s %s", (const CIbyte *)(eidata(eistr_ascii)),
+ (const CIbyte *)eidata(eistr_hex));
}
#endif /* DEBUG_XEMACS */
- 1 participants
- 0 comments
CVS update by stephent xemacs/src .dbxrc.in .gdbinit.in
17 years, 11 months
CVS Monitor
CVS Monitor
User: stephent
Date: 06/05/23 17:14:35
Removed: xemacs/src .dbxrc.in .gdbinit.in
Log:
Remove files missed earlier.
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: stephent
Date: 06/05/23 15:18:59
Modified: xemacs/src ChangeLog
Added: xemacs/etc dbxrc.in gdbinit.in
Log:
Generate dbx/gdb rc files right. <873bf0zz31.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.505 +6 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -p -r1.504 -r1.505
--- ChangeLog 2006/05/17 06:18:45 1.504
+++ ChangeLog 2006/05/23 13:18:50 1.505
＠＠ -1,3 +1,9 ＠＠
+2006-05-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac: Look for debugger init file templates in etc/, not
+ src/. Debugger init files depend on config.h; recreate on every
+ configure. Support XCOMM convention. Update FSF copyright.
+
2006-05-17 Malcolm Purvis <malcolmp(a)xemacs.org>
* PROBLEMS: Add entry concerning X errors when using ssh.
1.42 +17 -9 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- configure.ac 2006/04/23 16:11:17 1.41
+++ configure.ac 2006/05/23 13:18:50 1.42
＠＠ -34,9 +34,7 ＠＠ AC_COPYRIGHT(
[Configuration script for XEmacs. Largely divergent from FSF.
Guess values for system-dependent variables and create Makefiles.
-Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
-Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
-Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 1992-1999, 2001-2006 Free Software Foundation, Inc.
Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois.
Copyright (C) 1996, 1997 Sun Microsystems, Inc.
Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing.
＠＠ -5576,16 +5574,18 ＠＠ dnl ------------------------------------
dnl Create some auxiliary files for developers.
dnl ----------------------------------------------
+dnl Unlike TAGS, debugger init files depend on config.h.
+dnl Regenerate them locally on every configure.
dnl Create a .gdbinit useful for debugging XEmacs
-if test -f "$srcdir/src/.gdbinit.in" -a ! -f "src/.gdbinit.in"; then
+if test -f "$srcdir/etc/gdbinit.in"; then
test "$verbose" = "yes" && echo "creating src/.gdbinit.in"
- echo "source $srcdir/src/.gdbinit.in" > "src/.gdbinit.in"
+ cp $srcdir/etc/gdbinit.in src/.gdbinit.in
fi
dnl Create a .dbxrc useful for debugging XEmacs
-if test -f "$srcdir/src/.dbxrc.in" -a ! -f "src/.dbxrc.in"; then
+if test -f "$srcdir/etc/dbxrc.in"; then
test "$verbose" = "yes" && echo "creating src/.dbxrc.in"
- echo ". $srcdir/src/.dbxrc.in" > "src/.dbxrc.in"
+ echo ". $srcdir/etc/dbxrc.in" > "src/.dbxrc.in"
fi
dnl Create a useful TAGS file
＠＠ -6235,6 +6235,11 ＠＠ dnl two brackets become one, but inside
dnl more, or something -- I don't understand, but Martin probably does.
dnl We put the brackets back later.
dnl [ben]
+dnl To insert comments that will remain in the generated file, we use the
+dnl imake XCOMM convention. Lines beginning with "XCOMM " exactly (no
+dnl leading whitespace, one trailing ASCII space, case sensitive) will be
+dnl transformed to shell/make/gdb comments in the generated file.
+dnl [sjt]
dnl MAKE_JUNK_C(filename):
dnl Copy a .in file to junk.c in preparation for passing through the
＠＠ -6283,7 +6288,9 ＠＠ dnl Restore lines quoted above to origin
s/\\\([[\"]]\)/\1/g
s/^[[ TAB]]*\"//
s/\"[[ TAB]]*$//
-}' > Makefile.new
+}' \
+dnl Convert comments -- must come after the unquoting operations
+ -e 's/^XCOMM /\# /' > Makefile.new
chmod 444 Makefile.new
mv -f Makefile.new $2
])dnl CPP_MAKEFILE
＠＠ -6295,7 +6302,8 ＠＠ AC_CONFIG_COMMANDS([default],
dnl Create a GNUmakefile and Makefile from Makefile.in.
dnl Create xemacs.def from xemacs.def.in in the same fashion,
-dnl if it exists (i.e. in the src/ directory).
+dnl if it exists (i.e. in the src/ directory). Ditto for the
+dnl debugger init files (in the src/ directory).
MAKE_JUNK_C(Makefile.in)
CPP_MAKEFILE(,Makefile)
CPP_MAKEFILE(-DUSE_GNU_MAKE,GNUmakefile)
1.73 +8 -0 XEmacs/xemacs/etc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ChangeLog 2006/05/16 08:23:06 1.72
+++ ChangeLog 2006/05/23 13:18:54 1.73
＠＠ -1,3 +1,11 ＠＠
+2006-05-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * gdbinit.in:
+ * dbxrc.in:
+ Moved from src/. Update FSF address. Improve comments.
+
+ * gdbinit.in: Use XCOMM for "don't edit" comment and copyright.
+
2006-05-16 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.27 "fiddleheads" is released.
1.1 XEmacs/xemacs/etc/dbxrc.in
Index: dbxrc.in
===================================================================
## dbx init file for XEmacs -*- ksh -*-
## This is the source file for src/.dbxrc. Edit it, and rerun configure.
## (Running config.status is not enough.)
## The generated file depends on src/config.h (currently only in one place).
## Copyright (C) 1998 Free Software Foundation, Inc.
## This file is part of XEmacs.
## XEmacs is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
## Free Software Foundation; either version 2, or (at your option) any
## later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
## for more details.
## You should have received a copy of the GNU General Public License
## along with XEmacs; see the file COPYING. If not, write to
## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
## Boston, MA 02110-1301 USA
## Author: Martin Buchholz
## Other contributors you could ask for help: Ivan Golubev, Jerry James,
## Stephen Turnbull.
## You can use this file to debug XEmacs using Sun WorkShop's dbx.
## Some functions defined here require a running process, but most
## don't. Considerable effort has been expended to this end.
## Since this file is called `.dbxrc', it will be read by dbx
## automatically when dbx is run in the build directory, which is where
## developers usually debug their xemacs.
## See also the comments in .gdbinit.
## See also the question of the XEmacs FAQ, titled
## "How to Debug an XEmacs problem with a debugger".
## gdb sources the ./.gdbinit in _addition_ to ~/.gdbinit.
## But dbx does _not_ source ~/.dbxrc if it found ./.dbxrc.
## So we simulate the gdb algorithm by doing it ourselves here.
#define NOT_C_CODE
#include "config.h"
if test -r $HOME/.dbxrc; then . $HOME/.dbxrc; fi
dbxenv language_mode ansic
ignore POLL
ignore IO
#ifdef VDB_POSIX
ignore SIGSEGV
ignore SIGBUS
#endif
document lbt << 'end'
Usage: lbt
Print the current Lisp stack trace.
Requires a running xemacs process.
end
function lbt {
call debug_backtrace()
}
document ldp << 'end'
Usage: ldp lisp_object
Print a Lisp Object value using the Lisp printer.
Requires a running xemacs process.
end
function ldp {
call debug_print ($1);
}
Lisp_Type_Int=-2
## A bug in dbx prevents string variables from having values beginning with `-'!!
function XEmacsInit {
function ToInt { eval "$1=\$[(int) \`alloc.c\`$1]"; }
ToInt dbg_USE_UNION_TYPE
ToInt Lisp_Type_Char
ToInt Lisp_Type_Record
ToInt dbg_valbits
ToInt dbg_gctypebits
function ToLong { eval "$1=\$[(\`alloc.c\`unsigned long) \`alloc.c\`$1]"; }
ToLong dbg_valmask
ToLong dbg_typemask
xemacs_initted=yes
}
function printvar {
for i in $*; do eval "echo $i=\$$i"; done
}
document decode_object << 'end'
Usage: decode_object lisp_object
Extract implementation information from a Lisp Object.
Defines variables $val, $type and $imp.
end
## Various dbx bugs cause ugliness in following code
function decode_object {
if test -z "$xemacs_initted"; then XEmacsInit; fi;
if test $dbg_USE_UNION_TYPE = 1; then
## Repeat after me... dbx sux, dbx sux, dbx sux...
## Allow both `pobj Qnil' and `pobj 0x82746834' to work
case $(whatis $1) in
*Lisp_Object*) obj="$[(`alloc.c`unsigned long)(($1).i)]";;
*) obj="$[(`alloc.c`unsigned long)($1)]";;
esac
else
obj="$[(`alloc.c`unsigned long)($1)]";
fi
if test $[(int)($obj & 1)] = 1; then
## It's an int
val=$[(long)(((unsigned long long)$obj) >> 1)]
type=$Lisp_Type_Int
else
type=$[(int)(((void*)$obj) & $dbg_typemask)]
if test $type = $Lisp_Type_Char; then
val=$[(void*)(long)(((unsigned long long)($obj & $dbg_valmask)) >> $dbg_gctypebits)]
else
## It's a record pointer
val=$[(void*)$obj]
if test "$val" = "(nil)"; then type=null_pointer; fi
fi
fi
if test $type = $Lisp_Type_Record; then
lheader="((struct lrecord_header *) $val)"
lrecord_type=$[(enum lrecord_type) $lheader->type]
imp=$[(void*)(`alloc.c`lrecord_implementations_table[$lheader->type])]
else
lheader="((struct lrecord_header *) -1)"
lrecord_type=-1
imp="0xdeadbeef"
fi
## printvar obj val type imp
}
function xint {
decode_object "$*"
print (long) ($val)
}
document xtype << 'end'
Usage: xtype lisp_object
Print the Lisp type of a lisp object.
end
function xtype {
decode_object "$*"
if test $type = $Lisp_Type_Int; then echo "int"
elif test $type = $Lisp_Type_Char; then echo "char"
elif test $type = null_pointer; then echo "null_pointer"
else
echo "record type with name: $[((struct lrecord_implementation *)$imp)->name]"
fi
}
function lisp-shadows {
run -batch -vanilla -f list-load-path-shadows
}
function environment-to-run-temacs {
unset EMACSLOADPATH
export EMACSBOOTSTRAPLOADPATH=../lisp/:..
export EMACSBOOTSTRAPMODULEPATH=../modules/:..
}
document run-temacs << 'end'
Usage: run-temacs
Run temacs interactively, like xemacs.
Use this with debugging tools (like purify) that cannot deal with dumping,
or when temacs builds successfully, but xemacs does not.
end
function run-temacs {
environment-to-run-temacs
run -nd -batch -l ../lisp/loadup.el run-temacs -q ${1+"$＠"}
}
document check-xemacs << 'end'
Usage: check-xemacs
Run the test suite. Equivalent to 'make check'.
end
function check-xemacs {
run -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated
}
document check-temacs << 'end'
Usage: check-temacs
Run the test suite on temacs. Equivalent to 'make check-temacs'.
Use this with debugging tools (like purify) that cannot deal with dumping,
or when temacs builds successfully, but xemacs does not.
end
function check-temacs {
run-temacs -q -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated
}
document update-elc << 'end'
Usage: update-elc
Run the core lisp byte compilation part of the build procedure.
Use when debugging temacs, not xemacs!
Use this when temacs builds successfully, but xemacs does not.
end
function update-elc {
environment-to-run-temacs
run -nd -batch -l ../lisp/update-elc.el
}
document dmp << 'end'
Usage: dmp
Run the dumping part of the build procedure.
Use when debugging temacs, not xemacs!
Use this when temacs builds successfully, but xemacs does not.
end
function dmp {
environment-to-run-temacs
run -nd -batch -l ../lisp/loadup.el dump
}
function pstruct { ## pstruct foo.c struct-name
module "$1" > /dev/null
type_ptr="((struct $2 *) $val)"
print $type_ptr
print *$type_ptr
}
document pobj << 'end'
Usage: pobj lisp_object
Print the internal C representation of a Lisp Object.
end
function pobj {
decode_object $1
if test $type = $Lisp_Type_Int; then
print -f"Integer: %d" $val
elif test $type = $Lisp_Type_Char; then
if test $[$val > 32 && $val < 128] = 1; then
print -f"Char: %c" $val
else
print -f"Char: %d" $val
fi
elif test $lrecord_type = lrecord_type_string; then
pstruct alloc.c Lisp_String
elif test $lrecord_type = lrecord_type_cons; then
pstruct alloc.c Lisp_Cons
elif test $lrecord_type = lrecord_type_symbol; then
pstruct symbols.c Lisp_Symbol
echo "Symbol name: $[(char *)($type_ptr->name->data)]"
elif test $lrecord_type = lrecord_type_vector; then
pstruct alloc.c Lisp_Vector
echo "Vector of length $[$type_ptr->size]"
elif test $lrecord_type = lrecord_type_bit_vector; then
pstruct fns.c Lisp_Bit_Vector
elif test $lrecord_type = lrecord_type_buffer; then
pstruct buffer.c buffer
elif test $lrecord_type = lrecord_type_char_table; then
pstruct chartab.c Lisp_Char_Table
elif test $lrecord_type = lrecord_type_char_table_entry; then
pstruct chartab.c Lisp_Char_Table_Entry
elif test $lrecord_type = lrecord_type_charset; then
pstruct mule-charset.c Lisp_Charset
elif test $lrecord_type = lrecord_type_coding_system; then
pstruct file-coding.c Lisp_Coding_System
elif test $lrecord_type = lrecord_type_color_instance; then
pstruct objects.c Lisp_Color_Instance
elif test $lrecord_type = lrecord_type_command_builder; then
pstruct event-stream.c command_builder
elif test $lrecord_type = lrecord_type_compiled_function; then
pstruct bytecode.c Lisp_Compiled_Function
elif test $lrecord_type = lrecord_type_console; then
pstruct console.c console
elif test $lrecord_type = lrecord_type_database; then
pstruct database.c Lisp_Database
elif test $lrecord_type = lrecord_type_device; then
pstruct device.c device
elif test $lrecord_type = lrecord_type_event; then
pstruct events.c Lisp_Event
elif test $lrecord_type = lrecord_type_extent; then
pstruct extents.c extent
elif test $lrecord_type = lrecord_type_extent_auxiliary; then
pstruct extents.c extent_auxiliary
elif test $lrecord_type = lrecord_type_extent_info; then
pstruct extents.c extent_info
elif test $lrecord_type = lrecord_type_face; then
pstruct faces.c Lisp_Face
elif test $lrecord_type = lrecord_type_float; then
pstruct floatfns.c Lisp_Float
elif test $lrecord_type = lrecord_type_font_instance; then
pstruct objects.c Lisp_Font_Instance
elif test $lrecord_type = lrecord_type_frame; then
pstruct frame.c frame
elif test $lrecord_type = lrecord_type_glyph; then
pstruct glyph.c Lisp_Glyph
elif test $lrecord_type = lrecord_type_gui_item; then
pstruct gui.c Lisp_Gui_Item
elif test $lrecord_type = lrecord_type_hash_table; then
pstruct elhash.c Lisp_Hash_Table
elif test $lrecord_type = lrecord_type_image_instance; then
pstruct glyphs.c Lisp_Image_Instance
elif test $lrecord_type = lrecord_type_keymap; then
pstruct keymap.c Lisp_Keymap
elif test $lrecord_type = lrecord_type_lcrecord_list; then
pstruct alloc.c lcrecord_list
elif test $lrecord_type = lrecord_type_ldap; then
pstruct ldap.c Lisp_LDAP
elif test $lrecord_type = lrecord_type_lstream; then
pstruct lstream.c lstream
elif test $lrecord_type = lrecord_type_marker; then
pstruct marker.c Lisp_Marker
elif test $lrecord_type = lrecord_type_opaque; then
pstruct opaque.c Lisp_Opaque
elif test $lrecord_type = lrecord_type_opaque_ptr; then
pstruct opaque.c Lisp_Opaque_Ptr
elif test $lrecord_type = lrecord_type_popup_data; then
pstruct gui-x.c popup_data
elif test $lrecord_type = lrecord_type_process; then
pstruct process.c Lisp_Process
elif test $lrecord_type = lrecord_type_range_table; then
pstruct rangetab.c Lisp_Range_Table
elif test $lrecord_type = lrecord_type_specifier; then
pstruct specifier.c Lisp_Specifier
elif test $lrecord_type = lrecord_type_subr; then
pstruct eval.c Lisp_Subr
elif test $lrecord_type = lrecord_type_symbol_value_buffer_local; then
pstruct symbols.c symbol_value_buffer_local
elif test $lrecord_type = lrecord_type_symbol_value_forward; then
pstruct symbols.c symbol_value_forward
elif test $lrecord_type = lrecord_type_symbol_value_lisp_magic; then
pstruct symbols.c symbol_value_lisp_magic
elif test $lrecord_type = lrecord_type_symbol_value_varalias; then
pstruct symbols.c symbol_value_varalias
elif test $lrecord_type = lrecord_type_timeout; then
pstruct event-stream.c Lisp_Timeout
elif test $lrecord_type = lrecord_type_toolbar_button; then
pstruct toolbar.c toolbar_button
elif test $lrecord_type = lrecord_type_tooltalk_message; then
pstruct tooltalk.c Lisp_Tooltalk_Message
elif test $lrecord_type = lrecord_type_tooltalk_pattern; then
pstruct tooltalk.c Lisp_Tooltalk_Pattern
elif test $lrecord_type = lrecord_type_weak_list; then
pstruct data.c weak_list
elif test $lrecord_type = lrecord_type_window; then
pstruct window.c window
elif test $lrecord_type = lrecord_type_window_configuration; then
pstruct window.c window_config
elif test "$type" = "null_pointer"; then
echo "Lisp Object is a null pointer!!"
else
echo "Unknown Lisp Object type"
print $1
fi
}
dbxenv suppress_startup_message 4.0
## dbxenv mt_watchpoints on
function dp_core {
print ((struct x_frame *)(((struct frame*)(Fselected_frame(Qnil)&0x00FFFFFF))->frame_data))->widget->core
}
## Barf!
function print_shell {
print *(`frame-x.c`TopLevelShellRec*) (((struct `frame-x.c`x_frame*) (((struct `frame-x.c`frame*) (Fselected_frame(Qnil)&0x00FFFFFF))->frame_data))->widget)
}
## -------------------------------------------------------------
## functions to test the debugging support itself.
## If you change this file, make sure the following still work...
## -------------------------------------------------------------
function test_xtype {
function doit { echo -n "$1: "; xtype "$1"; }
test_various_objects
}
function test_pobj {
function doit { echo '==============================='; echo -n "$1: "; pobj "$1"; }
test_various_objects
}
function test_various_objects {
doit Vemacs_major_version
doit Vhelp_char
doit Qnil
doit Qunbound
doit Vobarray
doit Vall_weak_lists
doit Vxemacs_codename
}
1.1 XEmacs/xemacs/etc/gdbinit.in
Index: gdbinit.in
===================================================================
## gdb init file for XEmacs -*- ksh -*-
## This is the source for src/.gdbinit. Edit it, and rerun configure.
## (Running config.status is not enough.)
## The generated file depends on src/config.h (currently only in one place).
## To insert comments that will remain in the generated file, we use the
## imake XCOMM convention. Lines beginning with "XCOMM " exactly (no
## leading whitespace, one trailing ASCII space, case sensitive) will be
## transformed to gdb command file comments in the generated file.
XCOMM gdb init file for XEmacs
XCOMM AUTOMATICALLY GENERATED FROM etc/gdbinit.in BY configure -- DO NOT EDIT.
XCOMM See etc/gdbinit.in for licensing information and usage hints.
XCOMM Copyright (C) 1998 Free Software Foundation, Inc.
## This file is part of XEmacs.
## XEmacs is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
## Free Software Foundation; either version 2, or (at your option) any
## later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
## for more details.
## You should have received a copy of the GNU General Public License
## along with XEmacs; see the file COPYING. If not, write to
## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
## Boston, MA 02110-1301 USA
## Author: Martin Buchholz
## Other contributors you could ask for help: Ivan Golubev, Jerry James,
## Stephen Turnbull.
## Some useful commands for debugging emacs with gdb 4.16 or better.
##
## Since this file is called `.gdbinit', it will be read by gdb
## automatically when gdb is run in the build directory, which is where
## developers usually debug their xemacs. You can also source this
## file from your ~/.gdbinit, if you like.
##
## Configure xemacs with --debug, and compile with -g.
##
## See also the question of the XEmacs FAQ, titled
## "How to Debug an XEmacs problem with a debugger".
##
## This can be used to debug XEmacs no matter how the following are
## specified:
## USE_UNION_TYPE
## (the above all have configure equivalents)
## Some functions defined here require a running process, but most
## don't. Considerable effort has been expended to this end.
## See the dbg_ C support code in src/alloc.c that allows the functions
## defined in this file to work correctly.
#define NOT_C_CODE
#include "config.h"
set print union off
set print pretty off
#ifdef VDB_POSIX
handle SIGSEGV SIGBUS nostop noprint
#endif
set $Lisp_Type_Int = -2
define decode_object
set $obj = (unsigned long) $arg0
if $obj & 1
## It's an int
set $val = $obj >> 1
set $type = $Lisp_Type_Int
else
set $type = $obj & dbg_typemask
if $type == Lisp_Type_Char
set $val = ($obj & dbg_valmask) >> dbg_gctypebits
else
## It's a record pointer
set $val = $obj
end
end
if $type == Lisp_Type_Record
set $lheader = ((struct lrecord_header *) $val)
set $lrecord_type = ($lheader->type)
set $imp = ((struct lrecord_implementation *) lrecord_implementations_table[(int) $lrecord_type])
else
set $lrecord_type = -1
set $lheader = -1
set $imp = -1
end
end
document decode_object
Usage: decode_object lisp_object
Extract implementation information from a Lisp Object.
Defines variables $val, $type and $imp.
end
define xint
decode_object $arg0
print ((long) $val)
end
define xtype
decode_object $arg0
if $type == $Lisp_Type_Int
echo int\n
else
if $type == Lisp_Type_Char
echo char\n
else
printf "record type: %s\n", $imp->name
end
end
end
document xtype
Usage: xtype lisp_object
Print the Lisp type of a lisp object.
end
define lisp-shadows
run -batch -vanilla -f list-load-path-shadows
end
document lisp-shadows
Usage: lisp-shadows
Run xemacs to check for lisp shadows
end
define environment-to-run-temacs
unset env EMACSLOADPATH
set env EMACSBOOTSTRAPLOADPATH=../lisp/:..
set env EMACSBOOTSTRAPMODULEPATH=../modules/:..
end
define run-temacs
environment-to-run-temacs
run -nd -batch -l ../lisp/loadup.el run-temacs -q
end
document run-temacs
Usage: run-temacs
Run temacs interactively, like xemacs.
Use this with debugging tools (like purify) that cannot deal with dumping,
or when temacs builds successfully, but xemacs does not.
end
define check-xemacs
run -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated
end
document check-xemacs
Usage: check-xemacs
Run the test suite. Equivalent to 'make check'.
end
define check-temacs
environment-to-run-temacs
run -nd -batch -l ../lisp/loadup.el run-temacs -q -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated
end
document check-temacs
Usage: check-temacs
Run the test suite on temacs. Equivalent to 'make check-temacs'.
Use this with debugging tools (like purify) that cannot deal with dumping,
or when temacs builds successfully, but xemacs does not.
end
define update-elc
environment-to-run-temacs
run -nd -batch -l ../lisp/update-elc.el
end
document update-elc
Usage: update-elc
Run the core lisp byte compilation part of the build procedure.
Use when debugging temacs, not xemacs!
Use this when temacs builds successfully, but xemacs does not.
end
define dmp
environment-to-run-temacs
run -nd -batch -l ../lisp/loadup.el dump
end
document dmp
Usage: dmp
Run the dumping part of the build procedure.
Use when debugging temacs, not xemacs!
Use this when temacs builds successfully, but xemacs does not.
end
define ldp
printf "%s", "Lisp => "
call debug_print($arg0)
end
document ldp
Usage: ldp lisp_object
Print a Lisp Object value using the Lisp printer.
Requires a running xemacs process.
end
define lbt
call debug_backtrace()
end
document lbt
Usage: lbt
Print the current Lisp stack trace.
Requires a running xemacs process.
end
define leval
ldp Feval(Fcar(Fread_from_string(build_string($arg0),Qnil,Qnil)))
end
document leval
Usage: leval "SEXP"
Eval a lisp expression.
Requires a running xemacs process.
Example:
(gdb) leval "(+ 1 2)"
Lisp ==> 3
end
define wtype
print $arg0->core.widget_class->core_class.class_name
end
define xtname
print XrmQuarkToString(((Object)($arg0))->object.xrm_name)
end
## GDB's command language makes you want to ...
define pptype
set $type_ptr = ($arg0 *) $val
print $type_ptr
print *$type_ptr
end
define pstructtype
set $type_ptr = (struct $arg0 *) $val
print $type_ptr
print *$type_ptr
end
define pobj
decode_object $arg0
if $type == $Lisp_Type_Int
printf "Integer: %d\n", $val
else
if $type == Lisp_Type_Char
if $val > 32 && $val < 128
printf "Char: %c\n", $val
else
printf "Char: %d\n", $val
end
else
if $lrecord_type == lrecord_type_string
pptype Lisp_String
else
if $lrecord_type == lrecord_type_cons
pptype Lisp_Cons
else
if $lrecord_type == lrecord_type_symbol
pptype Lisp_Symbol
printf "Symbol name: %s\n", ((Lisp_String *)$type_ptr->name)->data_
else
if $lrecord_type == lrecord_type_vector
pptype Lisp_Vector
printf "Vector of length %d\n", $type_ptr->size
##print *($type_ptr->data) ＠ $type_ptr->size
else
if $lrecord_type == lrecord_type_bit_vector
pptype Lisp_Bit_Vector
else
if $lrecord_type == lrecord_type_buffer
pstructtype buffer
else
if $lrecord_type == lrecord_type_char_table
pptype Lisp_Char_Table
else
if $lrecord_type == lrecord_type_char_table_entry
pptype Lisp_Char_Table_Entry
else
if $lrecord_type == lrecord_type_charset
pptype Lisp_Charset
else
if $lrecord_type == lrecord_type_coding_system
pptype Lisp_Coding_System
else
if $lrecord_type == lrecord_type_color_instance
pptype Lisp_Color_Instance
else
if $lrecord_type == lrecord_type_command_builder
pptype command_builder
else
if $lrecord_type == lrecord_type_compiled_function
pptype Lisp_Compiled_Function
else
if $lrecord_type == lrecord_type_console
pstructtype console
else
if $lrecord_type == lrecord_type_database
pptype Lisp_Database
else
if $lrecord_type == lrecord_type_device
pstructtype device
else
if $lrecord_type == lrecord_type_event
pptype Lisp_Event
else
if $lrecord_type == lrecord_type_extent
pstructtype extent
else
if $lrecord_type == lrecord_type_extent_auxiliary
pstructtype extent_auxiliary
else
if $lrecord_type == lrecord_type_extent_info
pstructtype extent_info
else
if $lrecord_type == lrecord_type_face
pptype Lisp_Face
else
if $lrecord_type == lrecord_type_float
pptype Lisp_Float
else
if $lrecord_type == lrecord_type_font_instance
pptype Lisp_Font_Instance
else
if $lrecord_type == lrecord_type_frame
pstructtype frame
else
if $lrecord_type == lrecord_type_glyph
pptype Lisp_Glyph
else
if $lrecord_type == lrecord_type_gui_item
pptype Lisp_Gui_Item
else
if $lrecord_type == lrecord_type_hash_table
pptype Lisp_Hash_Table
else
if $lrecord_type == lrecord_type_image_instance
pptype Lisp_Image_Instance
else
if $lrecord_type == lrecord_type_keymap
pptype Lisp_Keymap
else
if $lrecord_type == lrecord_type_lcrecord_list
pstructtype lcrecord_list
else
if $lrecord_type == lrecord_type_ldap
pptype Lisp_LDAP
else
if $lrecord_type == lrecord_type_lstream
pstructtype lstream
else
if $lrecord_type == lrecord_type_marker
pptype Lisp_Marker
else
if $lrecord_type == lrecord_type_opaque
pptype Lisp_Opaque
else
if $lrecord_type == lrecord_type_opaque_ptr
pptype Lisp_Opaque_Ptr
else
if $lrecord_type == lrecord_type_popup_data
pptype popup_data
else
if $lrecord_type == lrecord_type_process
pptype Lisp_Process
else
if $lrecord_type == lrecord_type_range_table
pptype Lisp_Range_Table
else
if $lrecord_type == lrecord_type_specifier
pptype Lisp_Specifier
else
if $lrecord_type == lrecord_type_subr
pptype Lisp_Subr
else
if $lrecord_type == lrecord_type_symbol_value_buffer_local
pstructtype symbol_value_buffer_local
else
if $lrecord_type == lrecord_type_symbol_value_forward
pstructtype symbol_value_forward
else
if $lrecord_type == lrecord_type_symbol_value_lisp_magic
pstructtype symbol_value_lisp_magic
else
if $lrecord_type == lrecord_type_symbol_value_varalias
pstructtype symbol_value_varalias
else
if $lrecord_type == lrecord_type_timeout
pptype Lisp_Timeout
else
if $lrecord_type == lrecord_type_toolbar_button
pstructtype toolbar_button
else
if $lrecord_type == lrecord_type_tooltalk_message
pptype Lisp_Tooltalk_Message
else
if $lrecord_type == lrecord_type_tooltalk_pattern
pptype Lisp_Tooltalk_Pattern
else
if $lrecord_type == lrecord_type_weak_list
pstructtype weak_list
else
if $lrecord_type == lrecord_type_window
pstructtype window
else
if $lrecord_type == lrecord_type_window_configuration
pstructtype window_config
else
if $lrecord_type == lrecord_type_fc_pattern
pstructtype fc_pattern
else
if $lrecord_type == lrecord_type_fc_objectset
pstructtype fc_objectset
else
if $lrecord_type == lrecord_type_fc_fontset
pstructtype fc_fontset
else
echo Unknown Lisp Object type\n
print $arg0
## Barf, gag, retch
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
## Repeat after me... gdb sux, gdb sux, gdb sux...
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
## Are we having fun yet??
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
end
document pobj
Usage: pobj lisp_object
Print the internal C representation of a Lisp Object.
end
## -------------------------------------------------------------
## functions to test the debugging support itself.
## If you change this file, make sure the following still work...
## -------------------------------------------------------------
define test_xtype
printf "Vemacs_major_version: "
xtype Vemacs_major_version
printf "Vhelp_char: "
xtype Vhelp_char
printf "Qnil: "
xtype Qnil
printf "Qunbound: "
xtype Qunbound
printf "Vobarray: "
xtype Vobarray
printf "Vall_weak_lists: "
xtype Vall_weak_lists
printf "Vxemacs_codename: "
xtype Vxemacs_codename
end
define test_pobj
printf "Vemacs_major_version: "
pobj Vemacs_major_version
printf "Vhelp_char: "
pobj Vhelp_char
printf "Qnil: "
pobj Qnil
printf "Qunbound: "
pobj Qunbound
printf "Vobarray: "
pobj Vobarray
printf "Vall_weak_lists: "
pobj Vall_weak_lists
printf "Vxemacs_codename: "
pobj Vxemacs_codename
end
1.966 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.965
retrieving revision 1.966
diff -u -p -r1.965 -r1.966
--- ChangeLog 2006/05/23 13:02:05 1.965
+++ ChangeLog 2006/05/23 13:18:56 1.966
＠＠ -1,3 +1,8 ＠＠
+2006-05-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * .gdbinit.in: Moved to etc.
+ * .dbxrc.in: Moved to etc.
+
2006-05-20 Stephen J. Turnbull <stephen(a)xemacs.org>
* tests.c (Ftest_data_format_conversion): Fix no-mule autodetect
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: stephent
Date: 06/05/23 15:02:12
Modified: xemacs/src ChangeLog tests.c
Log:
Fix c-tests autodetection bugs in in tests.c. <877j4czzm6.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.965 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.964
retrieving revision 1.965
diff -u -p -r1.964 -r1.965
--- ChangeLog 2006/05/22 22:07:05 1.964
+++ ChangeLog 2006/05/23 13:02:05 1.965
＠＠ -1,3 +1,8 ＠＠
+2006-05-20 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * tests.c (Ftest_data_format_conversion): Fix no-mule autodetect
+ bugs. Update FSF copyright.
+
2006-05-23 Aidan Kehoe <kehoea(a)parhasard.net>
* frame-x.c (x_set_frame_properties):
1.13 +85 -18 XEmacs/xemacs/src/tests.c
Index: tests.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/tests.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tests.c 2006/02/27 16:29:29 1.12
+++ tests.c 2006/05/23 13:02:07 1.13
＠＠ -1,6 +1,7 ＠＠
/* C support for testing XEmacs - see tests/automated/c-tests.el
Copyright (C) 2000 Martin Buchholz
Copyright (C) 2001, 2002 Ben Wing.
+ Copyright (C) 2006 The Free Software Foundation, Inc.
This file is part of XEmacs.
＠＠ -32,6 +33,7 ＠＠ Boston, MA 02111-1307, USA. */
#include "lstream.h"
#include "elhash.h"
#include "opaque.h"
+#include "file-coding.h" /* XCODING_SYSTEM_EOL_TYPE and its values */
static Lisp_Object Vtest_function_list;
＠＠ -63,6 +65,8 ＠＠ Test TO_EXTERNAL_FORMAT() and TO_INTERNA
Lisp_Object opaque_latin = make_opaque (ext_latin, sizeof (ext_latin) - 1);
Lisp_Object opaque0_latin = make_opaque (ext_latin, sizeof (ext_latin));
Lisp_Object string_latin1 = make_string (int_latin1, sizeof (int_latin1) - 1);
+ int autodetect_eol_p =
+ !NILP (Fsymbol_value (intern ("eol-detection-enabled-p")));
/* Check for expected strings before and after conversion.
Conversions depend on whether MULE is defined. */
＠＠ -86,14 +90,24 ＠＠ Test TO_EXTERNAL_FORMAT() and TO_INTERNA
DFC_CHECK_DATA_NUL (ptr, len, constant_string_non_mule)
#endif
+ /* These now only apply to base coding systems, and
+ need to test `eol-detection-enabled-p' at runtime. */
#define DFC_CHECK_DATA_COND_EOL(ptr,len, \
- constant_string_eol, \
- constant_string_non_eol) \
- DFC_CHECK_DATA (ptr, len, constant_string_eol)
+ constant_string_eol, \
+ constant_string_non_eol) do { \
+ if (autodetect_eol_p) \
+ DFC_CHECK_DATA (ptr, len, constant_string_eol); \
+ else \
+ DFC_CHECK_DATA (ptr, len, constant_string_non_eol); \
+ } while (0)
#define DFC_CHECK_DATA_COND_EOL_NUL(ptr,len, \
- constant_string_eol, \
- constant_string_non_eol) \
- DFC_CHECK_DATA_NUL (ptr, len, constant_string_eol)
+ constant_string_eol, \
+ constant_string_non_eol) do { \
+ if (autodetect_eol_p) \
+ DFC_CHECK_DATA_NUL (ptr, len, constant_string_eol); \
+ else \
+ DFC_CHECK_DATA_NUL (ptr, len, constant_string_non_eol); \
+ } while (0)
/* Check for expected strings before and after conversion. */
#define DFC_CHECK_DATA(ptr,len, constant_string) do { \
＠＠ -311,58 +325,111 ＠＠ Test TO_EXTERNAL_FORMAT() and TO_INTERNA
DFC_CHECK_DATA_COND_MULE_NUL (XSTRING_DATA (string),
XSTRING_LENGTH (string), int_latin1, ext_latin);
-
+ /* This next group used to use the COND_EOL macros, but with the new Mule,
+ they all specify an EOL convention, and all XEmacsen can grok them. */
ptr = NULL, len = rand();
TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo)),
MALLOC, (ptr, len),
Qbinary);
- DFC_CHECK_DATA_COND_EOL_NUL (ptr, len, ext_unix, int_foo);
+ DFC_CHECK_DATA_NUL (ptr, len, ext_unix);
xfree (ptr, void *);
ptr = NULL, len = rand();
TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1),
LISP_OPAQUE, opaque,
intern ("raw-text-mac"));
- DFC_CHECK_DATA_COND_EOL (XOPAQUE_DATA (opaque),
- XOPAQUE_SIZE (opaque), ext_mac, int_foo);
+ DFC_CHECK_DATA (XOPAQUE_DATA (opaque), XOPAQUE_SIZE (opaque), ext_mac);
ptr = NULL, len = rand();
TO_EXTERNAL_FORMAT (LISP_STRING, string_foo,
ALLOCA, (ptr, len),
intern ("raw-text-dos"));
- DFC_CHECK_DATA_COND_EOL (ptr, len, ext_dos, int_foo);
+ DFC_CHECK_DATA (ptr, len, ext_dos);
ptr = NULL, len = rand();
TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1),
ALLOCA, (ptr, len),
intern ("raw-text-unix"));
- DFC_CHECK_DATA_COND_EOL (ptr, len, ext_unix, int_foo);
+ DFC_CHECK_DATA (ptr, len, ext_unix);
ptr = NULL, len = rand();
TO_EXTERNAL_FORMAT (LISP_STRING, string_foo,
MALLOC, (ptr, len),
intern ("no-conversion-mac"));
- DFC_CHECK_DATA_COND_EOL (ptr, len, ext_mac, int_foo);
+ DFC_CHECK_DATA (ptr, len, ext_mac);
xfree (ptr, void *);
ptr = NULL, len = rand();
TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1),
ALLOCA, (ptr, len),
intern ("no-conversion-dos"));
- DFC_CHECK_DATA_COND_EOL (ptr, len, ext_dos, int_foo);
+ DFC_CHECK_DATA (ptr, len, ext_dos);
ptr = NULL, len = rand();
TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo)),
ALLOCA, (ptr, len),
intern ("no-conversion-unix"));
- DFC_CHECK_DATA_COND_EOL_NUL (ptr, len, ext_unix, int_foo);
+ DFC_CHECK_DATA_NUL (ptr, len, ext_unix);
+
+ /* Oh, Lawdy, Lawdy, Lawdy, this done broke mah heart!
+ I tried using the technique
+
+ Fget_coding_system (call2
+ (intern ("coding-system-change-eol-conversion"),
+ intern ("undecided"), $EOL_TYPE));
+ XCODING_SYSTEM_EOL_TYPE (cs_to_use) = $EOL_DETECT_TYPE;
+
+ with EOL_TYPE = Qlf (for no-detect) and Qnil (for auto-detect),
+ and with EOL_DETECT_TYPE = EOL_LF and EOL_AUTODETECT
+ respectively, but this doesn't seem to work on the `undecided'
+ coding system. The coding-system-eol-type attribute on the
+ coding system itself needs to be changed, too. I'm not sure at
+ the moment how `set-eol-detection' works its magic, but the code
+ below gives correct test results without default EOL detection,
+ with default EOL detection, and with Mule. Ship it!
+
+ Mule. You'll envy the dead.
+ */
+
+ {
+ /* Check eol autodetection doesn't happen when disabled -- cheat. */
+ Lisp_Object cs_to_use = Fget_coding_system (intern ("undecided-unix"));
+ TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_dos,
+ LISP_BUFFER, Fcurrent_buffer(),
+ cs_to_use);
+ DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)),
+ sizeof (ext_dos) - 1, ext_dos);
+
+ /* Check eol autodetection works when enabled -- honest. */
+ cs_to_use =
+ Fget_coding_system (call2
+ (intern ("coding-system-change-eol-conversion"),
+ intern ("undecided"), Qnil));
+ XCODING_SYSTEM_EOL_TYPE (cs_to_use) = EOL_AUTODETECT;
+ TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_dos,
+ LISP_BUFFER, Fcurrent_buffer(),
+ cs_to_use);
+ DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)),
+ sizeof (int_foo) - 1, int_foo);
+ /* reset to default */
+ XCODING_SYSTEM_EOL_TYPE (cs_to_use) =
+ autodetect_eol_p ? EOL_AUTODETECT : EOL_LF;
+ }
+
+ /* Does eol-detection-enabled-p reflect the actual state of affairs?
+ This probably could be tested in Lisp somehow. Should it? */
TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_dos,
LISP_BUFFER, Fcurrent_buffer(),
intern ("undecided"));
- /* &&#### needs some 8-bit work here */
- DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)),
- sizeof (int_foo) - 1, int_foo);
+ if (autodetect_eol_p)
+ DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer,
+ BUF_PT (current_buffer)),
+ sizeof (int_foo) - 1, int_foo);
+ else
+ DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer,
+ BUF_PT (current_buffer)),
+ sizeof (ext_dos) - 1, ext_dos);
TO_INTERNAL_FORMAT (DATA, (ext_mac, sizeof (ext_mac) - 1),
LISP_STRING, string,
- 1 participants
- 0 comments
CVS update by stephent xemacs/lisp ...
17 years, 11 months
CVS Monitor
CVS Monitor
User: stephent
Date: 06/05/23 14:56:22
Modified: xemacs/lisp ChangeLog code-cmds.el
Log:
Fix up coding-system-change-eol-conversion. <87bqtozzub.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.745 +6 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.744
retrieving revision 1.745
diff -u -p -r1.744 -r1.745
--- ChangeLog 2006/05/16 08:23:27 1.744
+++ ChangeLog 2006/05/23 12:56:19 1.745
＠＠ -1,3 +1,9 ＠＠
+2006-05-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * code-cmds.el: Update FSF copyright; improve header comment.
+ (coding-system-change-eol-conversion): Clarify, add sanity check.
+ Fix keyword mismatch between function arg and subsidiary accessor.
+
2006-05-16 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.27 "fiddleheads" is released.
1.5 +31 -36 XEmacs/xemacs/lisp/code-cmds.el
Index: code-cmds.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/code-cmds.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- code-cmds.el 2003/02/21 06:56:47 1.4
+++ code-cmds.el 2006/05/23 12:56:20 1.5
＠＠ -2,7 +2,7 ＠＠
;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2000 Free Software Foundation
+;; Copyright (C) 2000,2006 Free Software Foundation
;; Copyright (C) 1997 MORIOKA Tomohiko
;; Copyright (C) 2001, 2002 Ben Wing.
＠＠ -27,8 +27,8 ＠＠
;;
;; This code defines the keybindings and utility commands for the
;; user to manipulate coding systems.
-;; This code used to be in mule-cmds.el which now only needs the
-;; additional bindings/commands that are avaible on the real mule.
+;; This code used to be in mule-cmds.el which now contains only the
+;; additional bindings/commands that are available for full Mule.
;;; Code:
＠＠ -53,41 +53,36 ＠＠
(define-key coding-keymap "x" 'set-selection-coding-system)
(define-key coding-keymap "X" 'set-next-selection-coding-system))
+;; XEmacs change: make code readable, and sanity-check EOL-TYPE.
(defun coding-system-change-eol-conversion (coding-system eol-type)
- "Return a coding system which differs from CODING-SYSTEM in eol conversion.
-The returned coding system converts end-of-line by EOL-TYPE
-but text as the same way as CODING-SYSTEM.
-EOL-TYPE should be `lf', `crlf', `cr' or nil.
-If EOL-TYPE is nil, the returned coding system detects
-how end-of-line is formatted automatically while decoding.
-
-EOL-TYPE can be specified by an symbol `unix', `dos' or `mac'.
-They means `lf', `crlf', and `cr' respectively."
- (if (symbolp eol-type)
- (setq eol-type (cond ((or (eq eol-type 'unix)
- (eq eol-type 'lf))
- 'eol-lf)
- ((or (eq eol-type 'dos)
- (eq eol-type 'crlf))
- 'eol-crlf)
- ((or (eq eol-type 'mac)
- (eq eol-type 'cr))
- 'eol-cr)
- (t eol-type))))
+ "Return a version of CODING-SYSTEM that provides EOL-TYPE eol conversion.
+EOL-TYPE should be `lf', `crlf', `cr' or nil. nil means the returned coding
+system automatically detects the end-of-line convention while decoding.
+EOL-TYPE may also be one of the symbols `unix', `dos' or `mac', meaning
+`lf', `crlf', and `cr' respectively."
+ (setq eol-type (cond ((or (eq eol-type 'unix) (eq eol-type 'lf)) 'eol-lf)
+ ((or (eq eol-type 'dos) (eq eol-type 'crlf)) 'eol-crlf)
+ ((or (eq eol-type 'mac) (eq eol-type 'cr)) 'eol-cr)
+ ((null eol-type) nil)
+ (t (error 'invalid-constant eol-type))))
(coding-system-name
- (let ((orig-eol-type (coding-system-eol-type coding-system)))
- (if (null orig-eol-type)
- (if (not eol-type)
- coding-system
- (coding-system-property coding-system eol-type))
- (let ((base (coding-system-base coding-system)))
- (if (not eol-type)
- base
- (if (eq eol-type orig-eol-type)
- coding-system
- (setq orig-eol-type (coding-system-eol-type base))
- (if (null orig-eol-type)
- (coding-system-property base eol-type)))))))))
+ (let ((orig-eol-type (cdr (assq (coding-system-eol-type coding-system)
+ '((lf . eol-lf)
+ (cr . eol-cr)
+ (crlf . eol-crlf)
+ ;; #### also returns nil if not a key
+ (nil . nil)))))
+ (base (coding-system-base coding-system)))
+ (cond ((eq eol-type orig-eol-type) coding-system)
+ ((null orig-eol-type)
+ (coding-system-property coding-system eol-type))
+ ((null eol-type) base)
+ ((null (coding-system-eol-type base))
+ (coding-system-property base eol-type))
+ (t (warn "couldn't change EOL conversion of %s from %s to %s."
+ coding-system orig-eol-type eol-type)
+ ;; return nil for compatibility with old code
+ nil)))))
;; (defun coding-system-change-text-conversion (coding-system coding)
;; "Return a coding system which differs from CODING-SYSTEM in text conversion.
- 1 participants
- 0 comments