October 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[C] xemacsweb: Update links to upstream cperl-mode 19 years, 2 months

Adrian Aichner

COMMIT xemacsweb ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: Download/ChangeLog Architecting-XEmacs/ChangeLog Index: Download/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/ChangeLog,v retrieving revision 1.169 diff -u -U0 -r1.169 ChangeLog --- Download/ChangeLog 24 Oct 2005 22:59:07 -0000 1.169 +++ Download/ChangeLog 25 Oct 2005 20:42:40 -0000 ＠＠ -2,0 +3,4 ＠＠ + * elispPackages.content: Update link to upstream cperl-mode. + +2005-10-25 Adrian Aichner <adrian(a)xemacs.org> + Index: Architecting-XEmacs/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Architecting-XEmacs/ChangeLog,v retrieving revision 1.53 diff -u -U0 -r1.53 ChangeLog --- Architecting-XEmacs/ChangeLog 12 Jun 2005 14:34:11 -0000 1.53 +++ Architecting-XEmacs/ChangeLog 25 Oct 2005 20:42:40 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-10-25 Adrian Aichner <adrian(a)xemacs.org> + + * index.content: Update link to upstream cperl-mode. + xemacsweb source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: Download/elispPackages.content Architecting-XEmacs/index.content Index: Architecting-XEmacs/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Architecting-XEmacs/index.content,v retrieving revision 1.37 diff -u -w -r1.37 index.content --- Architecting-XEmacs/index.content 12 Jun 2005 14:34:11 -0000 1.37 +++ Architecting-XEmacs/index.content 25 Oct 2005 20:41:08 -0000 ＠＠ -205,7 +205,7 ＠＠ <li><a href="ftp://cs.nyu.edu/pub/gnat/">GNAT Project - Ada Mode</a></li> <li><a href="http://www.tnt.uni-hannover.de/~muenkel/software/own/hm--html-menus/overview.html">Heiko Muenkel - hm--html-menus</a></li> <li><a href="ftp://ftp.UL.BaWue.DE/pub/purple/emacs/">Herbert Dampel - battery.el info-look.el</a></li> - <li><a href="ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs/">Ilya Zakharevich - (cperl-mode)</a></li> + <li><a href="http://math.berkeley.edu/~ilya/software/emacs/">Ilya Zakharevich - (cperl-mode)</a></li> <li><a href="http://tiny-tools.sourceforge.net">Jari Aalto - Tiny Tools</a></li> <li><a href="http://www.mew.org/">Kazu Yamamoto - Mew</a></li> <li><a href="http://kdstevens.com/~stevens/ispell-page.html">Ken Stevens - ispell.el interface to ispell</a></li> Index: Download/elispPackages.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/elispPackages.content,v retrieving revision 1.69 diff -u -w -r1.69 elispPackages.content --- Download/elispPackages.content 15 Oct 2005 16:14:30 -0000 1.69 +++ Download/elispPackages.content 25 Oct 2005 20:41:08 -0000 ＠＠ -58,7 +58,7 ＠＠ <li><a href="http://antlr-mode.sourceforge.net/">antlr-mode</a></li> <li><a href="http://cc-mode.sourceforge.net/">CC Mode</a></li> <li><a href="http://www.erlang.org/download.html">Erlang Mode</a></li> - <li><a href="ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs/">Ilya Zakharevich's Elisp files (cperl-mode)</a></li> + <li><a href="http://math.berkeley.edu/~ilya/software/emacs/">Ilya Zakharevich's Elisp files (cperl-mode)</a></li> <li><a href="http://www.verilog.com/">Verilog Mode</a></li> <li><a href="http://opensource.ethz.ch/emacs/vhdl-mode.html">VHDL Mode</a></li> <li><a href="ftp://fly.cnuce.cnr.it/pub/">Etags - turns symbols in souce code into hyperlinks</a></li> -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

1 participants
0 comments

[AC] [PATCH] Configure fixes for motif and error-checking. 19 years, 2 months

Malcolm Purvis

APPROVE COMMIT This patch fixes the recently reported problems with --disable-error-checking and using Motif by default in 21.5. In the latter case I'm using similar code to what exists in 21.4. This patch has been committed. Malcolm ChangeLog addition: 2005-10-25 Malcolm Purvis <malcolmp(a)xemacs.org> * configure.ac: Prefer Xaw to Motif on Linux, Mac and BSD. From 21.4. * configure.ac (XE_PARSE_COMPLEX_OPTION): Remove debugging. Fix broken --with-<complex>=no. xemacs-autoconf-2.5 source patch: Diff command: cvs -q diff -u Files affected: configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.16 diff -u -r1.16 configure.ac --- configure.ac 2005/10/20 12:37:49 1.16 +++ configure.ac 2005/10/24 20:48:50 ＠＠ -208,6 +208,7 ＠＠ case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`);; esac done dnl Sometimes /opt/SUNWdt/lib is the only installed Motif available + dnl #### this test always fails here as need_motif is null if test "$opsys $need_motif" = "sol2 yes"; then xe_runpath_dir="/opt/SUNWdt/lib"; eval "$xe_add_unique_runpath_dir"; ＠＠ -249,13 +250,11 ＠＠ # 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 - echo $1 Setting enable to "[$with_]m4_bpatsubst([$1], -, _)" [enable_]m4_bpatsubst([$1], -, _)="[$with_]m4_bpatsubst([$1], -, _)" fi; # If -enable-$1 or --disable-$1 were given then copy the value to the # equivalent with_$1 variable. if test "[${enable_]m4_bpatsubst([$1], -, _)+set}" = set; then - echo $1 Setting with to "[$enable_]m4_bpatsubst([$1], -, _)" [with_]m4_bpatsubst([$1], -, _)="[$enable_]m4_bpatsubst([$1], -, _)" fi; # Check whether --with-$1 or --without-$1 was given. ＠＠ -428,7 +427,8 ＠＠ Hardcoded default is: $_[$1]_default."]) elif test -n "$_[$1]_all_default" ; then for y in $_[$1]_types; do - eval "[$1]_$y=$_[$1]_all_default" + eval "with_[$1]_$y=$_[$1]_all_default" + eval "enable_[$1]_$y=$_[$1]_all_default" done fi _[$1]_notfirst=yes ＠＠ -3925,14 +3925,15 ＠＠ AC_CHECKING([for X11 graphics libraries]) fi -dnl We don't automatically trigger widgets if athena is present -dnl because of stability concerns. -dnl But if the user wants widgets, still offer him autodetections case "$enable_widgets" in - "yes" | "athena") detect_athena=yes ;; + "" | "yes" | "athena") detect_athena=yes ;; *) detect_athena=no ;; esac +case "$enable_dialogs" in + "" | "yes" | "athena") detect_athena=yes ;; +esac + if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then AC_CHECKING([for the Athena widgets]) ＠＠ -4085,26 +4086,47 ＠＠ dnl Finish ensuring that we have values for the various toolkit items. dnl Not all toolkits support all widgets -dnl if Motif is available we use it for the dialog boxes. +dnl Avoid using Motif :-( +case "$opsys" in + *linux* | *darwin* | *bsd* ) lucid_prefers_motif="no" ;; + * ) lucid_prefers_motif="yes" ;; +esac + case "$enable_menubars" in "" | "yes" | "athena" ) enable_menubars="lucid" ;; esac case "$enable_dialogs" in "" | "yes" | "lucid" ) - if test "$have_motif" = "yes"; then enable_dialogs="motif" - elif test "$have_xaw" = "yes"; then enable_dialogs="athena" - elif test "$with_msw" = "yes"; then enable_dialogs="msw" - else enable_dialogs=no + if test "$lucid_prefers_motif" = "yes"; then + if test "$have_motif" = "yes"; then enable_dialogs="motif" + elif test "$have_xaw" = "yes"; then enable_dialogs="athena" + elif test "$with_msw" = "yes"; then enable_dialogs="msw" + else enable_dialogs=no + fi + else + if test "$have_xaw" = "yes"; then enable_dialogs="athena" + elif test "$have_motif" = "yes"; then enable_dialogs="motif" + elif test "$with_msw" = "yes"; then enable_dialogs="msw" + else enable_dialogs=no + fi fi ;; esac case "$enable_scrollbars" in "" | "yes" ) enable_scrollbars="lucid" ;; esac case "$enable_widgets" in "" | "yes" | "lucid") - if test "$have_motif" = "yes"; then enable_widgets="motif" - elif test "$have_xaw" = "yes"; then enable_widgets="athena" - elif test "$with_msw" = "yes"; then enable_widgets="msw" - else enable_widgets=no + if test "$lucid_prefers_motif" = "yes"; then + if test "$have_motif" = "yes"; then enable_widgets="motif" + elif test "$have_xaw" = "yes"; then enable_widgets="athena" + elif test "$with_msw" = "yes"; then enable_widgets="msw" + else enable_widgets=no + fi + else + if test "$have_xaw" = "yes"; then enable_widgets="athena" + elif test "$have_motif" = "yes"; then enable_widgets="motif" + elif test "$with_msw" = "yes"; then enable_widgets="msw" + else enable_widgets=no + fi fi ;; esac ＠＠ -4232,8 +4254,11 ＠＠ AC_CHECKING([for XIM]) AC_CHECK_LIB(X11, XOpenIM, with_xim=xlib, with_xim=no) dnl XIM + Lesstif is not (yet?) usable - if test "$have_motif $have_lesstif" = "yes no"; then + dnl Only use Motif if linking Motif anyway, or don't have xlib XIM + if test "$need_motif $have_lesstif" = "yes no"; then AC_CHECK_LIB(Xm, XmImMbLookupString, with_xim=motif) + elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then + AC_CHECK_LIB(Xm, XmImMbLookupString, with_xim=motif) fi ;; esac if test "$with_xim" != "no"; then ＠＠ -5621,6 +5646,16 ＠＠ if test "$with_wmcommand" != no; then echo " - Handling WM_COMMAND properly." fi +fi +if test "$need_motif" = "yes" ; then + echo " Compiling in support for Motif." + if test "$have_lesstif" = "yes"; then + echo " - Using LessTif implementation." + fi + echo " *WARNING* Many versions of Motif are buggy, requiring workarounds." + echo " You are likely to experience slow redisplay." + echo " You may need to install vendor patches to Motif." + echo " See PROBLEMS for more information." fi if test "$need_athena" = "yes"; then echo " Compiling in support for the Athena widget set:" -- Malcolm Purvis <malcolmp(a)xemacs.org>

2 participants
1 comments

[COMMIT] support :inherit in cus-face and face 19 years, 2 months

Ben Wing

NOTE: This patch has been committed. lisp/ChangeLog addition: 2005-10-25 Ben Wing <ben(a)xemacs.org> * cus-face.el: * cus-face.el (custom-face-attributes): * cus-face.el (custom-face-background-pixmap): * cus-face.el (custom-set-face-inherit): New. * cus-face.el (custom-face-inherit): New. * faces.el: * faces.el (face-property): * faces.el (convert-face-property-into-specifier): * faces.el (face-property-instance): * faces.el (set-face-property): * faces.el (reset-face): * faces.el (set-face-parent): * faces.el (face-font-name): * faces.el (face-font): * faces.el (face-font-instance): * faces.el (set-face-font): * faces.el (face-foreground): * faces.el (face-foreground-instance): * faces.el (set-face-foreground): * faces.el (face-background): * faces.el (face-background-instance): * faces.el (set-face-background): * faces.el (face-background-pixmap): * faces.el (face-background-pixmap-instance): * faces.el (set-face-background-pixmap): * faces.el (face-display-table): * faces.el (face-display-table-instance): * faces.el (face-equal): * faces.el (init-face-from-resources): Provide a basic implementation of the `inherit' property for faces and the :inherit property in custom. Use the new `specifier-instantiator' function. Update the documentation for various places in faces.el. 'foo -> `foo'. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/faces.el lisp/cus-face.el Index: lisp/cus-face.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cus-face.el,v retrieving revision 1.11 diff -u -p -r1.11 cus-face.el --- lisp/cus-face.el 2002/03/13 08:52:04 1.11 +++ lisp/cus-face.el 2005/10/25 11:25:21 ＠＠ -8,13 +8,12 ＠＠ ;; Version: 1.9960-x ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ +;;; Synched with: Not synched. + ;;; Commentary: ;; ;; See `custom.el'. -;; This file should probably be dissolved, and code moved to faces.el, -;; like Stallman did. - ;;; Code: ;; it is now safe to put the `provide' anywhere. if an error occurs while ＠＠ -102,7 +101,26 ＠＠ Control whether the text should be strik (:inverse-video (toggle :format "%[Inverse Video%]: %v\n" :help-echo "\ Control whether the text should be inverted. Works only on TTY-s") - set-face-reverse-p face-reverse-p)) + set-face-reverse-p face-reverse-p) + (:inherit + (repeat :tag "Inherit" + :help-echo "List of faces to inherit attributes from." + (face :Tag "Face" default)) + ;; FSF 21.3 +; ;; filter to make value suitable for customize +; (lambda (real-value) +; (cond ((or (null real-value) (eq real-value 'unspecified)) +; nil) +; ((symbolp real-value) +; (list real-value)) +; (t +; real-value))) +; ;; filter to make customized-value suitable for storing +; (lambda (cus-value) +; (if (and (consp cus-value) (null (cdr cus-value))) +; (car cus-value) +; cus-value)) + custom-set-face-inherit custom-face-inherit)) "Alist of face attributes. The elements are lists of the form (KEY TYPE SET GET) where: ＠＠ -199,10 +217,23 ＠＠ If FRAME is nil, use the default face." (defun custom-face-background-pixmap (face &rest args) "Return the name of the background pixmap file used for FACE." - (let ((image (apply 'specifier-instance - (face-background-pixmap face) args))) + (let ((image (apply 'specifier-instance + (face-background-pixmap face) args))) (and image (image-instance-file-name image)))) + +(defun custom-set-face-inherit (face value &optional frame tags) + "Set FACE to inherit its properties from another face." + (if (listp value) (setq value (car value))) ;; #### Temporary hack! + (if (find-face value) + (set-face-parent face value frame tags))) + +(defun custom-face-inherit (face &rest args) + "Return the value (instance) of the `inherit' property for FACE." + ;; #### Major, temporary hack! + (let ((spec (apply 'specifier-instantiator + (face-font face) args))) + (and spec (vector spec) (aref spec 0)))) ;; This consistently fails to dtrt ;;(defun custom-set-face-font-size (face size &optional locale tags) Index: lisp/faces.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/faces.el,v retrieving revision 1.35 diff -u -p -r1.35 faces.el --- lisp/faces.el 2005/03/31 11:28:44 1.35 +++ lisp/faces.el 2005/10/25 11:25:24 ＠＠ -2,7 +2,7 ＠＠ ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Board of Trustees, University of Illinois -;; Copyright (C) 1995, 1996, 2002 Ben Wing +;; Copyright (C) 1995, 1996, 2002, 2005 Ben Wing ;; Author: Ben Wing <ben(a)xemacs.org> ;; Keywords: faces, internal, dumped ＠＠ -96,35 +96,55 ＠＠ Such a collection of attributes is calle (defun face-property (face property &optional locale tag-set exact-p) "Return FACE's value of the given PROPERTY. +NOTE: If you are looking for the \"value\" of a built-in face property + (`foreground', `background', `font', `background-pixmap', etc.), you + are probably better off calling `face-property-instance'. The return + value of `face-property' for built-in properties describes the original + specification used to determine the face property, which may be nil, + a list of instantiators, or something else that is unexpected. For + example, if you ask for a face property in a particular buffer (by + specifying a buffer for LOCALE), you will get a non-nil return value + only if a buffer-local specification for that particular buffer had + previously been given. + +For a full list of built-in property names and their semantics, see + `set-face-property'. + If LOCALE is omitted, the FACE's actual value for PROPERTY will be - returned. For built-in properties, this will be a specifier object - of a type appropriate to the property (e.g. a font or color - specifier). For other properties, this could be anything. - -If LOCALE is supplied, then instead of returning the actual value, - the specification(s) for the given locale or locale type will - be returned. This will only work if the actual value of - PROPERTY is a specifier (this will always be the case for built-in - properties, but not or not may apply to user-defined properties). - If the actual value of PROPERTY is not a specifier, this value - will simply be returned regardless of LOCALE. + returned. In this case, this function appears to behave rather + differently depending on whether PROPERTY is a built-in face property of + a user-defined face property. This is because the most basic value of a + user-defined property is simply whatever was set using + `set-face-property', but for a built-in property it's always a specifier, + which is an abstract object encapsulating all the specifications for that + particular property. + +LOCALE, if supplied, will generally be a buffer, frame or + `global' (for the global value), but there are other possibilities -- see + the following paragraph. This mostly applies to built-in properties. In + this case, the return value will not be a specifier object but the + specification(s) for the given locale or locale type will be returned + (equivalent to calling `specifier-specs' on the specifier). + (Technically, the same thing happens if the basic value of a user- + defined property is a specifier, although this usage is rare.) The return value will be a list of instantiators (e.g. strings specifying a font or color name), or a list of specifications, each of which is a cons of a locale and a list of instantiators. Specifically, if LOCALE is a particular locale (a buffer, window, - frame, device, or 'global), a list of instantiators for that locale + frame, device, or `global'), a list of instantiators for that locale will be returned. Otherwise, if LOCALE is a locale type (one of - the symbols 'buffer, 'window, 'frame, or 'device), the specifications + the symbols `buffer', `window', `frame', or `device'), the specifications for all locales of that type will be returned. Finally, if LOCALE is - 'all, the specifications for all locales of all types will be returned. + `all', the specifications for all locales of all types will be returned. The specifications in a specifier determine what the value of PROPERTY will be in a particular \"domain\" or set of circumstances, - which is typically a particular Emacs window along with the buffer - it contains and the frame and device it lies within. The value is + which is typically a particular Emacs window -- which in turn defines + a buffer (the buffer in the window), a frame (the frame that the window + is in), and a device (the device that the frame is in). The value is derived from the instantiator associated with the most specific - locale (in the order buffer, window, frame, device, and 'global) + locale (in the order buffer, window, frame, device, and `global') that matches the domain in question. In other words, given a domain (i.e. an Emacs window, usually), the specifier for PROPERTY will first be searched for a specification whose locale is the buffer ＠＠ -133,11 +153,10 ＠＠ The specifications in a specifier determ frame that the window is contained within; etc. The first instantiator that is valid for the domain (usually this means that the instantiator is recognized by the device [i.e. MS Windows, the X - server or TTY device] that the domain is on. The function - `face-property-instance' actually does all this, and is used to - determine how to display the face. - -See `set-face-property' for the built-in property-names." + server or TTY device]) will be \"instantiated\", which generates + a Lisp object encapsulating the original instantiator and the underlying + window-system object describing the property. The function + `face-property-instance' actually does all this." (setq face (get-face face)) (let ((value (get face property))) ＠＠ -154,7 +173,7 ＠＠ See `set-face-property' for the built-in ;; if a user-property does not have a specifier but a ;; locale was specified, put a specifier there. ;; If there was already a value there, convert it to a - ;; specifier with the value as its 'global instantiator. + ;; specifier with the value as its `global' instantiator. (unless (specifierp specifier) (let ((new-specifier (make-specifier 'generic))) (if (or (not (null specifier)) ＠＠ -179,11 +198,11 ＠＠ Under most circumstances, DOMAIN will be the returned instance would be different. The returned instance will typically be a color-instance, - font-instance, or pixmap-instance object, and you can query + font-instance, or image-instance object, and you can query it using the appropriate object-specific functions. For example, you could use `color-instance-rgb-components' to find out the - RGB (red, green, and blue) components of how the 'background - property of the 'highlight face is displayed in a particular + RGB (red, green, and blue) components of how the `background' + property of the `highlight' face is displayed in a particular window. The results might be different from the results you would get for another window (perhaps the user specified a different color for the frame that window is on; ＠＠ -265,7 +284,7 ＠＠ If PROPERTY is a built-in property, the -- If VALUE is a simple instantiator (e.g. a string naming a font or color) or a list of instantiators, then the instantiator(s) will be added as a specification of the property for the given LOCALE - (which defaults to 'global if omitted). + (which defaults to `global' if omitted). -- If VALUE is a list of specifications (each of which is a cons of a locale and a list of instantiators), then LOCALE must be nil (it does not make sense to explicitly specify a locale in this ＠＠ -277,12 +296,12 ＠＠ If PROPERTY is a built-in property, the `copy-specifier' and LOCALE has the same semantics (if it is a particular locale, the specification for the locale will be copied; if a locale type, specifications for all locales of - that type will be copied; if nil or 'all, then all + that type will be copied; if nil or `all', then all specifications will be copied). -HOW-TO-ADD should be either nil or one of the symbols 'prepend, - 'append, 'remove-tag-set-prepend, 'remove-tag-set-append, 'remove-locale, - 'remove-locale-type, or 'remove-all. See `copy-specifier' and +HOW-TO-ADD should be either nil or one of the symbols `prepend', + `append', `remove-tag-set-prepend', `remove-tag-set-append', `remove-locale', + `remove-locale-type', or `remove-all'. See `copy-specifier' and `add-spec-to-specifier' for a description of what each of these means. Most of the time, you do not need to worry about this argument; the default behavior usually is fine. ＠＠ -291,7 +310,7 ＠＠ In general, it is OK to pass an instance by `face-property-instance') as an instantiator in place of an actual instantiator. In such a case, the instantiator used to create that instance object will be used (for example, if - you set a font-instance object as the value of the 'font + you set a font-instance object as the value of the `font' property, then the font name used to create that object will be used instead). If some cases, however, doing this conversion does not make sense, and this will be noted in ＠＠ -302,7 +321,7 ＠＠ If PROPERTY is not a built-in property, given, then this function will attempt to add VALUE as the instantiator for the given LOCALE, using `add-spec-to-specifier'. If the value of the property is not a specifier, it will - automatically be converted into a 'generic specifier. + automatically be converted into a `generic' specifier. The following symbols have predefined meanings: ＠＠ -344,6 +363,11 ＠＠ The following symbols have predefined me Only used by faces on TTY devices. For valid instantiators, see `make-face-boolean-specifier'. + inherit Face name or face object from which to inherit attributes, + or a list of such elements. Attributes from inherited + faces are merged into the face like an underlying face + would be, with higher priority than underlying faces. + doc-string Description of what the face's normal use is. NOTE: This is not a specifier, unlike all the other built-in properties, and cannot ＠＠ -377,7 +401,7 ＠＠ arguments." (defun reset-face (face &optional locale tag-set exact-p) "Clear all existing built-in specifications from FACE. -This makes FACE inherit all its display properties from 'default. +This makes FACE inherit all its display properties from `default'. WARNING: Be absolutely sure you want to do this!!! It is a dangerous operation and is not undoable. ＠＠ -395,9 +419,8 ＠＠ This makes all properties of FACE inheri (mapcar (lambda (x) (set-face-property face x (vector parent) locale tag-set how-to-add)) - (delq 'display-table - (delq 'background-pixmap - (copy-sequence built-in-face-specifiers)))) + (set-difference built-in-face-specifiers + '(display-table background-pixmap inherit))) (set-face-background-pixmap face (vector 'inherit ':face parent) locale tag-set how-to-add) nil) ＠＠ -413,18 +436,25 ＠＠ This makes all properties of FACE inheri (defun face-font-name (face &optional domain charset) "Return the font name of FACE in DOMAIN, or nil if it is unspecified. -DOMAIN is as in `face-font-instance'." +DOMAIN is as in `face-font-instance'. + +Font names are strings, as described in `make-font-specifier'." (let ((f (face-font-instance face domain charset))) (and f (font-instance-name f)))) (defun face-font (face &optional locale tag-set exact-p) - "Return the font of FACE in LOCALE, or nil if it is unspecified. + "Return the font spec of FACE in LOCALE, or nil if it is unspecified. + +NOTE: This returns a locale-specific specification, not any sort of value +corresponding to the actual font being used. If you want to know the +actual font used in a particular domain, use `face-font-instance', or +`face-font-name' for its name (i.e. the instantiator used to create it). FACE may be either a face object or a symbol representing a face. LOCALE may be a locale (the instantiators for that particular locale will be returned), a locale type (the specifications for all locales - of that type will be returned), 'all (all specifications will be + of that type will be returned), `all' (all specifications will be returned), or nil (the actual specifier object will be returned). See `face-property' for more information." ＠＠ -433,6 +463,9 ＠＠ See `face-property' for more information (defun face-font-instance (face &optional domain charset) "Return the instance of FACE's font in DOMAIN. +Return value will be a font instance object; query its properties using +`font-instance-name', `font-instance-height', `font-instance-width', etc. + FACE may be either a face object or a symbol representing a face. Normally DOMAIN will be a window or nil (meaning the selected window), ＠＠ -454,23 +487,29 ＠＠ FONT should be an instantiator (see `mak locale to an instantiator list), or a font specifier object. If FONT is an alist, LOCALE must be omitted. If FONT is a - specifier object, LOCALE can be a locale, a locale type, 'all, + specifier object, LOCALE can be a locale, a locale type, `all', or nil; see `copy-specifier' for its semantics. Otherwise LOCALE specifies the locale under which the specified instantiator(s) - will be added, and defaults to 'global. + will be added, and defaults to `global'. See `set-face-property' for more information." (interactive (face-interactive "font")) (set-face-property face 'font font locale tag-set how-to-add)) (defun face-foreground (face &optional locale tag-set exact-p) - "Return the foreground of FACE in LOCALE, or nil if it is unspecified. + "Return the foreground spec of FACE in LOCALE, or nil if it is unspecified. + +NOTE: This returns a locale-specific specification, not any sort of value +corresponding to the actual foreground being used. If you want to know the +actual foreground color used in a particular domain, use +`face-foreground-instance', or `face-foreground-name' for its name +\(i.e. the instantiator used to create it). FACE may be either a face object or a symbol representing a face. LOCALE may be a locale (the instantiators for that particular locale will be returned), a locale type (the specifications for all locales - of that type will be returned), 'all (all specifications will be + of that type will be returned), `all' (all specifications will be returned), or nil (the actual specifier object will be returned). See `face-property' for more information." ＠＠ -479,6 +518,9 ＠＠ See `face-property' for more information (defun face-foreground-instance (face &optional domain default no-fallback) "Return the instance of FACE's foreground in DOMAIN. +Return value will be a color instance object; query its properties using +`color-instance-name' or `color-instance-rgb-properties'. + FACE may be either a face object or a symbol representing a face. Normally DOMAIN will be a window or nil (meaning the selected window), ＠＠ -511,10 +553,10 ＠＠ COLOR should be an instantiator (see `ma an instantiator list), or a color specifier object. If COLOR is an alist, LOCALE must be omitted. If COLOR is a - specifier object, LOCALE can be a locale, a locale type, 'all, + specifier object, LOCALE can be a locale, a locale type, `all', or nil; see `copy-specifier' for its semantics. Otherwise LOCALE specifies the locale under which the specified instantiator(s) - will be added, and defaults to 'global. + will be added, and defaults to `global'. See `set-face-property' for more information." (interactive (face-interactive "foreground")) ＠＠ -523,11 +565,17 ＠＠ See `set-face-property' for more informa (defun face-background (face &optional locale tag-set exact-p) "Return the background color of FACE in LOCALE, or nil if it is unspecified. +NOTE: This returns a locale-specific specification, not any sort of value +corresponding to the actual background being used. If you want to know the +actual background color used in a particular domain, use +`face-background-instance', or `face-background-name' for its name +\(i.e. the instantiator used to create it). + FACE may be either a face object or a symbol representing a face. LOCALE may be a locale (the instantiators for that particular locale will be returned), a locale type (the specifications for all locales - of that type will be returned), 'all (all specifications will be + of that type will be returned), `all' (all specifications will be returned), or nil (the actual specifier object will be returned). See `face-property' for more information." ＠＠ -536,6 +584,9 ＠＠ See `face-property' for more information (defun face-background-instance (face &optional domain default no-fallback) "Return the instance of FACE's background in DOMAIN. +Return value will be a color instance object; query its properties using +`color-instance-name' or `color-instance-rgb-properties'. + FACE may be either a face object or a symbol representing a face. Normally DOMAIN will be a window or nil (meaning the selected window), ＠＠ -568,24 +619,29 ＠＠ COLOR should be an instantiator (see `ma an instantiator list), or a color specifier object. If COLOR is an alist, LOCALE must be omitted. If COLOR is a - specifier object, LOCALE can be a locale, a locale type, 'all, + specifier object, LOCALE can be a locale, a locale type, `all', or nil; see `copy-specifier' for its semantics. Otherwise LOCALE specifies the locale under which the specified instantiator(s) - will be added, and defaults to 'global. + will be added, and defaults to `global'. See `set-face-property' for more information." (interactive (face-interactive "background")) (set-face-property face 'background color locale tag-set how-to-add)) (defun face-background-pixmap (face &optional locale tag-set exact-p) - "Return the background pixmap of FACE in LOCALE, or nil if it is unspecified. + "Return the background pixmap spec of FACE in LOCALE, or nil if unspecified. This property is only used on window system devices. +NOTE: This returns a locale-specific specification, not any sort of value +corresponding to the actual background pixmap being used. If you want to +know the actual background pixmap used in a particular domain, use +`face-background-pixmap-instance'. + FACE may be either a face object or a symbol representing a face. LOCALE may be a locale (the instantiators for that particular locale will be returned), a locale type (the specifications for all locales - of that type will be returned), 'all (all specifications will be + of that type will be returned), `all' (all specifications will be returned), or nil (the actual specifier object will be returned). See `face-property' for more information." ＠＠ -595,6 +651,12 ＠＠ See `face-property' for more information no-fallback) "Return the instance of FACE's background pixmap in DOMAIN. +Return value will be an image instance object; query its properties using +`image-instance-instantiator' (the original instantiator used to create +the image, which may be a complex beast -- see `make-image-specifier'), +`image-instance-file-name' (the file, if any, from which the image was +created), `image-instance-height', etc. + FACE may be either a face object or a symbol representing a face. Normally DOMAIN will be a window or nil (meaning the selected window), ＠＠ -616,10 +678,10 ＠＠ PIXMAP should be an instantiator (see `m to an instantiator list), or an image specifier object. If PIXMAP is an alist, LOCALE must be omitted. If PIXMAP is a - specifier object, LOCALE can be a locale, a locale type, 'all, + specifier object, LOCALE can be a locale, a locale type, `all', or nil; see `copy-specifier' for its semantics. Otherwise LOCALE specifies the locale under which the specified instantiator(s) - will be added, and defaults to 'global. + will be added, and defaults to `global'. See `set-face-property' for more information." (interactive (face-interactive "background-pixmap")) ＠＠ -647,13 +709,18 ＠＠ designed for interactive use." (set-face-property face 'background-pixmap file)) (defun face-display-table (face &optional locale tag-set exact-p) - "Return the display table of FACE in LOCALE. + "Return the display table spec of FACE in LOCALE, or nil if unspecified.. + +NOTE: This returns a locale-specific specification, not any sort of value +corresponding to the actual display table being used. If you want to +know the actual display table used in a particular domain, use +`face-display-table-instance'. -A vector (as returned by `make-display-table') will be returned. +FACE may be either a face object or a symbol representing a face. LOCALE may be a locale (the instantiators for that particular locale will be returned), a locale type (the specifications for all locales - of that type will be returned), 'all (all specifications will be + of that type will be returned), `all' (all specifications will be returned), or nil (the actual specifier object will be returned). See `face-property' for more information." ＠＠ -661,9 +728,17 ＠＠ See `face-property' for more information (defun face-display-table-instance (face &optional domain default no-fallback) "Return the instance of FACE's display table in DOMAIN. -A vector (as returned by `make-display-table') will be returned. -See `face-property-instance' for the semantics of the DOMAIN argument." +Return value will be a vector, char table or range table; see +`current-display-table'. + +FACE may be either a face object or a symbol representing a face. + +Normally DOMAIN will be a window or nil (meaning the selected window), + and the actual display table used in that particular window and buffer + will be returned. + +See `face-property-instance' for more information." (face-property-instance face 'display-table domain default no-fallback)) (defun set-face-display-table (face display-table &optional locale tag-set ＠＠ -787,7 +862,7 ＠＠ See `face-property-instance' for the sem (error "Invalid specifier domain")) (let ((device (dfw-device domain)) (common-props '(foreground background font display-table underline - dim)) + dim inherit)) (win-props '(background-pixmap strikethru)) (tty-props '(highlight blinking reverse))) ＠＠ -1631,10 +1706,10 ＠＠ Don't use this function in your program. (defun init-face-from-resources (face &optional locale) "Initialize FACE from the resource database. -If LOCALE is specified, it should be a frame, device, or 'global, and +If LOCALE is specified, it should be a frame, device, or `global', and the face will be resourced over that locale. Otherwise, the face will be resourced over all possible locales (i.e. all frames, all devices, -and 'global)." +and `global')." (cond ((null init-face-from-resources) ;; Do nothing. )

1 participants
0 comments

[COMMIT] remove kludging of new and catch from config.h.in 19 years, 2 months

Ben Wing

NOTE: This patch has been committed. src/ChangeLog addition: 2005-10-25 Ben Wing <ben(a)xemacs.org> * config.h.in (EXTERN_C): Don't define new and catch under C++ any more. (Places using new were just fixed by the last patch, places using catch were fixed a couple of weeks ago.) build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: src/config.h.in Index: src/config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.101 diff -u -p -r1.101 config.h.in --- src/config.h.in 2005/10/14 01:21:59 1.101 +++ src/config.h.in 2005/10/25 11:18:45 ＠＠ -1059,10 +1059,6 ＠＠ extern "C" { #ifndef NOT_C_CODE /* Actually means C or C++ */ # if defined (__cplusplus) -/* Avoid C++ keywords used as ordinary C identifiers */ -# define new c_new -# define catch c_catch - # define EXTERN_C extern "C" # else /* C code */ # define EXTERN_C extern

1 participants
0 comments

[COMMIT] rename new->new_, convert 'foo to `foo' 19 years, 2 months

Ben Wing

NOTE: This patch has been committed. This is ultimately needed because of getting libgmp to compile under Windows. You could just try to kludge around this, too, but it seemed the time to just eliminate these new's forever rather than adding more kludges. The appropriate change for config.h.in will be posted shortly. src/ChangeLog addition: 2005-10-25 Ben Wing <ben(a)xemacs.org> * EmacsFrame.c (EmacsFrameInitialize): * EmacsFrame.c (EmacsFrameSetValues): * ExternalClient.c: * ExternalClient.c (externalClientInitialize): * ExternalShell.c: * ExternalShell.c (ExternalShellInitialize): * chartab.c (copy_char_table_entry): * chartab.c (Fcopy_char_table): * cmdloop.c: * cmdloop.c (initial_command_loop): * compiler.h: * console.c (Fvalid_console_type_p): * database.c: * device-msw.c: * device-x.c: * device.c (Fvalid_device_class_p): * device.c (Fdevice_class): * device.c (Fset_device_class): * device.c (Fdomain_device_type): * doc.c (Fsubstitute_command_keys): * dragdrop.c: * eval.c: * eval.c (throw_or_bomb_out): * eval.c (Fsignal): * event-msw.c: * event-msw.c (vars_of_event_mswindows): * event-stream.c (execute_internal_event): * event-stream.c (push_this_command_keys): * events.c: * extents.c (Fset_extent_parent): * extents.c (get_char_property): * extents.c (put_text_prop_mapper): * file-coding.c: * file-coding.c (Fvalid_coding_system_type_p): * file-coding.c (Fdetect_coding_region): * fns.c (Freplace_list): * frame-tty.c (tty_lower_frame): * frame.c: * frame.c (Fframe_visible_p): * gpmevent.c (Fgpm_enable): * gutter.c (Fset_default_gutter_position): * gutter.c (gutter_size_validate): * gutter.c (specifier_vars_of_gutter): * hash.c (KEYS_DIFFER_P): * imgproc.c (splitbox): * indent.c: * keymap.c: * keymap.c (copy_keymap_mapper): * keymap.c (define_key_check_and_coerce_keysym): * keymap.c (event_matches_key_specifier_p): * keymap.c (process_event_binding_result): * keymap.c (where_is_recursive_mapper): * lisp-union.h: * lisp-union.h (union Lisp_Object): * macros.c (store_kbd_macro_event): * malloc.c (realloc): * marker.c (copy_marker_1): * menubar-x.c (menu_move_down): * menubar.c: * menubar.c (vars_of_menubar): * mule-charset.c: * mule-charset.c (Fmake_charset): * mule-charset.c (Fcharset_property): * mule-charset.c (Fset_charset_ccl_program): * mule-charset.c (Fset_charset_registry): * number.c: * process.c: * profile.h: * ralloc.c (obtain): * redisplay.c: * redisplay.c (get_display_block_from_line): * redisplay.c (redisplay_frame): * redisplay.c (vars_of_redisplay): * redisplay.c (specifier_vars_of_redisplay): * select-common.h: * select.c: * select.c (vars_of_select): * syntax.c: * syntax.c (scan_sexps_forward): * sysfile.h: * sysproc.h: * systime.h: * syswindows.h: * toolbar.c (Fset_default_toolbar_position): * toolbar.c (Fcheck_toolbar_button_syntax): * toolbar.c (specifier_vars_of_toolbar): * tooltalk.c: * tooltalk.c (Freturn_tooltalk_message): * tooltalk.c (Fadd_tooltalk_message_arg): * tooltalk.c (Fadd_tooltalk_pattern_attribute): * tparam.c (tparam1): * unexaix.c (PERROR): * unexaix.c (ERROR0): * unexaix.c (unexec): * unexaix.c (make_hdr): * unexaix.c (copy_text_and_data): * unexaix.c (write_segment): * unexaix.c (copy_sym): * unexaix.c (mark_x): * unexaix.c (adjust_lnnoptrs): * unexaix.c (unrelocate_symbols): * unexalpha.c (unexec): * unexalpha.c (update_dynamic_symbols): * unexconvex.c (PERROR): * unexconvex.c (ERROR0): * unexconvex.c (entry_address;): * unexconvex.c (make_hdr): * unexconvex.c (new_;): * unexconvex.c (sptr;): * unexconvex.c (copy_sym): * unexconvex.c (name;): * unexec.c: * unexec.c (PERROR): * unexec.c (ERROR0): * unexec.c (unexec): * unexec.c (make_hdr): * unexec.c (write_segment): * unexec.c (copy_sym): * unexec.c (mark_x): * unexec.c (adjust_lnnoptrs): * unexhp9k800.c: * unexhp9k800.c (unexec): * unexhp9k800.c (copy_file): * unexhp9k800.c (copy_rest): * unexmips.c (unexec): * unicode.c: * unicode.c (Fchar_to_unicode): * window.c (make_dummy_parent): * window.c (Fsplit_window): * window.c (Fenlarge_window): new -> new_. 'foo -> `foo'. lwlib/ChangeLog addition: 2005-10-25 Ben Wing <ben(a)xemacs.org> * lwlib-internal.h (assert): redo assert macros to follow lisp.h and not trigger warnings. * lwlib.c (merge_scrollbar_values): * lwlib.c (merge_widget_value_args): * xlwtabs.c: * xlwtabs.c (TabsInit): * xlwtabs.c (TabsConstraintInitialize): * xlwtabs.c (TabsSetValues): * xlwtabs.c (TabsConstraintSetValues): new -> new_. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lwlib/xlwtabs.c lwlib/lwlib.c lwlib/lwlib-internal.h src/window.c src/unicode.c src/unexmips.c src/unexhp9k800.c src/unexec.c src/unexconvex.c src/unexalpha.c src/unexaix.c src/tparam.c src/tooltalk.c src/toolbar.c src/syswindows.h src/systime.h src/sysproc.h src/sysfile.h src/syntax.c src/select.c src/select-common.h src/redisplay.c src/ralloc.c src/profile.h src/process.c src/number.c src/mule-charset.c src/menubar.c src/menubar-x.c src/marker.c src/malloc.c src/macros.c src/lisp-union.h src/keymap.c src/indent.c src/imgproc.c src/hash.c src/gutter.c src/gpmevent.c src/frame.c src/frame-tty.c src/fns.c src/file-coding.c src/extents.c src/events.c src/event-stream.c src/event-msw.c src/eval.c src/dragdrop.c src/doc.c src/device.c src/device-x.c src/device-msw.c src/database.c src/console.c src/compiler.h src/cmdloop.c src/chartab.c src/ExternalShell.c src/ExternalClient.c src/EmacsFrame.c cvs server: Diffing src Index: src/EmacsFrame.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrame.c,v retrieving revision 1.27 diff -u -p -r1.27 EmacsFrame.c --- src/EmacsFrame.c 2005/01/24 23:33:45 1.27 +++ src/EmacsFrame.c 2005/10/25 11:09:41 ＠＠ -266,10 +266,10 ＠＠ update_various_frame_slots (EmacsFrame e } static void -EmacsFrameInitialize (Widget UNUSED (request), Widget new, +EmacsFrameInitialize (Widget UNUSED (request), Widget new_, ArgList UNUSED (unused1), Cardinal *UNUSED (unused2)) { - EmacsFrame ew = (EmacsFrame)new; + EmacsFrame ew = (EmacsFrame)new_; struct frame *f = ew->emacs_frame.frame; if (!f) ＠＠ -380,8 +380,8 ＠＠ EmacsFrameSetValues (Widget cur_widget, Widget new_widget, ArgList argv, Cardinal *argc) { EmacsFrame cur = (EmacsFrame) cur_widget; - EmacsFrame new = (EmacsFrame) new_widget; - struct frame *f = new->emacs_frame.frame; + EmacsFrame new_ = (EmacsFrame) new_widget; + struct frame *f = new_->emacs_frame.frame; in_resource_setting++; /* This function does not need to do much. Pretty much everything interesting will get done in the resize method, which will ＠＠ -396,10 +396,10 ＠＠ EmacsFrameSetValues (Widget cur_widget, called or XtSetValues() is called. */ - if (cur->emacs_frame.iconic != new->emacs_frame.iconic && - FRAME_X_TOP_LEVEL_FRAME_P (new->emacs_frame.frame)) - x_wm_set_shell_iconic_p (FRAME_X_SHELL_WIDGET (new->emacs_frame.frame), - new->emacs_frame.iconic); + if (cur->emacs_frame.iconic != new_->emacs_frame.iconic && + FRAME_X_TOP_LEVEL_FRAME_P (new_->emacs_frame.frame)) + x_wm_set_shell_iconic_p (FRAME_X_SHELL_WIDGET (new_->emacs_frame.frame), + new_->emacs_frame.iconic); /* If we got here, then we were likely called as a result of the EditRes protocol, so go ahead and change scrollbar-width ＠＠ -407,74 +407,74 ＠＠ EmacsFrameSetValues (Widget cur_widget, a change made to scrollbar-width etc. so don't do anything special. */ if (cur->emacs_frame.internal_border_width != - new->emacs_frame.internal_border_width) + new_->emacs_frame.internal_border_width) { - f->internal_border_width = new->emacs_frame.internal_border_width; + f->internal_border_width = new_->emacs_frame.internal_border_width; MARK_FRAME_SIZE_SLIPPED (f); } #ifdef HAVE_SCROLLBARS if (cur->emacs_frame.scrollbar_width != - new->emacs_frame.scrollbar_width) + new_->emacs_frame.scrollbar_width) Fadd_spec_to_specifier (Vscrollbar_width, - make_int (new->emacs_frame.scrollbar_width), + make_int (new_->emacs_frame.scrollbar_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.scrollbar_height != - new->emacs_frame.scrollbar_height) + new_->emacs_frame.scrollbar_height) Fadd_spec_to_specifier (Vscrollbar_height, - make_int (new->emacs_frame.scrollbar_height), + make_int (new_->emacs_frame.scrollbar_height), wrap_frame (f), Qnil, Qnil); #endif /* HAVE_SCROLLBARS */ #ifdef HAVE_TOOLBARS if (cur->emacs_frame.top_toolbar_height != - new->emacs_frame.top_toolbar_height) + new_->emacs_frame.top_toolbar_height) Fadd_spec_to_specifier (Vtoolbar_size[TOP_TOOLBAR], - make_int (new->emacs_frame.top_toolbar_height), + make_int (new_->emacs_frame.top_toolbar_height), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.bottom_toolbar_height != - new->emacs_frame.bottom_toolbar_height) + new_->emacs_frame.bottom_toolbar_height) Fadd_spec_to_specifier (Vtoolbar_size[BOTTOM_TOOLBAR], - make_int (new->emacs_frame.bottom_toolbar_height), + make_int (new_->emacs_frame.bottom_toolbar_height), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.left_toolbar_width != - new->emacs_frame.left_toolbar_width) + new_->emacs_frame.left_toolbar_width) Fadd_spec_to_specifier (Vtoolbar_size[LEFT_TOOLBAR], - make_int (new->emacs_frame.left_toolbar_width), + make_int (new_->emacs_frame.left_toolbar_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.right_toolbar_width != - new->emacs_frame.right_toolbar_width) + new_->emacs_frame.right_toolbar_width) Fadd_spec_to_specifier (Vtoolbar_size[RIGHT_TOOLBAR], - make_int (new->emacs_frame.right_toolbar_width), + make_int (new_->emacs_frame.right_toolbar_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.top_toolbar_border_width != - new->emacs_frame.top_toolbar_border_width) + new_->emacs_frame.top_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[TOP_TOOLBAR], - make_int (new->emacs_frame.top_toolbar_border_width), + make_int (new_->emacs_frame.top_toolbar_border_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.bottom_toolbar_border_width != - new->emacs_frame.bottom_toolbar_border_width) + new_->emacs_frame.bottom_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[BOTTOM_TOOLBAR], - make_int (new->emacs_frame.bottom_toolbar_border_width), + make_int (new_->emacs_frame.bottom_toolbar_border_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.left_toolbar_border_width != - new->emacs_frame.left_toolbar_border_width) + new_->emacs_frame.left_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[LEFT_TOOLBAR], - make_int (new->emacs_frame.left_toolbar_border_width), + make_int (new_->emacs_frame.left_toolbar_border_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.right_toolbar_border_width != - new->emacs_frame.right_toolbar_border_width) + new_->emacs_frame.right_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[RIGHT_TOOLBAR], - make_int (new->emacs_frame.right_toolbar_border_width), + make_int (new_->emacs_frame.right_toolbar_border_width), wrap_frame (f), Qnil, Qnil); #endif /* HAVE_TOOLBARS */ ＠＠ -485,8 +485,8 ＠＠ EmacsFrameSetValues (Widget cur_widget, request might be issued as a result of hiding/showing menubar or changing toolbar placement, where we rely on relayout made by the callback, we go ahead and simulate such a call */ - if (cur->core.width == new->core.width - && cur->core.height == new->core.height) + if (cur->core.width == new_->core.width + && cur->core.height == new_->core.height) { int i; for (i = 0; i < (int) *argc; i++) Index: src/ExternalClient.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ExternalClient.c,v retrieving revision 1.7 diff -u -p -r1.7 ExternalClient.c --- src/ExternalClient.c 2004/09/22 03:04:44 1.7 +++ src/ExternalClient.c 2005/10/25 11:09:41 ＠＠ -57,7 +57,7 ＠＠ ERROR! This ought not be getting compil extw_send_notify_3(XtDisplay((Widget)(w)), XtWindow((Widget)(w)),\ type, l0, l1, l2) -static void externalClientInitialize (Widget req, Widget new, ArgList args, +static void externalClientInitialize (Widget req, Widget new_, ArgList args, Cardinal *num_args); static void externalClientRealize (Widget widget, XtValueMask *mask, XSetWindowAttributes *attrs); ＠＠ -174,13 +174,13 ＠＠ ExternalClientClassRec externalClientCla WidgetClass externalClientWidgetClass = (WidgetClass) &externalClientClassRec; static void -externalClientInitialize (Widget UNUSED (req), Widget new, +externalClientInitialize (Widget UNUSED (req), Widget new_, ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { - ExternalClientWidget ecw = (ExternalClientWidget) new; + ExternalClientWidget ecw = (ExternalClientWidget) new_; static int error_handler_added = 0; - extw_initialize_atoms (XtDisplay (new)); + extw_initialize_atoms (XtDisplay (new_)); extw_which_side = extw_client_send; #ifdef EXTW_USES_MOTIF ＠＠ -194,7 +194,7 ＠＠ externalClientInitialize (Widget UNUSED */ - XtOverrideTranslations (new, + XtOverrideTranslations (new_, XtParseTranslationTable ("None<Key>Tab:\n" "<FocusIn>:focusIn()\n" "<FocusOut>:focusOut()\n" ＠＠ -203,7 +203,7 ＠＠ externalClientInitialize (Widget UNUSED #endif - XtAddEventHandler (new, 0, TRUE, EventHandler, (XtPointer) NULL); + XtAddEventHandler (new_, 0, TRUE, EventHandler, (XtPointer) NULL); ecw->externalClient.shell_ready = False; ecw->externalClient.has_focus = False; Index: src/ExternalShell.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ExternalShell.c,v retrieving revision 1.7 diff -u -p -r1.7 ExternalShell.c --- src/ExternalShell.c 2004/09/22 03:04:44 1.7 +++ src/ExternalShell.c 2005/10/25 11:09:41 ＠＠ -153,7 +153,7 ＠＠ extern void emacs_Xt_handle_focus_event extw_send_notify_3(XtDisplay((Widget)(w)),\ (w)->externalShell.external_window, type, l0, l1, l2) -static void ExternalShellInitialize (Widget req, Widget new, ArgList args, +static void ExternalShellInitialize (Widget req, Widget new_, ArgList args, Cardinal *num_args); static void ExternalShellRealize (Widget wid, Mask *vmask, XSetWindowAttributes *attr); ＠＠ -252,10 +252,10 ＠＠ ExternalShellClassRec externalShellClass WidgetClass externalShellWidgetClass = (WidgetClass) &externalShellClassRec; static void -ExternalShellInitialize (Widget req, Widget new, ArgList UNUSED (args), +ExternalShellInitialize (Widget req, Widget new_, ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { - XtAddEventHandler(new, 0, + XtAddEventHandler(new_, 0, TRUE, EventHandler, (XtPointer) NULL); extw_initialize_atoms(XtDisplay(req)); extw_which_side = extw_shell_send; Index: src/chartab.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/chartab.c,v retrieving revision 1.37 diff -u -p -r1.37 chartab.c --- src/chartab.c 2005/10/24 10:07:34 1.37 +++ src/chartab.c 2005/10/25 11:09:42 ＠＠ -643,11 +643,11 ＠＠ copy_char_table_entry (Lisp_Object entry for (i = 0; i < 96; i++) { - Lisp_Object new = cte->level2[i]; - if (CHAR_TABLE_ENTRYP (new)) - ctenew->level2[i] = copy_char_table_entry (new); + Lisp_Object new_ = cte->level2[i]; + if (CHAR_TABLE_ENTRYP (new_)) + ctenew->level2[i] = copy_char_table_entry (new_); else - ctenew->level2[i] = new; + ctenew->level2[i] = new_; } return wrap_char_table_entry (ctenew); ＠＠ -677,22 +677,22 ＠＠ as CHAR-TABLE. The values will not them for (i = 0; i < NUM_ASCII_CHARS; i++) { - Lisp_Object new = ct->ascii[i]; + Lisp_Object new_ = ct->ascii[i]; #ifdef MULE - assert (! (CHAR_TABLE_ENTRYP (new))); + assert (! (CHAR_TABLE_ENTRYP (new_))); #endif /* MULE */ - ctnew->ascii[i] = new; + ctnew->ascii[i] = new_; } #ifdef MULE for (i = 0; i < NUM_LEADING_BYTES; i++) { - Lisp_Object new = ct->level1[i]; - if (CHAR_TABLE_ENTRYP (new)) - ctnew->level1[i] = copy_char_table_entry (new); + Lisp_Object new_ = ct->level1[i]; + if (CHAR_TABLE_ENTRYP (new_)) + ctnew->level1[i] = copy_char_table_entry (new_); else - ctnew->level1[i] = new; + ctnew->level1[i] = new_; } #endif /* MULE */ Index: src/cmdloop.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/cmdloop.c,v retrieving revision 1.23 diff -u -p -r1.23 cmdloop.c --- src/cmdloop.c 2005/01/29 09:15:59 1.23 +++ src/cmdloop.c 2005/10/25 11:09:42 ＠＠ -174,18 +174,18 ＠＠ You should almost certainly not be using call_command_loop() is called when a macro is started and when the minibuffer is entered; normal termination of the macro or minibuffer causes a throw out of the recursive command loop. (To - 'execute-kbd-macro for macros and 'exit for minibuffers. Note also + `execute-kbd-macro' for macros and `exit' for minibuffers. Note also that the low-level minibuffer-entering function, `read-minibuffer-internal', provides its own error handling and does not need command_loop_2()'s error encapsulation; so it tells call_command_loop() to invoke command_loop_1() directly.) Note that both read-minibuffer-internal and recursive-edit set - up a catch for 'exit; this is why `abort-recursive-edit', which + up a catch for `exit'; this is why `abort-recursive-edit', which throws to this catch, exits out of either one. initial_command_loop(), called from main(), sets up a catch - for 'top-level when invoking command_loop_2(), allowing functions + for `top-level' when invoking command_loop_2(), allowing functions to throw all the way to the top level if they really need to. Before invoking command_loop_2(), initial_command_loop() calls top_level_1(), which handles all of the startup stuff (creating ＠＠ -194,7 +194,7 ＠＠ You should almost certainly not be using is in Lisp and is pointed to by the variable `top-level'; normally this function is `normal-top-level'. top_level_1() is just an error-handling wrapper similar to command_loop_2(). - Note also that initial_command_loop() sets up a catch for 'top-level + Note also that initial_command_loop() sets up a catch for `top-level' when invoking top_level_1(), just like when it invokes command_loop_2(). */ ＠＠ -286,7 +286,7 ＠＠ initial_command_loop (Lisp_Object load_m Vtop_level = list2 (Qload, load_me); /* First deal with startup and command-line arguments. A throw - to 'top-level gets us back here directly (does this ever happen?). + to `top-level' gets us back here directly (does this ever happen?). Otherwise, this function will return normally when all command- line arguments have been processed, the user's initialization file has been read in, and the first frame has been created. */ ＠＠ -309,7 +309,7 ＠＠ initial_command_loop (Lisp_Object load_m command_loop_level = 0; MARK_MODELINE_CHANGED; /* Now invoke the command loop. It never returns; however, a - throw to 'top-level will place us at the end of this loop. */ + throw to `top-level' will place us at the end of this loop. */ internal_catch (Qtop_level, command_loop_2, Qnil, 0, 0, 0); /* #### wrong with selected-console? */ /* We don't actually call clear_echo_area() here, partially Index: src/compiler.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/compiler.h,v retrieving revision 1.9 diff -u -p -r1.9 compiler.h --- src/compiler.h 2005/01/24 23:33:48 1.9 +++ src/compiler.h 2005/10/25 11:09:42 ＠＠ -36,7 +36,7 ＠＠ Boston, MA 02111-1307, USA. */ #define INCLUDED_compiler_h /* Define min() and max(). (Some compilers put them in strange places that - won't be referenced by include files used by XEmacs, such as 'macros.h' + won't be referenced by include files used by XEmacs, such as `macros.h' under Solaris.) */ #ifndef min Index: src/console.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.c,v retrieving revision 1.43 diff -u -p -r1.43 console.c --- src/console.c 2005/10/25 08:32:47 1.43 +++ src/console.c 2005/10/25 11:09:42 ＠＠ -272,7 +272,7 ＠＠ valid_console_type_p (Lisp_Object type) DEFUN ("valid-console-type-p", Fvalid_console_type_p, 1, 1, 0, /* Return t if CONSOLE-TYPE is a valid console type. -Valid types are 'x, 'tty, 'mswindows, 'msprinter, 'gtk, and 'stream. +Valid types are `x', `tty', `mswindows', `msprinter', `gtk', and `stream'. */ (console_type)) { Index: src/database.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v retrieving revision 1.36 diff -u -p -r1.36 database.c --- src/database.c 2005/10/24 10:07:35 1.36 +++ src/database.c 2005/10/25 11:09:43 ＠＠ -1,6 +1,6 ＠＠ /* Database access routines Copyright (C) 1996, William M. Perry - Copyright (C) 2001, 2002 Ben Wing. + Copyright (C) 2001, 2002, 2005 Ben Wing. This file is part of XEmacs. Index: src/device-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-msw.c,v retrieving revision 1.58 diff -u -p -r1.58 device-msw.c --- src/device-msw.c 2005/10/24 10:07:35 1.58 +++ src/device-msw.c 2005/10/25 11:09:43 ＠＠ -1044,7 +1044,7 ＠＠ Return value is the previously selected } DEFUN ("msprinter-apply-settings", Fmsprinter_apply_settings, 2, 2, 0, /* -Apply settings from a SETTINGS object to a 'msprinter DEVICE. +Apply settings from a SETTINGS object to a `msprinter' DEVICE. The settings from the settings object are immediately applied to the printer, possibly changing even the target printer itself. The SETTING object is not modified, unlike `msprinter-select-settings', and the Index: src/device-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v retrieving revision 1.64 diff -u -p -r1.64 device-x.c --- src/device-x.c 2005/06/26 18:05:03 1.64 +++ src/device-x.c 2005/10/25 11:09:44 ＠＠ -1392,11 +1392,11 ＠＠ Retrieve an X resource from the resource The first arg is the name of the resource to retrieve, such as "font". The second arg is the class of the resource to retrieve, such as "Font". -The third arg must be one of the symbols 'string, 'integer, 'natnum, or - 'boolean, specifying the type of object that the database is searched for. +The third arg must be one of the symbols `string', `integer', `natnum', or + `boolean', specifying the type of object that the database is searched for. The fourth arg is the locale to search for the resources on, and can - currently be a buffer, a frame, a device, or 'global. If omitted, it - defaults to 'global. + currently be a buffer, a frame, a device, or `global'. If omitted, it + defaults to `global'. The fifth arg is the device to search for the resources on. (The resource database for a particular device is constructed by combining non-device- specific resources such as any command-line resources specified and any ＠＠ -1449,7 +1449,7 ＠＠ is an interface to a C call something li "Emacs.EmacsLocaleType.EmacsDevice.Foreground", "String"); -4) If LOCALE is 'global, a call +4) If LOCALE is `global', a call (x-get-resource "foreground" "Foreground" 'string 'global) ＠＠ -1459,7 +1459,7 ＠＠ is an interface to a C call something li "Emacs.Foreground", "String"); -Note that for 'global, no prefix is added other than that of the +Note that for `global', no prefix is added other than that of the application itself; thus, you can use this locale to retrieve arbitrary application resources, if you really want to. Index: src/device.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device.c,v retrieving revision 1.35 diff -u -p -r1.35 device.c --- src/device.c 2005/10/24 10:07:35 1.35 +++ src/device.c 2005/10/25 11:09:44 ＠＠ -169,7 +169,7 ＠＠ valid_device_class_p (Lisp_Object class_ DEFUN ("valid-device-class-p", Fvalid_device_class_p, 1, 1, 0, /* Given a DEVICE-CLASS, return t if it is valid. -Valid classes are 'color, 'grayscale, and 'mono. +Valid classes are `color', `grayscale', and `mono'. */ (device_class)) { ＠＠ -973,7 +973,7 ＠＠ If DEVICE is nil, the selected device wi DEFUN ("device-class", Fdevice_class, 0, 1, 0, /* Return the class (color behavior) of DEVICE. -This will be one of 'color, 'grayscale, or 'mono. +This will be one of `color', `grayscale', or `mono'. */ (device)) { ＠＠ -982,7 +982,7 ＠＠ This will be one of 'color, 'grayscale, DEFUN ("set-device-class", Fset_device_class, 2, 2, 0, /* Set the class (color behavior) of DEVICE. -CLASS should be one of 'color, 'grayscale, or 'mono. +CLASS should be one of `color', `grayscale', or `mono'. This is only allowed on device such as TTY devices, where the color behavior cannot necessarily be determined automatically. */ ＠＠ -1294,7 +1294,7 ＠＠ window_system_pixelated_geometry (Lisp_O } DEFUN ("domain-device-type", Fdomain_device_type, 0, 1, 0, /* -Return the device type symbol for a DOMAIN, e.g. 'x or 'tty. +Return the device type symbol for a DOMAIN, e.g. `x' or `tty'. DOMAIN can be either a window, frame, device or console. */ (domain)) Index: src/doc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/doc.c,v retrieving revision 1.34 diff -u -p -r1.34 doc.c --- src/doc.c 2004/11/04 23:06:21 1.34 +++ src/doc.c 2005/10/25 11:09:44 ＠＠ -793,7 +793,7 ＠＠ thus, \\=\\=\\=\\= puts \\=\\= into the Bytecount strlength; Bytecount idx; Bytecount bsize; - Ibyte *new; + Ibyte *new_; Lisp_Object tem = Qnil; Lisp_Object keymap = Qnil; Lisp_Object name = Qnil; ＠＠ -904,9 +904,9 ＠＠ thus, \\=\\=\\=\\= puts \\=\\= into the if (NILP (tem)) /* but not on any keys */ { - new = (Ibyte *) xrealloc (buf, bsize += 4); - bufp += new - buf; - buf = new; + new_ = (Ibyte *) xrealloc (buf, bsize += 4); + bufp += new_ - buf; + buf = new_; memcpy (bufp, "M-x ", 4); bufp += 4; goto subst; ＠＠ -978,9 +978,9 ＠＠ thus, \\=\\=\\=\\= puts \\=\\= into the length = XSTRING_LENGTH (tem); subst: bsize += length; - new = (Ibyte *) xrealloc (buf, bsize); - bufp += new - buf; - buf = new; + new_ = (Ibyte *) xrealloc (buf, bsize); + bufp += new_ - buf; + buf = new_; memcpy (bufp, start, length); bufp += length; Index: src/dragdrop.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dragdrop.c,v retrieving revision 1.8 diff -u -p -r1.8 dragdrop.c --- src/dragdrop.c 2004/11/04 23:06:21 1.8 +++ src/dragdrop.c 2005/10/25 11:09:44 ＠＠ -34,10 +34,10 ＠＠ Boston, MA 02111-1307, USA. */ defined in ../lisp/dragdrop.el. The object of the misc-user-event has the following format: ( TYPE . DATA ) - TYPE is one of 'dragdrop-MIME and 'dragdrop-URL - DATA - if TYPE is 'dragdrop-URL, DATA is a list of valid URL strings. It + TYPE is one of `dragdrop-MIME' and `dragdrop-URL' + DATA - if TYPE is `dragdrop-URL', DATA is a list of valid URL strings. It is always a list, also if only one URL string is within it. - - if TYPE is 'dragdrop-MIME, DATA is a list of MIME elements. + - if TYPE is `dragdrop-MIME', DATA is a list of MIME elements. Each can be a string or a list. if it is a string it is the pure MIME data complete with header and body. Index: src/eval.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v retrieving revision 1.89 diff -u -p -r1.89 eval.c --- src/eval.c 2005/04/11 05:11:24 1.89 +++ src/eval.c 2005/10/25 11:09:46 ＠＠ -203,7 +203,7 ＠＠ struct backtrace *backtrace_list; array of `struct specbinding's, grown (using realloc()) as necessary. (Note that all four of these lists behave as a stacks.) - Catches are created by declaring a 'struct catchtag' locally, + Catches are created by declaring a `struct catchtag' locally, filling the .TAG field in with the tag, and doing a setjmp() on .JMP. Fthrow() will store the value passed to it in .VAL and longjmp() back to .JMP, back to the function that established the ＠＠ -479,7 +479,7 ＠＠ call_debugger_259 (Lisp_Object arg) as a backtrace is displayed, so that further errors can indeed be handled normally. - We also establish a catch for 'debugger. If the debugger function + We also establish a catch for `debugger'. If the debugger function throws to this instead of returning a value, it means that the user pressed 'c' (pretend like the debugger was never entered). The function then returns Qunbound. (If the user pressed 'r', for ＠＠ -549,7 +549,7 ＠＠ do_debug_on_exit (Lisp_Object val) /* Called when debug-on-call behavior is called for. Enter the debugger with the appropriate args for this. VAL is either t for a call - through `eval' or 'lambda for a call through `funcall'. + through `eval' or `lambda' for a call through `funcall'. #### The differentiation here between EVAL and FUNCALL is bogus. FUNCALL can be defined as ＠＠ -1656,14 +1656,14 ＠＠ throw_or_bomb_out (Lisp_Object tag, Lisp /* If bomb_out_p is t, this is being called from Fsignal as a "last resort" when there is no handler for this error and the debugger couldn't be invoked, so we are throwing to - 'top-level. If this tag doesn't exist (happens during the + `top-level'. If this tag doesn't exist (happens during the initialization stages) we would get in an infinite recursive Fsignal/Fthrow loop, so instead we bomb out to the really-early-error-handler. Note that in fact the only time that the "last resort" - occurs is when there's no catch for 'top-level -- the - 'top-level catch and the catch-all error handler are + occurs is when there's no catch for `top-level' -- the + `top-level' catch and the catch-all error handler are established at the same time, in initial_command_loop/ top_level_1. ＠＠ -2385,7 +2385,7 ＠＠ user invokes the "return from signal" op #### The only time that no handler is present is during temacs or perhaps very early in XEmacs. In both cases, - there is no 'top-level catch. (That's why the + there is no `top-level' catch. (That's why the "bomb-out" hack was added.) [[#### Fix this horrifitude!]] Index: src/event-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v retrieving revision 1.104 diff -u -p -r1.104 event-msw.c --- src/event-msw.c 2005/06/26 18:05:04 1.104 +++ src/event-msw.c 2005/10/25 11:09:47 ＠＠ -1,7 +1,7 ＠＠ /* The mswindows event_stream interface. Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1996, 2000, 2001, 2002, 2003 Ben Wing. + Copyright (C) 1996, 2000, 2001, 2002, 2003, 2005 Ben Wing. Copyright (C) 1997 Jonathan Harris. This file is part of XEmacs. ＠＠ -1797,11 +1797,11 ＠＠ dde_eval (Lisp_Object str) /* A list of DDE advise tokens. Each token is an uninterned symbol, * whose value is the DDE string handle for its name (stored as a float, * as a Lisp int cannot hold a full C int). - * The token's 'dde-data property is used to store data for a dde-advise. + * The token's `dde-data' property is used to store data for a dde-advise. */ Lisp_Object Vdde_advise_items; -/* The symbol 'HSZ */ +/* The symbol `HSZ' */ Lisp_Object QHSZ; DEFUN("dde-alloc-advise-item", Fdde_alloc_advise_item, 0, 1, 0, /* ＠＠ -5058,7 +5058,7 ＠＠ Each item is an uninterned symbol, creat The symbol's value is the data which is returned to the DDE client when a request for the item is made (or a dde-advise call is made). -The symbol also has a 'HSZ property, which holds the DDE string handle +The symbol also has a `HSZ' property, which holds the DDE string handle for the item, as a float. This is for internal use only, and should not be modified. */ ); Index: src/event-stream.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v retrieving revision 1.91 diff -u -p -r1.91 event-stream.c --- src/event-stream.c 2005/07/17 20:08:48 1.91 +++ src/event-stream.c 2005/10/25 11:09:49 ＠＠ -3082,7 +3082,7 ＠＠ execute_internal_event (Lisp_Object even continuous stream of process events for them. Since we don't return until all process events have been flushed, we would get stuck here, processing events on a process whose status - was 'exit. Call this after dispatch-event, or the fds will + was `exit'. Call this after dispatch-event, or the fds will have been closed before we read the last data from them. It's safe for the filter to signal an error because status_notify() will be called on return to top-level. ＠＠ -3892,10 +3892,10 ＠＠ reset_this_command_keys (Lisp_Object con static void push_this_command_keys (Lisp_Object event) { - Lisp_Object new = Fmake_event (Qnil, Qnil); + Lisp_Object new_ = Fmake_event (Qnil, Qnil); - Fcopy_event (event, new); - enqueue_event (new, &Vthis_command_keys, &Vthis_command_keys_tail); + Fcopy_event (event, new_); + enqueue_event (new_, &Vthis_command_keys, &Vthis_command_keys_tail); } /* The following two functions are used in call-interactively, Index: src/events.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.c,v retrieving revision 1.68 diff -u -p -r1.68 events.c --- src/events.c 2005/07/17 20:08:48 1.68 +++ src/events.c 2005/10/25 11:09:49 ＠＠ -1418,7 +1418,7 ＠＠ second. This function contains knowledg arguments ``mean'' -- for example, the number 9 is converted to the character ``Tab'', not the distinct character ``Control-I''. -KEY-DESCRIPTION can be an integer, a character, a symbol such as 'clear, +KEY-DESCRIPTION can be an integer, a character, a symbol such as `clear', or a list such as '(control backspace). If the optional second argument EVENT is an event, it is modified and Index: src/extents.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents.c,v retrieving revision 1.61 diff -u -p -r1.61 extents.c --- src/extents.c 2005/10/24 10:07:36 1.61 +++ src/extents.c 2005/10/25 11:09:51 ＠＠ -3733,10 +3733,10 ＠＠ See `extent-parent'. Dynarr_length (newprops), sizeof (Lisp_Object_pair), compare_key_value_pairs)) { - Lisp_Object_pair new; - new.key = Dynarr_at (oldprops, i).key; - new.value = Qunbound; - Dynarr_add (newprops, new); + Lisp_Object_pair new_; + new_.key = Dynarr_at (oldprops, i).key; + new_.value = Qunbound; + Dynarr_add (newprops, new_); } } for (i = 0; i < orignewlength; i++) ＠＠ -3747,10 +3747,10 ＠＠ See `extent-parent'. sizeof (Lisp_Object_pair), compare_key_value_pairs)) { - Lisp_Object_pair new; - new.key = Dynarr_at (newprops, i).key; - new.value = Qunbound; - Dynarr_add (oldprops, new); + Lisp_Object_pair new_; + new_.key = Dynarr_at (newprops, i).key; + new_.value = Qunbound; + Dynarr_add (oldprops, new_); } } qsort (Dynarr_atp (oldprops, 0), Dynarr_length (oldprops), ＠＠ -6525,7 +6525,7 ＠＠ get_char_property (Bytexpos position, Li Lisp_Object extent; /* text_props_only specifies whether we only consider text-property - extents (those with the 'text-prop property set) or all extents. */ + extents (those with the `text-prop' property set) or all extents. */ if (!text_props_only) extent = extent_at (position, object, prop, 0, fl, 0); else ＠＠ -6665,8 +6665,8 ＠＠ put_text_prop_mapper (EXTENT e, void *ar extent = wrap_extent (e); - /* Note: in some cases when the property itself is 'start-open - or 'end-closed, the checks to set the openness may do a bit + /* Note: in some cases when the property itself is `start-open' + or `end-closed', the checks to set the openness may do a bit of extra work; but it won't hurt because we then fix up the openness later on in put_text_prop_openness_mapper(). */ if (!EQ (Fextent_property (extent, Qtext_prop, Qnil), closure->prop)) Index: src/file-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v retrieving revision 1.48 diff -u -p -r1.48 file-coding.c --- src/file-coding.c 2005/10/25 08:32:47 1.48 +++ src/file-coding.c 2005/10/25 11:09:52 ＠＠ -2,7 +2,7 ＠＠ #### rename me to coding-system.c or coding.c Copyright (C) 1991, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 2000, 2001, 2002, 2003 Ben Wing. + Copyright (C) 2000, 2001, 2002, 2003, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -406,8 +406,8 ＠＠ valid_coding_system_type_p (Lisp_Object DEFUN ("valid-coding-system-type-p", Fvalid_coding_system_type_p, 1, 1, 0, /* Given a CODING-SYSTEM-TYPE, return non-nil if it is valid. Valid types depend on how XEmacs was compiled but may include -'undecided, 'chain, 'integer, 'ccl, 'iso2022, 'big5, 'shift-jis, -'utf-16, 'ucs-4, 'utf-8, etc. +`undecided', `chain', `integer', `ccl', `iso2022', `big5', `shift-jis', +`utf-16', `ucs-4', `utf-8', etc. */ (coding_system_type)) { ＠＠ -1044,54 +1044,54 ＠＠ Register symbol NAME as a coding system. TYPE describes the conversion method used and should be one of -nil or 'undecided +nil or `undecided' Automatic conversion. XEmacs attempts to detect the coding system used in the file. -'chain +`chain' Chain two or more coding systems together to make a combination coding system. -'no-conversion +`no-conversion' No conversion. Use this for binary files and such. On output, graphic characters that are not in ASCII or Latin-1 will be replaced by a ?. (For a no-conversion-encoded buffer, these characters will only be present if you explicitly insert them.) -'convert-eol +`convert-eol' Convert CRLF sequences or CR to LF. -'shift-jis +`shift-jis' Shift-JIS (a Japanese encoding commonly used in PC operating systems). -'unicode +`unicode' Any Unicode encoding (UCS-4, UTF-8, UTF-16, etc.). -'mswindows-unicode-to-multibyte +`mswindows-unicode-to-multibyte' (MS Windows only) Converts from Windows Unicode to Windows Multibyte (any code page encoding) upon encoding, and the other way upon decoding. -'mswindows-multibyte +`mswindows-multibyte' Converts to or from Windows Multibyte (any code page encoding). This is resolved into a chain of `mswindows-unicode' and `mswindows-unicode-to-multibyte'. -'iso2022 +`iso2022' Any ISO2022-compliant encoding. Among other things, this includes JIS (the Japanese encoding commonly used for e-mail), EUC (the standard Unix encoding for Japanese and other languages), and Compound Text (the encoding used in X11). You can specify more specific information about the conversion with the PROPS argument. -'big5 +`big5' Big5 (the encoding commonly used for Mandarin Chinese in Taiwan). -'ccl +`ccl' The conversion is performed using a user-written pseudo-code program. CCL (Code Conversion Language) is the name of this pseudo-code. -'gzip +`gzip' GZIP compression format. -'internal +`internal' Write out or read in the raw contents of the memory representing the buffer's text. This is primarily useful for debugging purposes, and is only enabled when XEmacs has been compiled with DEBUG_XEMACS defined (via the --debug configure option). - WARNING: Reading in a file using 'internal conversion can result + WARNING: Reading in a file using `internal' conversion can result in an internal inconsistency in the memory representing a buffer's text, which will produce unpredictable results and may cause XEmacs to crash. Under normal circumstances you should - never use 'internal conversion. + never use `internal' conversion. DESCRIPTION is a short English phrase describing the coding system, suitable for use as a menu item. (See also the `documentation' property ＠＠ -1100,14 +1100,14 ＠＠ below.) PROPS is a property list, describing the specific nature of the character set. Recognized properties are: -'mnemonic +`mnemonic' String to be displayed in the modeline when this coding system is active. -'documentation +`documentation' Detailed documentation on the coding system. -'eol-type +`eol-type' End-of-line conversion to be used. It should be one of nil ＠＠ -1115,18 +1115,18 ＠＠ character set. Recognized properties ar or CR). Also generate subsidiary coding systems named `NAME-unix', `NAME-dos', and `NAME-mac', that are identical to this coding system but have an EOL-TYPE - value of 'lf, 'crlf, and 'cr, respectively. - 'lf + value of `lf', `crlf', and `cr', respectively. + `lf' The end of a line is marked externally using ASCII LF. Since this is also the way that XEmacs represents an end-of-line internally, specifying this option results in no end-of-line conversion. This is the standard format for Unix text files. - 'crlf + `crlf' The end of a line is marked externally using ASCII CRLF. This is the standard format for MS-DOS text files. - 'cr + `cr' The end of a line is marked externally using ASCII CR. This is the standard format for Macintosh text files. t ＠＠ -1135,7 +1135,7 ＠＠ character set. Recognized properties ar converted to nil when stored internally, and `coding-system-property' will return nil.) -'post-read-conversion +`post-read-conversion' The value is a function to call after some text is inserted and decoded by the coding system itself and before any functions in `after-change-functions' are called. (#### Not actually true in ＠＠ -1145,7 +1145,7 ＠＠ character set. Recognized properties ar `after-insert-file-functions', i.e. LENGTH of the text inserted, with point at the head of the text to be decoded. -'pre-write-conversion +`pre-write-conversion' The value is a function to call after all functions in `write-region-annotate-functions' and `buffer-file-format' are called, and before the text is encoded by the coding system itself. ＠＠ -1158,21 +1158,21 ＠＠ character set. Recognized properties ar The following properties are allowed for FSF compatibility but currently ignored: -'translation-table-for-decode +`translation-table-for-decode' The value is a translation table to be applied on decoding. See the function `make-translation-table' for the format of translation table. This is not applicable to CCL-based coding systems. -'translation-table-for-encode +`translation-table-for-encode' The value is a translation table to be applied on encoding. This is not applicable to CCL-based coding systems. -'safe-chars +`safe-chars' The value is a char table. If a character has non-nil value in it, the character is safely supported by the coding system. This overrides the specification of safe-charsets. -'safe-charsets +`safe-charsets' The value is a list of charsets safely supported by the coding system. The value t means that all charsets Emacs handles are supported. Even if some charset is not in this list, it doesn't ＠＠ -1180,11 +1180,11 ＠＠ ignored: it just means that some other receiver of text encoded in the coding system won't be able to handle that charset. -'mime-charset +`mime-charset' The value is a symbol of which name is `MIME-charset' parameter of the coding system. -'valid-codes (meaningful only for a coding system based on CCL) +`valid-codes' (meaningful only for a coding system based on CCL) The value is a list to indicate valid byte ranges of the encoded file. Each element of the list is an integer or a cons of integer. In the former case, the integer value is a valid byte code. In the ＠＠ -1192,9 +1192,9 ＠＠ ignored: -The following additional property is recognized if TYPE is 'convert-eol: +The following additional property is recognized if TYPE is `convert-eol': -'subtype +`subtype' One of `lf', `crlf', `cr' or nil (for autodetection). When decoding, the corresponding sequence will be converted to LF. When encoding, the opposite happens. This coding system converts characters to ＠＠ -1202,12 +1202,12 ＠＠ The following additional property is rec -The following additional properties are recognized if TYPE is 'iso2022: +The following additional properties are recognized if TYPE is `iso2022': -'charset-g0 -'charset-g1 -'charset-g2 -'charset-g3 +`charset-g0' +`charset-g1' +`charset-g2' +`charset-g3' The character set initially designated to the G0 - G3 registers. The value should be one of ＠＠ -1217,38 +1217,38 ＠＠ The following additional properties are the register, but may be later on; this automatically sets the corresponding `force-g*-on-output' property) -'force-g0-on-output -'force-g1-on-output -'force-g2-on-output -'force-g2-on-output +`force-g0-on-output' +`force-g1-on-output' +`force-g2-on-output' +`force-g2-on-output' If non-nil, send an explicit designation sequence on output before using the specified register. -'short +`short' If non-nil, use the short forms "ESC $ ＠", "ESC $ A", and "ESC $ B" on output in place of the full designation sequences "ESC $ ( ＠", "ESC $ ( A", and "ESC $ ( B". -'no-ascii-eol +`no-ascii-eol' If non-nil, don't designate ASCII to G0 at each end of line on output. Setting this to non-nil also suppresses other state-resetting that normally happens at the end of a line. -'no-ascii-cntl +`no-ascii-cntl' If non-nil, don't designate ASCII to G0 before control chars on output. -'seven +`seven' If non-nil, use 7-bit environment on output. Otherwise, use 8-bit environment. -'lock-shift +`lock-shift' If non-nil, use locking-shift (SO/SI) instead of single-shift or designation by escape sequence. -'no-iso6429 +`no-iso6429' If non-nil, don't use ISO6429's direction specification. -'escape-quoted +`escape-quoted' If non-nil, literal control characters that are the same as the beginning of a recognized ISO2022 or ISO6429 escape sequence (in particular, ESC (0x1B), SO (0x0E), SI (0x0F), SS2 (0x8E), ＠＠ -1261,44 +1261,44 ＠＠ The following additional properties are or Control-1 character sets; this is explicitly disallowed by the ISO2022 standard. -'input-charset-conversion +`input-charset-conversion' A list of conversion specifications, specifying conversion of characters in one charset to another when decoding is performed. Each specification is a list of two elements: the source charset, and the destination charset. -'output-charset-conversion +`output-charset-conversion' A list of conversion specifications, specifying conversion of characters in one charset to another when encoding is performed. The form of each specification is the same as for - 'input-charset-conversion. + `input-charset-conversion'. The following additional properties are recognized (and required) -if TYPE is 'ccl: +if TYPE is `ccl': -'decode +`decode' CCL program used for decoding (converting to internal format). -'encode +`encode' CCL program used for encoding (converting to external format). -The following additional properties are recognized if TYPE is 'chain: +The following additional properties are recognized if TYPE is `chain': -'chain +`chain' List of coding systems to be chained together, in decoding order. -'canonicalize-after-coding +`canonicalize-after-coding' Coding system to be returned by the detector routines in place of this coding system. -The following additional properties are recognized if TYPE is 'unicode: +The following additional properties are recognized if TYPE is `unicode': -'type +`type' One of `utf-16', `utf-8', `ucs-4', or `utf-7' (the latter is not yet implemented). `utf-16' is the basic two-byte encoding; `ucs-4' is the four-byte encoding; `utf-8' is an ASCII-compatible ＠＠ -1307,12 +1307,12 ＠＠ The following additional properties are [[ This should be \"transformation format\". There should also be `ucs-2' (or `bmp' -- no surrogates) and `utf-32' (range checked). ]] -'little-endian +`little-endian' If non-nil, `utf-16' and `ucs-4' will write out the groups of two or four bytes little-endian instead of big-endian. This is required, for example, under Windows. -'need-bom +`need-bom' If non-nil, a byte order mark (BOM, or Unicode FFFE) should be written out at the beginning of the data. This serves both to identify the endianness of the following data and to mark the ＠＠ -1322,16 +1322,16 ＠＠ The following additional properties are The following additional properties are recognized if TYPE is -'mswindows-multibyte: +`mswindows-multibyte': -'code-page +`code-page' Either a number (specifying a particular code page) or one of the symbols `ansi', `oem', `mac', or `ebcdic', specifying the ANSI, OEM, Macintosh, or EBCDIC code page associated with a particular locale (given by the `locale' property). NOTE: EBCDIC code pages only exist in Windows 2000 and later. -'locale +`locale' If `code-page' is a symbol, this specifies the locale whose code page of the corresponding type should be used. This should be one of the following: A cons of two strings, (LANGUAGE ＠＠ -1344,16 +1344,16 ＠＠ The following additional properties are -The following additional properties are recognized if TYPE is 'undecided: +The following additional properties are recognized if TYPE is `undecided': [[ Doesn't GNU use \"detect-*\" for the following two? ]] -'do-eol +`do-eol' Do EOL detection. -'do-coding +`do-coding' Do encoding detection. -'coding-system +`coding-system' If encoding detection is not done, use the specified coding system to do decoding. This is used internally when implementing coding systems with an EOL type that specifies autodetection (the default), ＠＠ -1361,9 +1361,9 ＠＠ The following additional properties are -The following additional property is recognized if TYPE is 'gzip: +The following additional property is recognized if TYPE is `gzip': -'level +`level' Compression level: 0 through 9, or `default' (currently 6). */ ＠＠ -4064,7 +4064,7 ＠＠ detect_coding_stream (Lisp_Object stream DEFUN ("detect-coding-region", Fdetect_coding_region, 2, 3, 0, /* Detect coding system of the text in the region between START and END. Return a list of possible coding systems ordered by priority. -If only ASCII characters are found, return 'undecided or one of +If only ASCII characters are found, return `undecided' or one of its subsidiary coding systems according to a detected end-of-line type. Optional arg BUFFER defaults to the current buffer. */ Index: src/fns.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fns.c,v retrieving revision 1.63 diff -u -p -r1.63 fns.c --- src/fns.c 2005/04/08 23:11:26 1.63 +++ src/fns.c 2005/10/25 11:09:54 ＠＠ -3348,11 +3348,11 ＠＠ This is like (copy-sequence NEW) except conses in OLD as much as possible. If OLD and NEW are the same length, no consing will take place. */ - (old, new)) + (old, new_)) { Lisp_Object oldtail = old, prevoldtail = Qnil; - EXTERNAL_LIST_LOOP_2 (elt, new) + EXTERNAL_LIST_LOOP_2 (elt, new_) { if (!NILP (oldtail)) { Index: src/frame-tty.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-tty.c,v retrieving revision 1.14 diff -u -p -r1.14 frame-tty.c --- src/frame-tty.c 2004/09/20 19:19:44 1.14 +++ src/frame-tty.c 2005/10/25 11:09:54 ＠＠ -151,7 +151,7 ＠＠ static void tty_lower_frame (struct frame *f) { Lisp_Object frame_list = DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f))); - Lisp_Object tail, new; + Lisp_Object tail, new_; if (!FRAME_REPAINT_P (f)) return; ＠＠ -169,11 +169,11 ＠＠ tty_lower_frame (struct frame *f) tty_make_frame_hidden (f); if (CONSP (XCDR (tail))) - new = XCAR (XCDR (tail)); + new_ = XCAR (XCDR (tail)); else - new = XCAR (frame_list); - tty_make_frame_unhidden (XFRAME (new)); - tty_schedule_frame_select (XFRAME (new)); + new_ = XCAR (frame_list); + tty_make_frame_unhidden (XFRAME (new_)); + tty_schedule_frame_select (XFRAME (new_)); } static void Index: src/frame.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame.c,v retrieving revision 1.72 diff -u -p -r1.72 frame.c --- src/frame.c 2005/10/24 10:07:37 1.72 +++ src/frame.c 2005/10/25 11:09:55 ＠＠ -1,6 +1,6 ＠＠ /* Generic frame functions. Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. - Copyright (C) 1995, 1996, 2002, 2003 Ben Wing. + Copyright (C) 1995, 1996, 2002, 2003, 2005 Ben Wing. Copyright (C) 1995 Sun Microsystems, Inc. This file is part of XEmacs. ＠＠ -1294,24 +1294,24 ＠＠ returned. Possible values for WHICH-FRAMES are -'visible Consider only frames that are visible. -'iconic Consider only frames that are iconic. -'invisible Consider only frames that are invisible - (this is different from iconic). -'visible-iconic Consider frames that are visible or iconic. -'invisible-iconic Consider frames that are invisible or iconic. -'nomini Consider all frames except minibuffer-only ones. -'visible-nomini Like `visible' but omits minibuffer-only frames. -'iconic-nomini Like `iconic' but omits minibuffer-only frames. -'invisible-nomini Like `invisible' but omits minibuffer-only frames. -'visible-iconic-nomini Like `visible-iconic' but omits minibuffer-only - frames. -'invisible-iconic-nomini Like `invisible-iconic' but omits minibuffer-only - frames. -any other value Consider all frames. +`visible' Consider only frames that are visible. +`iconic' Consider only frames that are iconic. +`invisible' Consider only frames that are invisible + (this is different from iconic). +`visible-iconic' Consider frames that are visible or iconic. +`invisible-iconic' Consider frames that are invisible or iconic. +`nomini' Consider all frames except minibuffer-only ones. +`visible-nomini' Like `visible' but omits minibuffer-only frames. +`iconic-nomini' Like `iconic' but omits minibuffer-only frames. +`invisible-nomini' Like `invisible' but omits minibuffer-only frames. +`visible-iconic-nomini' Like `visible-iconic' but omits minibuffer-only + frames. +`invisible-iconic-nomini' Like `invisible-iconic' but omits minibuffer-only + frames. +any other value Consider all frames. -If WHICH-FRAMES is omitted, 'nomini is used. A value for WHICH-FRAMES -of 0 (a number) is treated like 'iconic, for backwards compatibility. +If WHICH-FRAMES is omitted, `nomini' is used. A value for WHICH-FRAMES +of 0 (a number) is treated like `iconic', for backwards compatibility. If WHICH-FRAMES is a window, include only its own frame and any frame now using that window as the minibuffer. ＠＠ -2095,14 +2095,14 ＠＠ Also raises the frame so that nothing ob return Fmake_frame_visible (frame); } -/* FSF returns 'icon for iconized frames. What a crock! */ +/* FSF returns `icon' for iconized frames. What a crock! */ DEFUN ("frame-visible-p", Fframe_visible_p, 0, 1, 0, /* Return non NIL if FRAME is now "visible" (actually in use for display). A frame that is not visible is not updated, and, if it works through a window system, may not show at all. N.B. Under X "visible" means Mapped. It the window is mapped but not -actually visible on screen then `frame-visible-p' returns 'hidden. +actually visible on screen then `frame-visible-p' returns `hidden'. */ (frame)) { Index: src/gpmevent.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gpmevent.c,v retrieving revision 1.20 diff -u -p -r1.20 gpmevent.c --- src/gpmevent.c 2005/06/28 11:32:14 1.20 +++ src/gpmevent.c 2005/10/25 11:09:55 ＠＠ -562,7 +562,7 ＠＠ Toggle accepting of GPM mouse events. gpm_consolefd = fd; /* We have to pass the virtual console manually, otherwise if you - ** use 'gnuclient -nw' to connect to an XEmacs that is running in + ** use `gnuclient -nw' to connect to an XEmacs that is running in ** X, Gpm_Open() tries to use ttyname(0 | 1 | 2) to find out which ** console you are using, which is of course not correct for the ** new tty device. Index: src/gutter.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gutter.c,v retrieving revision 1.18 diff -u -p -r1.18 gutter.c --- src/gutter.c 2005/01/24 23:33:59 1.18 +++ src/gutter.c 2005/10/25 11:09:55 ＠＠ -739,15 +739,15 ＠＠ decode_gutter_position (Lisp_Object posi DEFUN ("set-default-gutter-position", Fset_default_gutter_position, 1, 1, 0, /* Set the position that the `default-gutter' will be displayed at. -Valid positions are 'top, 'bottom, 'left and 'right. +Valid positions are `top', `bottom', `left' and `right'. See `default-gutter-position'. */ (position)) { enum gutter_pos cur = decode_gutter_position (Vdefault_gutter_position); - enum gutter_pos new = decode_gutter_position (position); + enum gutter_pos new_ = decode_gutter_position (position); - if (cur != new) + if (cur != new_) { /* The following calls will automatically cause the dirty flags to be set; we delay frame size changes to avoid ＠＠ -756,18 +756,18 ＠＠ See `default-gutter-position'. int depth = begin_hold_frame_size_changes (); set_specifier_fallback (Vgutter[cur], list1 (Fcons (Qnil, Qnil))); - set_specifier_fallback (Vgutter[new], Vdefault_gutter); + set_specifier_fallback (Vgutter[new_], Vdefault_gutter); set_specifier_fallback (Vgutter_size[cur], list1 (Fcons (Qnil, Qzero))); - set_specifier_fallback (Vgutter_size[new], - new == TOP_GUTTER || new == BOTTOM_GUTTER + set_specifier_fallback (Vgutter_size[new_], + new_ == TOP_GUTTER || new_ == BOTTOM_GUTTER ? Vdefault_gutter_height : Vdefault_gutter_width); set_specifier_fallback (Vgutter_border_width[cur], list1 (Fcons (Qnil, Qzero))); - set_specifier_fallback (Vgutter_border_width[new], + set_specifier_fallback (Vgutter_border_width[new_], Vdefault_gutter_border_width); set_specifier_fallback (Vgutter_visible_p[cur], list1 (Fcons (Qnil, Qt))); - set_specifier_fallback (Vgutter_visible_p[new], Vdefault_gutter_visible_p); + set_specifier_fallback (Vgutter_visible_p[new_], Vdefault_gutter_visible_p); Vdefault_gutter_position = position; unbind_to (depth); ＠＠ -1035,7 +1035,7 ＠＠ gutter_size_validate (Lisp_Object instan return; if (!INTP (instantiator) && !EQ (instantiator, Qautodetect)) - invalid_argument ("Gutter size must be an integer or 'autodetect", instantiator); + invalid_argument ("Gutter size must be an integer or `autodetect'", instantiator); } DEFUN ("gutter-size-specifier-p", Fgutter_size_specifier_p, 1, 1, 0, /* ＠＠ -1235,7 +1235,7 ＠＠ Use `set-specifier' to change this. The position of this gutter is specified in the function `default-gutter-position'. If the corresponding position-specific -gutter (e.g. `top-gutter' if `default-gutter-position' is 'top) +gutter (e.g. `top-gutter' if `default-gutter-position' is `top') does not specify a gutter in a particular domain (usually a window), then the value of `default-gutter' in that domain, if any, will be used instead. ＠＠ -1356,21 +1356,21 ＠＠ This is a specifier; use `set-specifier' The position of the default gutter is specified by the function `set-default-gutter-position'. If the corresponding position-specific gutter thickness specifier (e.g. `top-gutter-height' if -`default-gutter-position' is 'top) does not specify a thickness in a +`default-gutter-position' is `top') does not specify a thickness in a particular domain (a window or a frame), then the value of `default-gutter-height' or `default-gutter-width' (depending on the gutter orientation) in that domain, if any, will be used instead. Note that `default-gutter-height' is only used when -`default-gutter-position' is 'top or 'bottom, and `default-gutter-width' -is only used when `default-gutter-position' is 'left or 'right. +`default-gutter-position' is `top' or `bottom', and `default-gutter-width' +is only used when `default-gutter-position' is `left' or `right'. Note that all of the position-specific gutter thickness specifiers have a fallback value of zero when they do not correspond to the default gutter. Therefore, you will have to set a non-zero thickness value if you want a position-specific gutter to be displayed. -If you set the height to 'autodetect the size of the gutter will be +If you set the height to `autodetect' the size of the gutter will be calculated to be large enough to hold the contents of the gutter. This is the default. */ ); ＠＠ -1488,7 +1488,7 ＠＠ This is a specifier; use `set-specifier' The position of the default gutter is specified by the function `set-default-gutter-position'. If the corresponding position-specific gutter border width specifier (e.g. `top-gutter-border-width' if -`default-gutter-position' is 'top) does not specify a border width in a +`default-gutter-position' is `top') does not specify a border width in a particular domain (a window or a frame), then the value of `default-gutter-border-width' in that domain, if any, will be used instead. ＠＠ -1579,7 +1579,7 ＠＠ This is a specifier; use `set-specifier' The position of the default gutter is specified by the function `set-default-gutter-position'. If the corresponding position-specific gutter visibility specifier (e.g. `top-gutter-visible-p' if -`default-gutter-position' is 'top) does not specify a visible-p value +`default-gutter-position' is `top') does not specify a visible-p value in a particular domain (a window or a frame), then the value of `default-gutter-visible-p' in that domain, if any, will be used instead. Index: src/hash.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/hash.c,v retrieving revision 1.13 diff -u -p -r1.13 hash.c --- src/hash.c 2005/01/26 10:22:24 1.13 +++ src/hash.c 2005/10/25 11:09:55 ＠＠ -32,8 +32,8 ＠＠ Boston, MA 02111-1307, USA. */ #define COMFORTABLE_SIZE(size) (21 * (size) / 16) -#define KEYS_DIFFER_P(old, new, testfun) \ - (((old) != (new)) && (!(testfun) || !(testfun) ((old),(new)))) +#define KEYS_DIFFER_P(old, new_, testfun) \ + (((old) != (new_)) && (!(testfun) || !(testfun) ((old),(new_)))) static void rehash (hentry *harray, struct hash_table *ht, Elemcount size); Index: src/imgproc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/imgproc.c,v retrieving revision 1.8 diff -u -p -r1.8 imgproc.c --- src/imgproc.c 2004/11/04 23:06:36 1.8 +++ src/imgproc.c 2005/10/25 11:09:55 ＠＠ -202,7 +202,7 ＠＠ splitbox(quant_table *qt, Colorbox* ptr) { int hist2[B_LEN]; int first = 0, last = 0; - register Colorbox *new; + register Colorbox *new_; register int *iptr, *histp; register int i, j; register int ir,ig,ib; ＠＠ -286,45 +286,45 ＠＠ splitbox(quant_table *qt, Colorbox* ptr) i++; /* Create new box, re-allocate points */ - new = qt->freeboxes; - qt->freeboxes = new->next; + new_ = qt->freeboxes; + qt->freeboxes = new_->next; if (qt->freeboxes) qt->freeboxes->prev = NULL; if (qt->usedboxes) - qt->usedboxes->prev = new; - new->next = qt->usedboxes; - qt->usedboxes = new; + qt->usedboxes->prev = new_; + new_->next = qt->usedboxes; + qt->usedboxes = new_; histp = &hist2[first]; for (sum1 = 0, j = first; j < i; j++) sum1 += *histp++; for (sum2 = 0, j = i; j <= last; j++) sum2 += *histp++; - new->total = sum1; + new_->total = sum1; ptr->total = sum2; - new->rmin = ptr->rmin; - new->rmax = ptr->rmax; - new->gmin = ptr->gmin; - new->gmax = ptr->gmax; - new->bmin = ptr->bmin; - new->bmax = ptr->bmax; + new_->rmin = ptr->rmin; + new_->rmax = ptr->rmax; + new_->gmin = ptr->gmin; + new_->gmax = ptr->gmax; + new_->bmin = ptr->bmin; + new_->bmax = ptr->bmax; switch (axis) { case RED: - new->rmax = i-1; + new_->rmax = i-1; ptr->rmin = i; break; case GREEN: - new->gmax = i-1; + new_->gmax = i-1; ptr->gmin = i; break; case BLUE: - new->bmax = i-1; + new_->bmax = i-1; ptr->bmin = i; break; } - shrinkbox (qt, new); + shrinkbox (qt, new_); shrinkbox (qt, ptr); } Index: src/indent.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/indent.c,v retrieving revision 1.20 diff -u -p -r1.20 indent.c --- src/indent.c 2005/01/26 05:11:12 1.20 +++ src/indent.c 2005/10/25 11:09:56 ＠＠ -2,7 +2,7 ＠＠ Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. - Copyright (C) 2002 Ben Wing. + Copyright (C) 2002, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -392,7 +392,7 ＠＠ and horizontal scrolling has no effect. If specified column is within a character, point goes after that character. If it's past end of line, point goes to end of line. -A value of 'coerce for the second (optional) argument FORCE means if +A value of `coerce' for the second (optional) argument FORCE means if COLUMN is in the middle of a tab character, change it to spaces. Any other non-nil value means the same, plus if the line is too short to reach column COLUMN, then add spaces/tabs to get there. Index: src/keymap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v retrieving revision 1.58 diff -u -p -r1.58 keymap.c --- src/keymap.c 2005/10/24 10:07:38 1.58 +++ src/keymap.c 2005/10/25 11:09:57 ＠＠ -50,7 +50,7 ＠＠ Boston, MA 02111-1307, USA. */ table A hash table, hashing keysyms to their bindings. It will be one of the following: - -- a symbol, e.g. 'home + -- a symbol, e.g. `home' -- a character, representing something printable (not ?\C-c meaning C-c, for instance) -- an integer representing a modifier combination ＠＠ -1177,7 +1177,7 ＠＠ copy_keymap_mapper (Lisp_Object key, Lis /* When we encounter a keymap which is indirected through a symbol, we need to copy the sub-map. In v18, the form (lookup-key (copy-keymap global-map) "\C-x") - returned a new keymap, not the symbol 'Control-X-prefix. + returned a new keymap, not the symbol `Control-X-prefix'. */ value = get_keymap (value, 0, 1); /* #### autoload GC-safe here? */ if (KEYMAPP (value)) ＠＠ -1297,11 +1297,12 ＠＠ define_key_check_and_coerce_keysym (Lisp { Ibyte *name = XSTRING_DATA (XSYMBOL (*keysym)->name); - /* FSFmacs uses symbols with the printed representation of keysyms in - their names, like 'M-x, and we use the syntax '(meta x). So, to avoid - confusion, notice the M-x syntax and signal an error - because - otherwise it would be interpreted as a regular keysym, and would even - show up in the list-buffers output, causing confusion to the naive. + /* GNU Emacs uses symbols with the printed representation of keysyms in + their names, like `M-x', and we use the syntax '(meta x). So, to + avoid confusion, notice the M-x syntax and signal an error - + because otherwise it would be interpreted as a regular keysym, and + would even show up in the list-buffers output, causing confusion + to the naive. We can get away with this because none of the X keysym names contain a hyphen (some contain underscore, however). ＠＠ -1574,19 +1575,19 ＠＠ event_matches_key_specifier_p (Lisp_Obje return 0; /* if the specifier is an integer such as 27, then it should match - both of the events 'escape' and 'control ['. Calling - Fcharacter_to_event() will only match 'escape'. */ + both of the events `escape' and `control ['. Calling + Fcharacter_to_event() will only match `escape'. */ if (CHAR_OR_CHAR_INTP (key_specifier)) return (XCHAR_OR_CHAR_INT (key_specifier) == event_to_character (event, 0, 0)); /* Otherwise, we cannot call event_to_character() because we may be dealing with non-ASCII keystrokes. In any case, if I ask - for 'control [' then I should get exactly that, and not - 'escape'. + for `control [' then I should get exactly that, and not + `escape'. - However, we have to behave differently on TTY's, where 'control [' - is silently converted into 'escape' by the keyboard driver. + However, we have to behave differently on TTY's, where `control [' + is silently converted into `escape' by the keyboard driver. In this case, ASCII is the only thing we know about, so we have to compare the ASCII values. */ ＠＠ -2687,7 +2688,7 ＠＠ static Lisp_Object process_event_binding_result (Lisp_Object result) { if (EQ (result, Qundefined)) - /* The suppress-keymap function binds keys to 'undefined - special-case + /* The suppress-keymap function binds keys to `undefined' - special-case that here, so that being bound to that has the same error-behavior as not being defined at all. */ ＠＠ -3735,8 +3736,8 ＠＠ where_is_recursive_mapper (Lisp_Object m int size = lower_keys_count + 50; if (! c->keys_so_far_malloced) { - Lisp_Key_Data *new = xnew_array (Lisp_Key_Data, size); - memcpy ((void *)new, (const void *)c->keys_so_far, + Lisp_Key_Data *new_ = xnew_array (Lisp_Key_Data, size); + memcpy ((void *)new_, (const void *)c->keys_so_far, c->keys_so_far_total_size * sizeof (Lisp_Key_Data)); } else Index: src/lisp-union.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp-union.h,v retrieving revision 1.19 diff -u -p -r1.19 lisp-union.h --- src/lisp-union.h 2003/08/19 02:07:16 1.19 +++ src/lisp-union.h 2005/10/25 11:09:57 ＠＠ -1,7 +1,7 ＠＠ /* Fundamental definitions for XEmacs Lisp interpreter -- union objects. Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994 Free Software Foundation, Inc. - Copyright (C) 2002 Ben Wing. + Copyright (C) 2002, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -73,7 +73,7 ＠＠ union Lisp_Object EMACS_UINT ui; signed EMACS_INT i; - /* This was formerly declared 'void *v' etc. but that causes + /* This was formerly declared `void *v' etc. but that causes GCC to accept any (yes, any) pointer as the argument of a function declared to accept a Lisp_Object. */ struct nosuchstruct *v; Index: src/macros.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/macros.c,v retrieving revision 1.14 diff -u -p -r1.14 macros.c --- src/macros.c 2005/01/29 09:16:00 1.14 +++ src/macros.c 2005/10/25 11:09:57 ＠＠ -166,10 +166,10 ＠＠ store_kbd_macro_event (Lisp_Object event int i; int old_size = XVECTOR_LENGTH (con->kbd_macro_builder); int new_size = old_size * 2; - Lisp_Object new = make_vector (new_size, Qnil); + Lisp_Object new_ = make_vector (new_size, Qnil); for (i = 0; i < old_size; i++) - XVECTOR_DATA (new) [i] = XVECTOR_DATA (con->kbd_macro_builder) [i]; - con->kbd_macro_builder = new; + XVECTOR_DATA (new_) [i] = XVECTOR_DATA (con->kbd_macro_builder) [i]; + con->kbd_macro_builder = new_; } XVECTOR_DATA (con->kbd_macro_builder) [con->kbd_macro_ptr++] = Fcopy_event (event, Qnil); Index: src/malloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/malloc.c,v retrieving revision 1.12 diff -u -p -r1.12 malloc.c --- src/malloc.c 2005/01/24 23:34:03 1.12 +++ src/malloc.c 2005/10/25 11:09:57 ＠＠ -656,13 +656,13 ＠＠ realloc (mem, n) if (n < tocopy) tocopy = n; { - char *new; + char *new_; - if ((new = malloc (n)) == 0) + if ((new_ = malloc (n)) == 0) return 0; - memcpy (new, mem, tocopy); + memcpy (new_, mem, tocopy); free (mem); - return new; + return new_; } } Index: src/marker.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/marker.c,v retrieving revision 1.17 diff -u -p -r1.17 marker.c --- src/marker.c 2005/04/08 23:11:29 1.17 +++ src/marker.c 2005/10/25 11:09:57 ＠＠ -397,20 +397,20 ＠＠ set_marker_position (Lisp_Object marker, static Lisp_Object copy_marker_1 (Lisp_Object marker, Lisp_Object type, int noseeum) { - REGISTER Lisp_Object new; + REGISTER Lisp_Object new_; while (1) { if (INTP (marker) || MARKERP (marker)) { if (noseeum) - new = noseeum_make_marker (); + new_ = noseeum_make_marker (); else - new = Fmake_marker (); - Fset_marker (new, marker, + new_ = Fmake_marker (); + Fset_marker (new_, marker, (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil)); - XMARKER (new)->insertion_type = !NILP (type); - return new; + XMARKER (new_)->insertion_type = !NILP (type); + return new_; } else marker = wrong_type_argument (Qinteger_or_marker_p, marker); Index: src/menubar-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/menubar-x.c,v retrieving revision 1.45 diff -u -p -r1.45 menubar-x.c --- src/menubar-x.c 2005/01/24 23:34:04 1.45 +++ src/menubar-x.c 2005/10/25 11:09:58 ＠＠ -893,30 +893,30 ＠＠ static void menu_move_down (void) { widget_value *current = lw_get_entries (False); - widget_value *new = current; + widget_value *new_ = current; - while (new->next) + while (new_->next) { - new = new->next; - if (new->name /*&& new->enabled*/) break; + new_ = new_->next; + if (new_->name /*&& new_->enabled*/) break; } - if (new==current||!(new->name/*||new->enabled*/)) + if (new_==current||!(new_->name/*||new_->enabled*/)) { - new = lw_get_entries (True); - while (new!=current) + new_ = lw_get_entries (True); + while (new_!=current) { - if (new->name /*&& new->enabled*/) break; - new = new->next; + if (new_->name /*&& new_->enabled*/) break; + new_ = new_->next; } - if (new==current&&!(new->name /*|| new->enabled*/)) + if (new_==current&&!(new_->name /*|| new_->enabled*/)) { lw_pop_menu (); return; } } - lw_set_item (new); + lw_set_item (new_); } static void Index: src/menubar.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/menubar.c,v retrieving revision 1.29 diff -u -p -r1.29 menubar.c --- src/menubar.c 2005/02/03 05:03:45 1.29 +++ src/menubar.c 2005/10/25 11:09:58 ＠＠ -1,7 +1,7 ＠＠ /* Implements an elisp-programmable menubar. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Tinker Systems and INS Engineering Corp. - Copyright (C) 2001, 2002, 2003 Ben Wing. + Copyright (C) 2001, 2002, 2003, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -712,7 +712,7 ＠＠ See also menu-accelerator-enabled and me DEFVAR_LISP ("menu-accelerator-enabled", &Vmenu_accelerator_enabled /* Whether menu accelerator keys can cause the menubar to become active. -If 'menu-force or 'menu-fallback, then menu accelerator keys can +If `menu-force' or `menu-fallback', then menu accelerator keys can be used to activate the top level menu. Once the menubar becomes active, the accelerator keys can be used regardless of the value of this variable. Index: src/mule-charset.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-charset.c,v retrieving revision 1.45 diff -u -p -r1.45 mule-charset.c --- src/mule-charset.c 2005/10/25 08:32:48 1.45 +++ src/mule-charset.c 2005/10/25 11:09:58 ＠＠ -1,7 +1,7 ＠＠ /* Functions to handle multilingual characters. Copyright (C) 1992, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 2001, 2002, 2004 Ben Wing. + Copyright (C) 2001, 2002, 2004, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -416,21 +416,21 ＠＠ DOC-STRING is a string describing the ch PROPS is a property list, describing the specific nature of the character set. Recognized properties are: -'short-name Short version of the charset name (ex: Latin-1) -'long-name Long version of the charset name (ex: ISO8859-1 (Latin-1)) -'registry A regular expression matching the font registry field for +`short-name' Short version of the charset name (ex: Latin-1) +`long-name' Long version of the charset name (ex: ISO8859-1 (Latin-1)) +`registry' A regular expression matching the font registry field for this character set. -'dimension Number of octets used to index a character in this charset. +`dimension' Number of octets used to index a character in this charset. Either 1 or 2. Defaults to 1. -'columns Number of columns used to display a character in this charset. +`columns' Number of columns used to display a character in this charset. Only used in TTY mode. (Under X, the actual width of a character can be derived from the font used to display the characters.) If unspecified, defaults to the dimension (this is almost always the correct value). -'chars Number of characters in each dimension (94 or 96). +`chars' Number of characters in each dimension (94 or 96). Defaults to 94. Note that if the dimension is 2, the character set thus described is 94x94 or 96x96. -'final Final byte of ISO 2022 escape sequence. Must be +`final' Final byte of ISO 2022 escape sequence. Must be supplied. Each combination of (DIMENSION, CHARS) defines a separate namespace for final bytes. Note that ISO 2022 restricts the final byte to the range ＠＠ -438,22 +438,22 ＠＠ character set. Recognized properties ar dimension == 2. Note also that final bytes in the range 0x30 - 0x3F are reserved for user-defined (not official) character sets. -'graphic 0 (use left half of font on output) or 1 (use right half +`graphic' 0 (use left half of font on output) or 1 (use right half of font on output). Defaults to 0. For example, for a font whose registry is ISO8859-1, the left half (octets 0x20 - 0x7F) is the `ascii' character set, while the right half (octets 0xA0 - 0xFF) is the `latin-1' - character set. With 'graphic set to 0, the octets + character set. With `graphic' set to 0, the octets will have their high bit cleared; with it set to 1, the octets will have their high bit set. -'direction 'l2r (left-to-right) or 'r2l (right-to-left). - Defaults to 'l2r. -'ccl-program A compiled CCL program used to convert a character in +`direction' `l2r' (left-to-right) or `r2l' (right-to-left). + Defaults to `l2r'. +`ccl-program' A compiled CCL program used to convert a character in this charset into an index into the font. This is in - addition to the 'graphic property. The CCL program + addition to the `graphic' property. The CCL program is passed the octets of the character, with the high bit cleared and set depending upon whether the value - of the 'graphic property is 0 or 1. + of the `graphic' property is 0 or 1. */ (name, doc_string, props)) { ＠＠ -503,7 +503,7 ＠＠ character set. Recognized properties ar CHECK_INT (value); dimension = XINT (value); if (dimension < 1 || dimension > 2) - invalid_constant ("Invalid value for 'dimension", value); + invalid_constant ("Invalid value for `dimension'", value); } else if (EQ (keyword, Qchars)) ＠＠ -511,7 +511,7 ＠＠ character set. Recognized properties ar CHECK_INT (value); chars = XINT (value); if (chars != 94 && chars != 96) - invalid_constant ("Invalid value for 'chars", value); + invalid_constant ("Invalid value for `chars'", value); } else if (EQ (keyword, Qcolumns)) ＠＠ -519,7 +519,7 ＠＠ character set. Recognized properties ar CHECK_INT (value); columns = XINT (value); if (columns != 1 && columns != 2) - invalid_constant ("Invalid value for 'columns", value); + invalid_constant ("Invalid value for `columns'", value); } else if (EQ (keyword, Qgraphic)) ＠＠ -527,7 +527,7 ＠＠ character set. Recognized properties ar CHECK_INT (value); graphic = XINT (value); if (graphic < 0 || graphic > 1) - invalid_constant ("Invalid value for 'graphic", value); + invalid_constant ("Invalid value for `graphic'", value); } else if (EQ (keyword, Qregistry)) ＠＠ -543,7 +543,7 ＠＠ character set. Recognized properties ar else if (EQ (value, Qr2l)) direction = CHARSET_RIGHT_TO_LEFT; else - invalid_constant ("Invalid value for 'direction", value); + invalid_constant ("Invalid value for `direction'", value); } else if (EQ (keyword, Qfinal)) ＠＠ -551,7 +551,7 ＠＠ character set. Recognized properties ar CHECK_CHAR_COERCE_INT (value); final = XCHAR (value); if (final < '0' || final > '~') - invalid_constant ("Invalid value for 'final", value); + invalid_constant ("Invalid value for `final'", value); } else if (EQ (keyword, Qccl_program)) ＠＠ -559,7 +559,7 ＠＠ character set. Recognized properties ar struct ccl_program test_ccl; if (setup_ccl_program (&test_ccl, value) < 0) - invalid_argument ("Invalid value for 'ccl-program", value); + invalid_argument ("Invalid value for `ccl-program'", value); ccl_program = value; } else ＠＠ -568,7 +568,7 ＠＠ character set. Recognized properties ar } if (!final) - invalid_argument ("'final must be specified", Qunbound); + invalid_argument ("`final' must be specified", Qunbound); if (dimension == 2 && final > 0x5F) invalid_constant ("Final must be in the range 0x30 - 0x5F for dimension == 2", ＠＠ -787,7 +787,7 ＠＠ Return dimension of CHARSET. DEFUN ("charset-property", Fcharset_property, 2, 2, 0, /* Return property PROP of CHARSET, a charset object or symbol naming a charset. Recognized properties are those listed in `make-charset', as well as -'name and 'doc-string. +`name' and `doc-string'. */ (charset, prop)) { ＠＠ -832,7 +832,7 ＠＠ Return charset identification number of allow to be set. */ DEFUN ("set-charset-ccl-program", Fset_charset_ccl_program, 2, 2, 0, /* -Set the 'ccl-program property of CHARSET to CCL-PROGRAM. +Set the `ccl-program' property of CHARSET to CCL-PROGRAM. */ (charset, ccl_program)) { ＠＠ -848,7 +848,7 ＠＠ Set the 'ccl-program property of CHARSET /* Japanese folks may want to (set-charset-registry 'ascii "jisx0201") */ DEFUN ("set-charset-registry", Fset_charset_registry, 2, 2, 0, /* -Set the 'registry property of CHARSET to REGISTRY. +Set the `registry' property of CHARSET to REGISTRY. */ (charset, registry)) { Index: src/number.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/number.c,v retrieving revision 1.15 diff -u -p -r1.15 number.c --- src/number.c 2005/02/18 21:56:11 1.15 +++ src/number.c 2005/10/25 11:09:58 ＠＠ -675,8 +675,8 ＠＠ DEFUN ("coerce-number", Fcoerce_number, Convert NUMBER to the indicated type, possibly losing information. Do not call this function. Use `coerce' instead. -TYPE is one of the symbols 'fixnum, 'integer, 'ratio, 'float, or 'bigfloat. -Not all of these types may be supported. +TYPE is one of the symbols `fixnum', `integer', `ratio', `float', or +`bigfloat'. Not all of these types may be supported. PRECISION is the number of bits of precision to use when converting to bigfloat; it is ignored otherwise. If nil, the default precision is used. Index: src/process.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process.c,v retrieving revision 1.68 diff -u -p -r1.68 process.c --- src/process.c 2005/10/24 10:07:39 1.68 +++ src/process.c 2005/10/25 11:09:59 ＠＠ -2,7 +2,7 ＠＠ Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1995, 1996, 2001, 2002, 2004 Ben Wing. + Copyright (C) 1995, 1996, 2001, 2002, 2004, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -842,9 +842,9 ＠＠ Third arg HOST (a string) is the name o or its IP address. Fourth arg SERVICE is the name of the service desired (a string), or an integer specifying a port number to connect to. -Optional fifth arg PROTOCOL is a network protocol. Currently only 'tcp - (Transmission Control Protocol) and 'udp (User Datagram Protocol) are - supported. When omitted, 'tcp is assumed. +Optional fifth arg PROTOCOL is a network protocol. Currently only `tcp' + (Transmission Control Protocol) and `udp' (User Datagram Protocol) are + supported. When omitted, `tcp' is assumed. Output via `process-send-string' and input via buffer or filter (see `set-process-filter') are stream-oriented. That means UDP datagrams are Index: src/profile.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/profile.h,v retrieving revision 1.2 diff -u -p -r1.2 profile.h --- src/profile.h 2005/01/26 10:09:20 1.2 +++ src/profile.h 2005/10/25 11:09:59 ＠＠ -1,5 +1,5 ＠＠ /* Profiling. - Copyright (C) 2003 Ben Wing. + Copyright (C) 2003, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -71,6 +71,11 ＠＠ while (0) function. (To do this, we always need some sort of collusion between profile and eval; this is one way.) */ +/* Or, we could call xzero() to zero the whole thing, and avoid four + of the statements below; or we could create a global backtrace object, + uninitialized (i.e. it will be initialized to all 0), and do structure + copy to initialize. It's not clear it will make much difference here, + but someone who really cared about counting cycles could implement it. */ #define PROFILE_RECORD_ENTERING_SECTION(var) \ do \ { \ Index: src/ralloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ralloc.c,v retrieving revision 1.20 diff -u -p -r1.20 ralloc.c --- src/ralloc.c 2005/06/01 10:51:36 1.20 +++ src/ralloc.c 2005/10/25 11:10:00 ＠＠ -274,22 +274,22 ＠＠ obtain (POINTER address, size_t size) get more space. */ if (heap == NIL_HEAP) { - POINTER new = (*real_morecore)(0); + POINTER new_ = (*real_morecore)(0); size_t get; already_available = (char *)last_heap->end - (char *)address; - if (new != last_heap->end) + if (new_ != last_heap->end) { /* Someone else called sbrk. Make a new heap. */ - heap_ptr new_heap = (heap_ptr) MEM_ROUNDUP (new); + heap_ptr new_heap = (heap_ptr) MEM_ROUNDUP (new_); POINTER bloc_start = (POINTER) MEM_ROUNDUP ((POINTER)(new_heap + 1)); - if ((*real_morecore) (bloc_start - new) != new) + if ((*real_morecore) (bloc_start - new_) != new_) return 0; - new_heap->start = new; + new_heap->start = new_; new_heap->end = bloc_start; new_heap->bloc_start = bloc_start; new_heap->free = bloc_start; Index: src/redisplay.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.c,v retrieving revision 1.96 diff -u -p -r1.96 redisplay.c --- src/redisplay.c 2005/02/03 16:30:38 1.96 +++ src/redisplay.c 2005/10/25 11:10:02 ＠＠ -1,7 +1,7 ＠＠ /* Display generation from window structure and buffer text. Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois. Copyright (C) 1995 Free Software Foundation, Inc. - Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing. + Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2005 Ben Wing. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1996 Chuck Thompson. ＠＠ -472,7 +472,7 ＠＠ int no_redraw_on_reenter; Lisp_Object Vwindow_system; /* nil or a symbol naming the window system under which emacs is running - ('x is the only current possibility) */ + (`x' is the only current possibility) */ Lisp_Object Vinitial_window_system; Lisp_Object Vglobal_mode_string; ＠＠ -715,7 +715,7 ＠＠ get_display_block_from_line (struct disp { struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt); - /* 'add' the block to the list */ + /* "add" the block to the list */ Dynarr_increment (dl->display_blocks); /* initialize and return */ ＠＠ -1784,7 +1784,7 ＠＠ add_propagation_runes (prop_block_dynarr } } -/* Add 'text layout glyphs at position POS_TYPE that are contained to +/* Add `text' layout glyphs at position POS_TYPE that are contained to the display block, but add all other types to the appropriate list of the display line. They will be added later by different routines. */ ＠＠ -6864,7 +6864,7 ＠＠ redisplay_frame (struct frame *f, int pr /* The menubar, toolbar, and icon updates should be done before enter_redisplay_critical_section is called and we are officially - 'in_display'. They is because they tend to eval Lisp code, which + `in_display'. They is because they tend to eval Lisp code, which needs to be carefully wrapped within the critical section (and hence is difficult to debug). */ ＠＠ -9909,8 +9909,8 ＠＠ If this is zero, point is always centere Default behavior is to flash the whole screen. On some platforms, special effects are available using the following values: -'display Flash the whole screen (ie, the default behavior). -'top-bottom Flash only the top and bottom lines of the selected frame. +`display' Flash the whole screen (ie, the default behavior). +`top-bottom' Flash only the top and bottom lines of the selected frame. When effects are unavailable on a platform, the visual bell is the default, whole screen. (Currently only X supports any special effects.) ＠＠ -10043,7 +10043,7 ＠＠ This is a specifier; use `set-specifier' DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /* *Non-nil means use the left outside margin as extra whitespace when -displaying 'whitespace or 'inside-margin glyphs. +displaying `whitespace' or `inside-margin' glyphs. This is a specifier; use `set-specifier' to change it. */ ); Vuse_left_overflow = Fmake_specifier (Qboolean); ＠＠ -10055,7 +10055,7 ＠＠ This is a specifier; use `set-specifier' DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /* *Non-nil means use the right outside margin as extra whitespace when -displaying 'whitespace or 'inside-margin glyphs. +displaying `whitespace' or `inside-margin' glyphs. This is a specifier; use `set-specifier' to change it. */ ); Vuse_right_overflow = Fmake_specifier (Qboolean); Index: src/select-common.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/select-common.h,v retrieving revision 1.5 diff -u -p -r1.5 select-common.h --- src/select-common.h 2004/11/04 23:06:52 1.5 +++ src/select-common.h 2005/10/25 11:10:02 ＠＠ -59,7 +59,7 ＠＠ Boston, MA 02111-1307, USA. */ representation are as above. NOTE: Under Mule, when someone shoves us a string without a type, we - set the type to 'COMPOUND_TEXT and automatically convert to Compound + set the type to `COMPOUND_TEXT' and automatically convert to Compound Text. If the string has a type, we assume that the user wants the data sent as-is so we just do "binary" conversion. */ Index: src/select.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/select.c,v retrieving revision 1.8 diff -u -p -r1.8 select.c --- src/select.c 2005/05/05 17:10:54 1.8 +++ src/select.c 2005/10/25 11:10:02 ＠＠ -107,7 +107,7 ＠＠ get_local_selection (Lisp_Object selecti return Qnil; } -/* #### Should perhaps handle 'MULTIPLE. The code below is now completely +/* #### Should perhaps handle `MULTIPLE'. The code below is now completely broken due to a re-organization of get_local_selection, but I've left it here should anyone show an interest - ajh */ #if 0 ＠＠ -861,33 +861,33 ＠＠ For X, the return value should be one of explicitly specifies the type that will be sent. -- a string (If the type is not specified, then if Mule support exists, the string will be converted to Compound Text and sent in - the 'COMPOUND_TEXT format; otherwise (no Mule support), - the string will be left as-is and sent in the 'STRING + the `COMPOUND_TEXT' format; otherwise (no Mule support), + the string will be left as-is and sent in the `STRING' format. If the type is specified, the string will be left as-is (or converted to binary format under Mule). In all cases, 8-bit data it sent.) -- a character (With Mule support, will be converted to Compound Text whether or not a type is specified. If a type is not - specified, a type of 'STRING or 'COMPOUND_TEXT will be + specified, a type of `STRING' or `COMPOUND_TEXT' will be sent, as for strings.) --- the symbol 'NULL (Indicates that there is no meaningful return value. - Empty 32-bit data with a type of 'NULL will be sent.) +-- the symbol `NULL' (Indicates that there is no meaningful return value. + Empty 32-bit data with a type of `NULL' will be sent.) -- a symbol (Will be converted into an atom. If the type is not specified, - a type of 'ATOM will be sent.) + a type of `ATOM' will be sent.) -- an integer (Will be converted into a 16-bit or 32-bit integer depending on the value. If the type is not specified, a type of - 'INTEGER will be sent.) + `INTEGER' will be sent.) -- a cons (HIGH . LOW) of integers (Will be converted into a 32-bit integer. If the type is not specified, a type of - 'INTEGER will be sent.) + `INTEGER' will be sent.) -- a vector of symbols (Will be converted into a list of atoms. If the type - is not specified, a type of 'ATOM will be sent.) + is not specified, a type of `ATOM' will be sent.) -- a vector of integers (Will be converted into a list of 16-bit integers. - If the type is not specified, a type of 'INTEGER + If the type is not specified, a type of `INTEGER' will be sent.) -- a vector of integers and/or conses (HIGH . LOW) of integers (Will be converted into a list of 16-bit integers. - If the type is not specified, a type of 'INTEGER + If the type is not specified, a type of `INTEGER' will be sent.) */ ); Vselection_converter_out_alist = Qnil; Index: src/syntax.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syntax.c,v retrieving revision 1.23 diff -u -p -r1.23 syntax.c --- src/syntax.c 2005/01/26 05:11:12 1.23 +++ src/syntax.c 2005/10/25 11:10:03 ＠＠ -423,7 +423,7 ＠＠ signal_syntax_table_extent_adjust (struc `syntax_cache.*_change' are the next and previous positions at which syntax_code and c_s_t will need to be recalculated. - #### Currently this code uses 'get-char-property', which will + #### Currently this code uses `get-char-property', which will return the "last smallest" extent at a given position. In cases where overlapping extents are defined, this code will simply use whatever is returned by get-char-property. ＠＠ -1828,7 +1828,7 ＠＠ scan_sexps_forward (struct buffer *buf, start_quoted = !NILP (tem); /* if the eighth element of the list is nil, we are in comment style - a; if it is t, we are in comment style b; if it is 'syntax-table, + a; if it is t, we are in comment style b; if it is `syntax-table', we are in a generic comment */ oldstate = Fcdr (oldstate); oldstate = Fcdr (oldstate); Index: src/sysfile.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysfile.h,v retrieving revision 1.20 diff -u -p -r1.20 sysfile.h --- src/sysfile.h 2005/01/28 02:36:27 1.20 +++ src/sysfile.h 2005/10/25 11:10:03 ＠＠ -391,10 +391,10 ＠＠ Ibyte *qxe_realpath (const Ibyte *path, int qxe_chmod (const Ibyte *path, mode_t mode); #if defined (HAVE_LINK) -int qxe_link (const Ibyte *existing, const Ibyte *new); +int qxe_link (const Ibyte *existing, const Ibyte *new_); #endif /* defined (HAVE_LINK) */ -int qxe_rename (const Ibyte *old, const Ibyte *new); +int qxe_rename (const Ibyte *old, const Ibyte *new_); #if defined (HAVE_SYMLINK) int qxe_symlink (const Ibyte *name1, const Ibyte *name2); Index: src/sysproc.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysproc.h,v retrieving revision 1.17 diff -u -p -r1.17 sysproc.h --- src/sysproc.h 2005/02/04 03:01:21 1.17 +++ src/sysproc.h 2005/10/25 11:10:03 ＠＠ -102,7 +102,7 ＠＠ Boston, MA 02111-1307, USA. */ #define EREMOTE WSAEREMOTE #endif /* WIN32_NATIVE */ -/* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */ +/* On some systems, e.g. DGUX, inet_addr returns a `struct in_addr'. */ #ifdef HAVE_BROKEN_INET_ADDR # define IN_ADDR struct in_addr # define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1) Index: src/systime.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/systime.h,v retrieving revision 1.18 diff -u -p -r1.18 systime.h --- src/systime.h 2003/02/20 08:19:43 1.18 +++ src/systime.h 2005/10/25 11:10:03 ＠＠ -99,7 +99,7 ＠＠ extern char *tzname[]; /* RS6000 and oth #endif /* EMACS_TIME is the type to use to represent temporal intervals. - At one point this was 'struct timeval' on some systems, int on others. + At one point this was `struct timeval' on some systems, int on others. But this is stupid. Other things than select() code like to manipulate time values, and so microsecond precision should be maintained. Separate typedefs and conversion functions are provided Index: src/syswindows.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syswindows.h,v retrieving revision 1.26 diff -u -p -r1.26 syswindows.h --- src/syswindows.h 2005/01/28 02:36:27 1.26 +++ src/syswindows.h 2005/10/25 11:10:04 ＠＠ -1155,7 +1155,7 ＠＠ DECLARE_INLINE_HEADER (int strcasecmp (c /* in nt.c */ int mswindows_access (const Ibyte *path, int mode); -int mswindows_link (const Ibyte *old, const Ibyte *new); +int mswindows_link (const Ibyte *old, const Ibyte *new_); int mswindows_rename (const Ibyte *oldname, const Ibyte *newname); int mswindows_unlink (const Ibyte *path); int mswindows_stat (const Ibyte *path, struct stat *buf); Index: src/toolbar.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.c,v retrieving revision 1.36 diff -u -p -r1.36 toolbar.c --- src/toolbar.c 2005/10/24 10:07:41 1.36 +++ src/toolbar.c 2005/10/25 11:10:04 ＠＠ -244,34 +244,34 ＠＠ decode_toolbar_position (Lisp_Object pos DEFUN ("set-default-toolbar-position", Fset_default_toolbar_position, 1, 1, 0, /* Set the position that the `default-toolbar' will be displayed at. -Valid positions are 'top, 'bottom, 'left and 'right. +Valid positions are `top', `bottom', `left' and `right'. See `default-toolbar-position'. */ (position)) { enum toolbar_pos cur = decode_toolbar_position (Vdefault_toolbar_position); - enum toolbar_pos new = decode_toolbar_position (position); + enum toolbar_pos new_ = decode_toolbar_position (position); - if (cur != new) + if (cur != new_) { /* The following calls will automatically cause the dirty flags to be set; we delay frame size changes to avoid lots of frame flickering. */ int depth = begin_hold_frame_size_changes (); set_specifier_fallback (Vtoolbar[cur], list1 (Fcons (Qnil, Qnil))); - set_specifier_fallback (Vtoolbar[new], Vdefault_toolbar); + set_specifier_fallback (Vtoolbar[new_], Vdefault_toolbar); set_specifier_fallback (Vtoolbar_size[cur], list1 (Fcons (Qnil, Qzero))); - set_specifier_fallback (Vtoolbar_size[new], - new == TOP_TOOLBAR || new == BOTTOM_TOOLBAR + set_specifier_fallback (Vtoolbar_size[new_], + new_ == TOP_TOOLBAR || new_ == BOTTOM_TOOLBAR ? Vdefault_toolbar_height : Vdefault_toolbar_width); set_specifier_fallback (Vtoolbar_border_width[cur], list1 (Fcons (Qnil, Qzero))); - set_specifier_fallback (Vtoolbar_border_width[new], + set_specifier_fallback (Vtoolbar_border_width[new_], Vdefault_toolbar_border_width); set_specifier_fallback (Vtoolbar_visible_p[cur], list1 (Fcons (Qnil, Qt))); - set_specifier_fallback (Vtoolbar_visible_p[new], + set_specifier_fallback (Vtoolbar_visible_p[new_], Vdefault_toolbar_visible_p); Vdefault_toolbar_position = position; unbind_to (depth); ＠＠ -1047,7 +1047,7 ＠＠ check_toolbar_button_keywords (Lisp_Obje DEFUN ("check-toolbar-button-syntax", Fcheck_toolbar_button_syntax, 1, 2, 0, /* Verify the syntax of entry BUTTON in a toolbar description list. If you want to verify the syntax of a toolbar description list as a -whole, use `check-valid-instantiator' with a specifier type of 'toolbar. +whole, use `check-valid-instantiator' with a specifier type of `toolbar'. */ (button, noerror)) { ＠＠ -1394,7 +1394,7 ＠＠ Use `set-specifier' to change this. The position of this toolbar is specified in the function `default-toolbar-position'. If the corresponding position-specific -toolbar (e.g. `top-toolbar' if `default-toolbar-position' is 'top) +toolbar (e.g. `top-toolbar' if `default-toolbar-position' is `top') does not specify a toolbar in a particular domain (usually a window), then the value of `default-toolbar' in that domain, if any, will be used instead. ＠＠ -1486,7 +1486,7 ＠＠ For the first vector format: For the other vector formats (specifying blank areas of the toolbar): --- 2D-OR-3D should be one of the symbols '2d or '3d, indicating +-- 2D-OR-3D should be one of the symbols `2d' or `3d', indicating whether the area is displayed with shadows (giving it a raised, 3-d appearance) or without shadows (giving it a flat appearance). ＠＠ -1583,14 +1583,14 ＠＠ This is a specifier; use `set-specifier' The position of the default toolbar is specified by the function `set-default-toolbar-position'. If the corresponding position-specific toolbar thickness specifier (e.g. `top-toolbar-height' if -`default-toolbar-position' is 'top) does not specify a thickness in a +`default-toolbar-position' is `top') does not specify a thickness in a particular domain (a window or a frame), then the value of `default-toolbar-height' or `default-toolbar-width' (depending on the toolbar orientation) in that domain, if any, will be used instead. Note that `default-toolbar-height' is only used when -`default-toolbar-position' is 'top or 'bottom, and `default-toolbar-width' -is only used when `default-toolbar-position' is 'left or 'right. +`default-toolbar-position' is `top' or `bottom', and `default-toolbar-width' +is only used when `default-toolbar-position' is `left' or `right'. Note that all of the position-specific toolbar thickness specifiers have a fallback value of zero when they do not correspond to the ＠＠ -1768,7 +1768,7 ＠＠ This is a specifier; use `set-specifier' The position of the default toolbar is specified by the function `set-default-toolbar-position'. If the corresponding position-specific toolbar border width specifier (e.g. `top-toolbar-border-width' if -`default-toolbar-position' is 'top) does not specify a border width in a +`default-toolbar-position' is `top') does not specify a border width in a particular domain (a window or a frame), then the value of `default-toolbar-border-width' in that domain, if any, will be used instead. ＠＠ -1882,7 +1882,7 ＠＠ This is a specifier; use `set-specifier' The position of the default toolbar is specified by the function `set-default-toolbar-position'. If the corresponding position-specific toolbar visibility specifier (e.g. `top-toolbar-visible-p' if -`default-toolbar-position' is 'top) does not specify a visible-p value +`default-toolbar-position' is `top') does not specify a visible-p value in a particular domain (a window or a frame), then the value of `default-toolbar-visible-p' in that domain, if any, will be used instead. Index: src/tooltalk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/tooltalk.c,v retrieving revision 1.35 diff -u -p -r1.35 tooltalk.c --- src/tooltalk.c 2005/10/24 10:07:41 1.35 +++ src/tooltalk.c 2005/10/25 11:10:05 ＠＠ -557,30 +557,30 ＠＠ Return the indicated Tooltalk message at identified by symbols with the same name (underscores and all) as the suffix of the Tooltalk tt_message_<attribute> function that extracts the value. String attribute values are copied, enumerated type values (except disposition) -are converted to symbols - e.g. TT_HANDLER is 'TT_HANDLER, uid and gid are +are converted to symbols - e.g. TT_HANDLER is `TT_HANDLER', uid and gid are represented by fixnums (small integers), opnum is converted to a string, and disposition is converted to a fixnum. We convert opnum (a C int) to a string, e.g. 123 => "123" because there's no guarantee that opnums will fit within the range of Lisp integers. -Use the 'plist attribute instead of the C API 'user attribute +Use the `plist' attribute instead of the C API `user' attribute for user defined message data. To retrieve the value of a message property specify the indicator for argn. For example to get the value of a property -called 'rflag, use +called `rflag', use (get-tooltalk-message-attribute message 'plist 'rflag) -To get the value of a message argument use one of the 'arg_val (strings), -'arg_ival (integers), or 'arg_bval (strings with embedded nulls), attributes. +To get the value of a message argument use one of the `arg_val' (strings), +`arg_ival' (integers), or `arg_bval' (strings with embedded nulls), attributes. For example to get the integer value of the third argument: (get-tooltalk-message-attribute message 'arg_ival 2) As you can see, argument numbers are zero based. The type of each argument -can be retrieved with the 'arg_type attribute; however, Tooltalk doesn't -define any semantics for the string value of 'arg_type. Conventionally +can be retrieved with the `arg_type' attribute; however, Tooltalk doesn't +define any semantics for the string value of `arg_type'. Conventionally "string" is used for strings and "int" for 32 bit integers. Note that Emacs Lisp stores the lengths of strings explicitly (unlike C) so treating the -value returned by 'arg_bval like a string is fine. +value returned by `arg_bval' like a string is fine. */ (message_, attribute, argn)) { ＠＠ -699,7 +699,7 ＠＠ Initialize one Tooltalk message attribut Attribute names and values are the same as for `get-tooltalk-message-attribute'. A property list is provided for user -data (instead of the 'user message attribute); see +data (instead of the `user' message attribute); see `get-tooltalk-message-attribute'. The value of callback should be the name of a function of one argument. ＠＠ -708,8 +708,8 ＠＠ message changes. This is usually used t changed to TT_HANDLED (or TT_FAILED), so that reply argument values can be used. -If one of the argument attributes is specified, 'arg_val, 'arg_ival, or -'arg_bval then argn must be the number of an already created argument. +If one of the argument attributes is specified, `arg_val', `arg_ival', or +`arg_bval' then argn must be the number of an already created argument. New arguments can be added to a message with add-tooltalk-message-arg. */ (value, message_, attribute, argn)) ＠＠ -823,7 +823,7 ＠＠ New arguments can be added to a message DEFUN ("return-tooltalk-message", Freturn_tooltalk_message, 1, 2, 0, /* Send a reply to this message. The second argument can be -'reply, 'reject or 'fail; the default is 'reply. Before sending +`reply', `reject' or `fail'; the default is `reply'. Before sending a reply all message arguments whose mode is TT_INOUT or TT_OUT should have been filled in - see set-tooltalk-message-attribute. */ ＠＠ -913,7 +913,7 ＠＠ Conventionally "string" is used for stri Arguments can initialized by providing a value or with `set-tooltalk-message-attribute'. The latter is necessary if you want to initialize the argument with a string that can contain -embedded nulls (use 'arg_bval). +embedded nulls (use `arg_bval'). */ (message_, mode, vtype, value)) { ＠＠ -1001,7 +1001,7 ＠＠ This effectively unregisters the pattern DEFUN ("add-tooltalk-pattern-attribute", Fadd_tooltalk_pattern_attribute, 3, 3, 0, /* Add one value to the indicated pattern attribute. -All Tooltalk pattern attributes are supported except 'user. The names +All Tooltalk pattern attributes are supported except `user'. The names of attributes are the same as the Tooltalk accessors used to set them less the "tooltalk_pattern_" prefix and the "_add" ... */ Index: src/tparam.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/tparam.c,v retrieving revision 1.7 diff -u -p -r1.7 tparam.c --- src/tparam.c 2003/09/30 15:27:00 1.7 +++ src/tparam.c 2005/10/25 11:10:05 ＠＠ -100,23 +100,23 ＠＠ tparam1 (const char *string, char *outst /* If the buffer might be too short, make it bigger. */ if (op + 5 >= outend) { - char *new; + char *new_; if (outlen == 0) { outlen = len + 40; - new = (char *) malloc (outlen); + new_ = (char *) malloc (outlen); outend += 40; - memcpy (new, outstring, op - outstring); + memcpy (new_, outstring, op - outstring); } else { outend += outlen; outlen *= 2; - new = (char *) realloc (outstring, outlen); + new_ = (char *) realloc (outstring, outlen); } - op += new - outstring; - outend += new - outstring; - outstring = new; + op += new_ - outstring; + outend += new_ - outstring; + outstring = new_; } c = *p++; if (!c) Index: src/unexaix.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexaix.c,v retrieving revision 1.12 diff -u -p -r1.12 unexaix.c --- src/unexaix.c 2004/09/20 19:20:04 1.12 +++ src/unexaix.c 2005/10/25 11:10:05 ＠＠ -57,7 +57,7 ＠＠ Boston, MA 02111-1307, USA. */ #define PERROR(arg) perror (arg); return -1 #else #include <config.h> -#define PERROR(file) report_error (file, new) +#define PERROR(file) report_error (file, new_) #endif #include <a.out.h> ＠＠ -126,9 +126,9 ＠＠ report_error (char *file, int fd) } #endif /* emacs */ -#define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1 -#define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1 -#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1 +#define ERROR0(msg) report_error_1 (new_, msg, 0, 0); return -1 +#define ERROR1(msg,x) report_error_1 (new_, msg, x, 0); return -1 +#define ERROR2(msg,x,y) report_error_1 (new_, msg, x, y); return -1 static void report_error_1 (int fd, char *msg, int a1, int a2) ＠＠ -158,30 +158,30 ＠＠ int unexec (char *new_name, char *a_name uintptr_t bss_start, uintptr_t entry_address) { - int new = -1, a_out = -1; + int new_ = -1, a_out = -1; if (a_name && (a_out = open (a_name, O_RDONLY)) < 0) { PERROR (a_name); } - if ((new = creat (new_name, 0666)) < 0) + if ((new_ = creat (new_name, 0666)) < 0) { PERROR (new_name); } - if (make_hdr (new, a_out, + if (make_hdr (new_, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0 - || copy_text_and_data (new) < 0 - || copy_sym (new, a_out, a_name, new_name) < 0 - || adjust_lnnoptrs (new, a_out, new_name) < 0 - || unrelocate_symbols (new, a_out, a_name, new_name) < 0) + || copy_text_and_data (new_) < 0 + || copy_sym (new_, a_out, a_name, new_name) < 0 + || adjust_lnnoptrs (new_, a_out, new_name) < 0 + || unrelocate_symbols (new_, a_out, a_name, new_name) < 0) { - close (new); + close (new_); return -1; } - close (new); + close (new_); if (a_out >= 0) close (a_out); mark_x (new_name); ＠＠ -195,7 +195,7 ＠＠ int unexec (char *new_name, char *a_name * Modify the text and data sizes. */ static int -make_hdr (int new, int a_out, +make_hdr (int new_, int a_out, unsigned data_start, unsigned bss_start, unsigned UNUSED (entry_address), char *a_name, char *new_name) ＠＠ -391,14 +391,14 ＠＠ make_hdr (int new, int a_out, data_scnptr = f_dhdr->s_scnptr; load_scnptr = f_lhdr ? f_lhdr->s_scnptr : 0; - if (write (new, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) + if (write (new_, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) { PERROR (new_name); } if (f_hdr.f_opthdr > 0) { - if (write (new, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) + if (write (new_, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) { PERROR (new_name); } ＠＠ -406,7 +406,7 ＠＠ make_hdr (int new, int a_out, for (scns = 0; scns < f_hdr.f_nscns; scns++) { struct scnhdr *s = &section[scns]; - if (write (new, s, sizeof (*s)) != sizeof (*s)) + if (write (new_, s, sizeof (*s)) != sizeof (*s)) { PERROR (new_name); } ＠＠ -421,27 +421,27 ＠＠ make_hdr (int new, int a_out, * Copy the text and data segments from memory to the new a.out */ static int -copy_text_and_data (int new) +copy_text_and_data (int new_) { char *end; char *ptr; - lseek (new, (long) text_scnptr, SEEK_SET); + lseek (new_, (long) text_scnptr, SEEK_SET); ptr = start_of_text () + text_scnptr; end = ptr + f_ohdr.tsize; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); - lseek (new, (long) data_scnptr, SEEK_SET); + lseek (new_, (long) data_scnptr, SEEK_SET); ptr = (char *) f_ohdr.data_start; end = ptr + f_ohdr.dsize; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); return 0; } #define UnexBlockSz (1<<12) /* read/write block size */ static void -write_segment (int new, char *ptr, char *end) +write_segment (int new_, char *ptr, char *end) { int i, nwrite, ret; char buf[80]; ＠＠ -453,7 +453,7 ＠＠ write_segment (int new, char *ptr, char nwrite = (((int) ptr + UnexBlockSz) & -UnexBlockSz) - (int) ptr; /* But not beyond specified end. */ if (nwrite > end - ptr) nwrite = end - ptr; - ret = write (new, ptr, nwrite); + ret = write (new_, ptr, nwrite); /* If write gets a page fault, it means we reached a gap between the old text segment and the old data segment. This gap has probably been remapped into part of the text segment. ＠＠ -461,13 +461,13 ＠＠ write_segment (int new, char *ptr, char if (ret == -1 && errno == EFAULT) { memset (zeros, 0, nwrite); - write (new, zeros, nwrite); + write (new_, zeros, nwrite); } else if (nwrite != ret) { sprintf (buf, "unexec write failure: addr 0x%lx, fileno %d, size 0x%x, wrote 0x%x, errno %d", - (unsigned long)ptr, new, nwrite, ret, errno); + (unsigned long)ptr, new_, nwrite, ret, errno); PERROR (buf); } i += nwrite; ＠＠ -481,7 +481,7 ＠＠ write_segment (int new, char *ptr, char * Copy the relocation information and symbol table from the a.out to the new */ static int -copy_sym (int new, int a_out, char *a_name, char *new_name) +copy_sym (int new_, int a_out, char *a_name, char *new_name) { char page[UnexBlockSz]; int n; ＠＠ -499,7 +499,7 ＠＠ copy_sym (int new, int a_out, char *a_na while ((n = read (a_out, page, sizeof (page))) > 0) { - if (write (new, page, n) != n) + if (write (new_, page, n) != n) { PERROR (new_name); } ＠＠ -521,7 +521,7 ＠＠ mark_x (char *name) { struct stat sbuf; int um; - int new = 0; /* for PERROR */ + int new_ = 0; /* for PERROR */ um = umask (777); umask (um); ＠＠ -539,50 +539,50 ＠＠ adjust_lnnoptrs (int UNUSED (writedesc), { int nsyms; int naux; - int new; + int new_; struct syment symentry; union auxent auxentry; if (!lnnoptr || !f_hdr.f_symptr) return 0; - if ((new = open (new_name, O_RDWR)) < 0) + if ((new_ = open (new_name, O_RDWR)) < 0) { PERROR (new_name); return -1; } - lseek (new, f_hdr.f_symptr, SEEK_SET); + lseek (new_, f_hdr.f_symptr, SEEK_SET); for (nsyms = 0; nsyms < f_hdr.f_nsyms; nsyms++) { - read (new, &symentry, SYMESZ); + read (new_, &symentry, SYMESZ); if (symentry.n_sclass == C_BINCL || symentry.n_sclass == C_EINCL) { symentry.n_value += bias; - lseek (new, -SYMESZ, SEEK_CUR); - write (new, &symentry, SYMESZ); + lseek (new_, -SYMESZ, SEEK_CUR); + write (new_, &symentry, SYMESZ); } for (naux = symentry.n_numaux; naux-- != 0; ) { - read (new, &auxentry, AUXESZ); + read (new_, &auxentry, AUXESZ); nsyms++; if (naux != 0 /* skip csect auxentry (last entry) */ && (symentry.n_sclass == C_EXT || symentry.n_sclass == C_HIDEXT)) { auxentry.x_sym.x_fcnary.x_fcn.x_lnnoptr += bias; - lseek (new, -AUXESZ, SEEK_CUR); - write (new, &auxentry, AUXESZ); + lseek (new_, -AUXESZ, SEEK_CUR); + write (new_, &auxentry, AUXESZ); } } } - close (new); + close (new_); return 0; } static int -unrelocate_symbols (int new, int a_out, char *a_name, char *new_name) +unrelocate_symbols (int new_, int a_out, char *a_name, char *new_name) { int i; LDHDR ldhdr; ＠＠ -626,11 +626,11 ＠＠ unrelocate_symbols (int new, int a_out, { ldrel.l_symndx = SYMNDX_DATA; - lseek (new, + lseek (new_, load_scnptr + LDHDRSZ + LDSYMSZ*ldhdr.l_nsyms + LDRELSZ*i, SEEK_SET); - if (write (new, &ldrel, LDRELSZ) != LDRELSZ) + if (write (new_, &ldrel, LDRELSZ) != LDRELSZ) { PERROR (new_name); } ＠＠ -665,10 +665,10 ＠＠ unrelocate_symbols (int new, int a_out, if (orig_int != * p) { - lseek (new, + lseek (new_, data_scnptr + (ldrel.l_vaddr - f_ohdr.data_start), SEEK_SET); - if (write (new, (void *) &orig_int, sizeof (orig_int)) + if (write (new_, (void *) &orig_int, sizeof (orig_int)) != sizeof (orig_int)) { PERROR (new_name); Index: src/unexalpha.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexalpha.c,v retrieving revision 1.10 diff -u -p -r1.10 unexalpha.c --- src/unexalpha.c 2004/09/20 19:20:05 1.10 +++ src/unexalpha.c 2005/10/25 11:10:05 ＠＠ -96,7 +96,7 ＠＠ unexec (char *new_name, char *a_name, unsigned long UNUSED (bss_start), unsigned long entry_address) { - int new, old; + int new_, old; char * oldptr; struct headers ohdr, nhdr; struct stat stat; ＠＠ -110,8 +110,8 ＠＠ unexec (char *new_name, char *a_name, if ((old = open (a_name, O_RDONLY)) < 0) fatal_unexec ("opening %s", a_name); - new = creat (new_name, 0666); - if (new < 0) fatal_unexec ("creating %s", new_name); + new_ = creat (new_name, 0666); + if (new_ < 0) fatal_unexec ("creating %s", new_name); if ((fstat (old, &stat) == -1)) fatal_unexec ("fstat %s", a_name); ＠＠ -290,9 +290,9 ＠＠ unexec (char *new_name, char *a_name, bss_section->s_scnptr = scnptr; } - WRITE (new, (char *)TEXT_START, nhdr.aout.tsize, + WRITE (new_, (char *)TEXT_START, nhdr.aout.tsize, "writing text section to %s", new_name); - WRITE (new, (char *)DATA_START, nhdr.aout.dsize, + WRITE (new_, (char *)DATA_START, nhdr.aout.dsize, "writing data section to %s", new_name); ＠＠ -318,12 +318,12 ＠＠ unexec (char *new_name, char *a_name, symhdr->cbRfdOffset += symrel; symhdr->cbExtOffset += symrel; - WRITE (new, buffer, cbHDRR, "writing symbol table header of %s", new_name); + WRITE (new_, buffer, cbHDRR, "writing symbol table header of %s", new_name); /* * Copy the symbol table and line numbers */ - WRITE (new, oldptr + ohdr.fhdr.f_symptr + cbHDRR, + WRITE (new_, oldptr + ohdr.fhdr.f_symptr + cbHDRR, stat.st_size - ohdr.fhdr.f_symptr - cbHDRR, "writing symbol table of %s", new_name); ＠＠ -331,7 +331,7 ＠＠ unexec (char *new_name, char *a_name, /* Not needed for now */ - update_dynamic_symbols (oldptr, new_name, new, newsyms, + update_dynamic_symbols (oldptr, new_name, new_, newsyms, ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->issExtMax, ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->cbExtOffset, ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->cbSsExtOffset); ＠＠ -340,12 +340,12 ＠＠ unexec (char *new_name, char *a_name, #undef symhdr - SEEK (new, 0, "seeking to start of header in %s", new_name); - WRITE (new, &nhdr, sizeof (nhdr), + SEEK (new_, 0, "seeking to start of header in %s", new_name); + WRITE (new_, &nhdr, sizeof (nhdr), "writing header of %s", new_name); close (old); - close (new); + close (new_); mark_x (new_name); return 0; } ＠＠ -367,7 +367,7 ＠＠ int update_dynamic_symbols ( char *old, /* Pointer to old executable */ char *new_name, /* Name of new executable */ - int new, /* File descriptor for new executable */ + int new_, /* File descriptor for new executable */ long newsyms, /* Offset of Symbol table in new executable */ int nsyms, /* Number of symbol table entries */ long symoff, /* Offset of External Symbols in old file */ ＠＠ -394,9 +394,9 ＠＠ update_dynamic_symbols ( found++; memcpy (&n_edata, x, cbEXTR); n_edata.asym.value = Brk; - SEEK (new, newsyms + cbHDRR + i, + SEEK (new_, newsyms + cbHDRR + i, "seeking to symbol _edata in %s", new_name); - WRITE (new, &n_edata, cbEXTR, + WRITE (new_, &n_edata, cbEXTR, "writing symbol table entry for _edata into %s", new_name); } else if (!strcmp(s,"_end")) ＠＠ -404,9 +404,9 ＠＠ update_dynamic_symbols ( found++; memcpy (&n_end, x, cbEXTR); n_end.asym.value = Brk; - SEEK (new, newsyms + cbHDRR + i, + SEEK (new_, newsyms + cbHDRR + i, "seeking to symbol _end in %s", new_name); - WRITE (new, &n_end, cbEXTR, + WRITE (new_, &n_end, cbEXTR, "writing symbol table entry for _end into %s", new_name); } } Index: src/unexconvex.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexconvex.c,v retrieving revision 1.5 diff -u -p -r1.5 unexconvex.c --- src/unexconvex.c 2004/09/20 19:20:05 1.5 +++ src/unexconvex.c 2005/10/25 11:10:06 ＠＠ -159,7 +159,7 ＠＠ pointer looks like an int) but not on al */ #include <config.h> -#define PERROR(file) report_error (file, new) +#define PERROR(file) report_error (file, new_) #include <a.out.h> /* Define getpagesize () if the system does not. ＠＠ -205,9 +205,9 ＠＠ report_error (file, fd) build_string (file)); } -#define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1 -#define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1 -#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1 +#define ERROR0(msg) report_error_1 (new_, msg, 0, 0); return -1 +#define ERROR1(msg,x) report_error_1 (new_, msg, x, 0); return -1 +#define ERROR2(msg,x,y) report_error_1 (new_, msg, x, y); return -1 static report_error_1 (fd, msg, a1, a2) ＠＠ -228,23 +228,23 ＠＠ unexec (new_name, a_name, data_start, bs char *new_name, *a_name; unsigned data_start, bss_start, entry_address; { - int new, a_out = -1; + int new_, a_out = -1; if (a_name && (a_out = open (a_name, 0)) < 0) { PERROR (a_name); } - if ((new = creat (new_name, 0666)) < 0) { + if ((new_ = creat (new_name, 0666)) < 0) { PERROR (new_name); } - if (make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0 - || copy_text_and_data (new) < 0 - || copy_sym (new, a_out, a_name, new_name) < 0 ) { - close (new); + if (make_hdr (new_, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0 + || copy_text_and_data (new_) < 0 + || copy_sym (new_, a_out, a_name, new_name) < 0 ) { + close (new_); return -1; } - close (new); + close (new_); if (a_out >= 0) close (a_out); mark_x (new_name); ＠＠ -266,8 +266,8 ＠＠ unsigned data_start, bss_start, entry_ad struct scnhdr *f_tbhdr; /* Thread Bss section header */ static int -make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) - int new, a_out; +make_hdr (new_, a_out, data_start, bss_start, entry_address, a_name, new_name) + int new_, a_out; unsigned data_start, bss_start; unsigned UNUSED (entry_address); char *a_name; ＠＠ -427,11 +427,11 ＠＠ make_hdr (new, a_out, data_start, bss_st f_hdr.h_strptr += bias; } - if (write (new, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) { + if (write (new_, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) { PERROR (new_name); } - if (write (new, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) { + if (write (new_, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) { PERROR (new_name); } ＠＠ -453,7 +453,7 ＠＠ make_hdr (new, a_out, data_start, bss_st for( scns = 0; scns < f_hdr.h_nscns; scns++ ) { - if( write( new, &stbl[scns], sizeof(*stbl)) != sizeof(*stbl)) { + if( write( new_, &stbl[scns], sizeof(*stbl)) != sizeof(*stbl)) { PERROR (new_name); } ＠＠ -469,19 +469,19 ＠＠ make_hdr (new, a_out, data_start, bss_st * Copy the text and data segments from memory to the new a.out */ static int -copy_text_and_data (new) -int new; +copy_text_and_data (new_) +int new_; { int scns; for( scns = 0; scns < f_hdr.h_nscns; scns++ ) - write_segment( new, &stbl[scns] ); + write_segment( new_, &stbl[scns] ); return 0; } -write_segment( new, sptr ) -int new; +write_segment( new_, sptr ) +int new_; struct scnhdr *sptr; { char *ptr, *end; ＠＠ -493,7 +493,7 ＠＠ struct scnhdr *sptr; if( sptr->s_scnptr == 0 ) return; /* Nothing to do */ - if( lseek( new, (long) sptr->s_scnptr, 0 ) == -1 ) + if( lseek( new_, (long) sptr->s_scnptr, 0 ) == -1 ) PERROR( "unexecing" ); memset (zeros, 0, sizeof (zeros)); ＠＠ -507,17 +507,17 ＠＠ struct scnhdr *sptr; nwrite = (((int) ptr + 128) & -128) - (int) ptr; /* But not beyond specified end. */ if (nwrite > end - ptr) nwrite = end - ptr; - ret = write (new, ptr, nwrite); + ret = write (new_, ptr, nwrite); /* If write gets a page fault, it means we reached a gap between the old text segment and the old data segment. This gap has probably been remapped into part of the text segment. So write zeros for it. */ if (ret == -1 && errno == EFAULT) - write (new, zeros, nwrite); + write (new_, zeros, nwrite); else if (nwrite != ret) { sprintf (buf, "unexec write failure: addr 0x%x, fileno %d, size 0x%x, wrote 0x%x, errno %d", - ptr, new, nwrite, ret, errno); + ptr, new_, nwrite, ret, errno); PERROR (buf); } ptr += nwrite; ＠＠ -530,8 +530,8 ＠＠ struct scnhdr *sptr; * Copy the relocation information and symbol table from the a.out to the new */ static int -copy_sym (new, a_out, a_name, new_name) - int new, a_out; +copy_sym (new_, a_out, a_name, new_name) + int new_, a_out; char *a_name, *new_name; { char page[1024]; ＠＠ -544,10 +544,10 ＠＠ copy_sym (new, a_out, a_name, new_name) return 0; lseek (a_out, SYMS_START, 0); /* Position a.out to symtab. */ - lseek( new, (long)f_ohdr.o_symptr, 0 ); + lseek( new_, (long)f_ohdr.o_symptr, 0 ); while ((n = read (a_out, page, sizeof (page))) > 0) { - if (write (new, page, n) != n) { + if (write (new_, page, n) != n) { PERROR (new_name); } } ＠＠ -568,7 +568,7 ＠＠ char *name; { struct stat sbuf; int um; - int new = 0; /* for PERROR */ + int new_ = 0; /* for PERROR */ um = umask (777); umask (um); Index: src/unexec.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexec.c,v retrieving revision 1.10 diff -u -p -r1.10 unexec.c --- src/unexec.c 2004/09/20 19:20:05 1.10 +++ src/unexec.c 2005/10/25 11:10:06 ＠＠ -169,7 +169,7 ＠＠ pointer looks like an int) but not on al #else #define IN_UNEXEC #include <config.h> -#define PERROR(file) report_error (file, new) +#define PERROR(file) report_error (file, new_) #endif #if __STDC__ || defined(STDC_HEADERS) ＠＠ -341,9 +341,9 ＠＠ report_error (const char *file, int fd) } #endif /* emacs */ -#define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1 -#define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1 -#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1 +#define ERROR0(msg) report_error_1 (new_, msg, 0, 0); return -1 +#define ERROR1(msg,x) report_error_1 (new_, msg, x, 0); return -1 +#define ERROR2(msg,x,y) report_error_1 (new_, msg, x, y); return -1 static void report_error_1 (fd, msg, a1, a2) ＠＠ -360,11 +360,11 ＠＠ report_error_1 (fd, msg, a1, a2) #endif } -static int make_hdr (int new, int a_out, unsigned data_start, +static int make_hdr (int new_, int a_out, unsigned data_start, unsigned bss_start, unsigned entry_address, char *a_name, char *new_name); -static int copy_text_and_data (int new, int a_out); -static int copy_sym (int new, int a_out, char *a_name, char *new_name); +static int copy_text_and_data (int new_, int a_out); +static int copy_sym (int new_, int a_out, char *a_name, char *new_name); static void mark_x (char *name); /* **************************************************************** ＠＠ -377,33 +377,33 ＠＠ unexec (new_name, a_name, data_start, bs char *new_name, *a_name; unsigned data_start, bss_start, entry_address; { - int new, a_out = -1; + int new_, a_out = -1; if (a_name && (a_out = open (a_name, O_RDONLY)) < 0) { PERROR (a_name); } - if ((new = creat (new_name, 0666)) < 0) + if ((new_ = creat (new_name, 0666)) < 0) { PERROR (new_name); } - if (make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0 - || copy_text_and_data (new, a_out) < 0 - || copy_sym (new, a_out, a_name, new_name) < 0 + if (make_hdr (new_, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0 + || copy_text_and_data (new_, a_out) < 0 + || copy_sym (new_, a_out, a_name, new_name) < 0 #ifdef COFF #ifndef COFF_BSD_SYMBOLS - || adjust_lnnoptrs (new, a_out, new_name) < 0 + || adjust_lnnoptrs (new_, a_out, new_name) < 0 #endif #endif ) { - close (new); + close (new_); /* unlink (new_name); / * Failed, unlink new a.out */ return -1; } - close (new); + close (new_); if (a_out >= 0) close (a_out); mark_x (new_name); ＠＠ -417,7 +417,7 ＠＠ unexec (new_name, a_name, data_start, bs * Modify the text and data sizes. */ static int -make_hdr (int new, int a_out, unsigned data_start, unsigned bss_start, +make_hdr (int new_, int a_out, unsigned data_start, unsigned bss_start, unsigned entry_address, char *a_name, char *new_name) { #ifdef COFF ＠＠ -618,29 +618,29 ＠＠ make_hdr (int new, int a_out, unsigned d ADJUST_EXEC_HEADER; #endif /* ADJUST_EXEC_HEADER */ - if (write (new, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) + if (write (new_, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) { PERROR (new_name); } - if (write (new, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) + if (write (new_, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) { PERROR (new_name); } #ifndef USG_SHARED_LIBRARIES - if (write (new, &f_thdr, sizeof (f_thdr)) != sizeof (f_thdr)) + if (write (new_, &f_thdr, sizeof (f_thdr)) != sizeof (f_thdr)) { PERROR (new_name); } - if (write (new, &f_dhdr, sizeof (f_dhdr)) != sizeof (f_dhdr)) + if (write (new_, &f_dhdr, sizeof (f_dhdr)) != sizeof (f_dhdr)) { PERROR (new_name); } - if (write (new, &f_bhdr, sizeof (f_bhdr)) != sizeof (f_bhdr)) + if (write (new_, &f_bhdr, sizeof (f_bhdr)) != sizeof (f_bhdr)) { PERROR (new_name); } ＠＠ -671,24 +671,24 ＠＠ make_hdr (int new, int a_out, unsigned d if (!strcmp (scntemp.s_name, f_thdr.s_name)) /* .text */ { - if (write (new, &f_thdr, sizeof (f_thdr)) != sizeof (f_thdr)) + if (write (new_, &f_thdr, sizeof (f_thdr)) != sizeof (f_thdr)) PERROR (new_name); } else if (!strcmp (scntemp.s_name, f_dhdr.s_name)) /* .data */ { - if (write (new, &f_dhdr, sizeof (f_dhdr)) != sizeof (f_dhdr)) + if (write (new_, &f_dhdr, sizeof (f_dhdr)) != sizeof (f_dhdr)) PERROR (new_name); } else if (!strcmp (scntemp.s_name, f_bhdr.s_name)) /* .bss */ { - if (write (new, &f_bhdr, sizeof (f_bhdr)) != sizeof (f_bhdr)) + if (write (new_, &f_bhdr, sizeof (f_bhdr)) != sizeof (f_bhdr)) PERROR (new_name); } else { if (scntemp.s_scnptr) scntemp.s_scnptr += bias; - if (write (new, &scntemp, sizeof (scntemp)) != sizeof (scntemp)) + if (write (new_, &scntemp, sizeof (scntemp)) != sizeof (scntemp)) PERROR (new_name); } } ＠＠ -780,13 +780,13 ＠＠ make_hdr (int new, int a_out, unsigned d coffheader.text_start = tp->s_vaddr; coffheader.data_start = dp->s_vaddr; } - if (write (new, &coffheader, sizeof (coffheader)) != sizeof (coffheader)) + if (write (new_, &coffheader, sizeof (coffheader)) != sizeof (coffheader)) { PERROR(new_name); } #endif /* COFF_ENCAPSULATE */ - if (write (new, (char *) &hdr, sizeof (hdr)) != sizeof (hdr)) + if (write (new_, (char *) &hdr, sizeof (hdr)) != sizeof (hdr)) { PERROR (new_name); } ＠＠ -813,7 +813,7 ＠＠ static void write_segment (int, char *, * Copy the text and data segments from memory to the new a.out */ static int -copy_text_and_data (int new, +copy_text_and_data (int new_, #if defined (COFF) && defined (USG_SHARED_LIBRARIES) int a_out #else ＠＠ -850,17 +850,17 ＠＠ copy_text_and_data (int new, if (!strcmp (scntemp.s_name, ".text")) { - lseek (new, (long) text_scnptr, 0); + lseek (new_, (long) text_scnptr, 0); ptr = (char *) f_ohdr.text_start; end = ptr + f_ohdr.tsize; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); } else if (!strcmp (scntemp.s_name, ".data")) { - lseek (new, (long) data_scnptr, 0); + lseek (new_, (long) data_scnptr, 0); ptr = (char *) f_ohdr.data_start; end = ptr + f_ohdr.dsize; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); } else if (!scntemp.s_scnptr) ; /* do nothing - no data for this section */ ＠＠ -874,7 +874,7 ＠＠ copy_text_and_data (int new, for (size = scntemp.s_size; size > 0; size -= sizeof (page)) { n = size > sizeof (page) ? sizeof (page) : size; - if (read (a_out, page, n) != n || write (new, page, n) != n) + if (read (a_out, page, n) != n || write (new_, page, n) != n) PERROR ("emacs"); } lseek (a_out, old_a_out_ptr, 0); ＠＠ -883,19 +883,19 ＠＠ copy_text_and_data (int new, #else /* COFF, but not USG_SHARED_LIBRARIES */ - lseek (new, (long) text_scnptr, 0); + lseek (new_, (long) text_scnptr, 0); ptr = (char *) f_ohdr.text_start; #ifdef HEADER_INCL_IN_TEXT /* For Gould UTX/32, text starts after headers */ ptr = (char *) (ptr + text_scnptr); #endif /* HEADER_INCL_IN_TEXT */ end = ptr + f_ohdr.tsize; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); - lseek (new, (long) data_scnptr, 0); + lseek (new_, (long) data_scnptr, 0); ptr = (char *) f_ohdr.data_start; end = ptr + f_ohdr.dsize; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); #endif /* USG_SHARED_LIBRARIES */ ＠＠ -910,9 +910,9 ＠＠ copy_text_and_data (int new, the extra A_TEXT_OFFSET bytes, only the actual bytes of code. */ #ifdef A_TEXT_SEEK - lseek (new, (long) A_TEXT_SEEK (hdr), 0); + lseek (new_, (long) A_TEXT_SEEK (hdr), 0); #else - lseek (new, (long) N_TXTOFF (hdr), 0); + lseek (new_, (long) N_TXTOFF (hdr), 0); #endif /* no A_TEXT_SEEK */ #ifdef RISCiX ＠＠ -980,26 +980,26 ＠＠ copy_text_and_data (int new, end = ptr + mcount_offset - EDATA_OFFSET; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); proforma[0] = bss_end; /* becomes _edata */ proforma[1] = bss_end; /* becomes _end */ proforma[2] = bss_end; /* becomes _minbrk */ proforma[3] = bss_end; /* becomes _curbrk */ - write (new, proforma, 16); + write (new_, proforma, 16); temp_ptr = ptr; ptr = end + 16; end = temp_ptr + hdr.a_text; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); } #else /* !RISCiX */ ptr = (char *) unexec_text_start; end = ptr + hdr.a_text; - write_segment (new, ptr, end); + write_segment (new_, ptr, end); #endif /* RISCiX */ ptr = (char *) unexec_data_start; ＠＠ -1007,8 +1007,8 ＠＠ copy_text_and_data (int new, /* This lseek is certainly incorrect when A_TEXT_OFFSET and I believe it is a no-op otherwise. Let's see if its absence ever fails. */ -/* lseek (new, (long) N_TXTOFF (hdr) + hdr.a_text, 0); */ - write_segment (new, ptr, end); +/* lseek (new_, (long) N_TXTOFF (hdr) + hdr.a_text, 0); */ + write_segment (new_, ptr, end); #endif /* not COFF */ ＠＠ -1016,8 +1016,8 ＠＠ copy_text_and_data (int new, } static void -write_segment (new, ptr, end) - int new; +write_segment (new_, ptr, end) + int new_; char *ptr, *end; { int i, nwrite, ret; ＠＠ -1038,7 +1038,7 ＠＠ write_segment (new, ptr, end) nwrite = (((int) ptr + writesize) & -writesize) - (int) ptr; /* But not beyond specified end. */ if (nwrite > end - ptr) nwrite = end - ptr; - ret = write (new, ptr, nwrite); + ret = write (new_, ptr, nwrite); /* If write gets a page fault, it means we reached a gap between the old text segment and the old data segment. This gap has probably been remapped into part of the text segment. ＠＠ -1054,7 +1054,7 ＠＠ write_segment (new, ptr, end) of the valid memory in the old data segment. */ if (nwrite > pagesize) nwrite = pagesize; - write (new, zeros, nwrite); + write (new_, zeros, nwrite); } #if 0 /* Now that we have can ask `write' to write more than a page, it is legit for write do less than the whole amount specified. */ ＠＠ -1062,7 +1062,7 ＠＠ write_segment (new, ptr, end) { sprintf (buf, "unexec write failure: addr 0x%lx, fileno %d, size 0x%x, wrote 0x%x, errno %d", - (unsigned long) ptr, new, nwrite, ret, errno); + (unsigned long) ptr, new_, nwrite, ret, errno); PERROR (buf); } #endif ＠＠ -1077,7 +1077,7 ＠＠ write_segment (new, ptr, end) * Copy the relocation information and symbol table from the a.out to the new */ static int -copy_sym (int new, int a_out, char *a_name, char *new_name) +copy_sym (int new_, int a_out, char *a_name, char *new_name) { char page[1024]; int n; ＠＠ -1099,7 +1099,7 ＠＠ copy_sym (int new, int a_out, char *a_na while ((n = read (a_out, page, sizeof (page))) > 0) { - if (write (new, page, n) != n) + if (write (new_, page, n) != n) { PERROR (new_name); } ＠＠ -1121,7 +1121,7 ＠＠ mark_x (char *name) { struct stat sbuf; int um; - int new = 0; /* for PERROR */ + int new_ = 0; /* for PERROR */ um = umask (777); umask (um); ＠＠ -1166,7 +1166,7 ＠＠ adjust_lnnoptrs (writedesc, readdesc, ne char *new_name; { int nsyms; - int new; + int new_; #if defined (amdahl_uts) || defined (pfa) SYMENT symentry; AUXENT auxentry; ＠＠ -1178,29 +1178,29 ＠＠ adjust_lnnoptrs (writedesc, readdesc, ne if (!lnnoptr || !f_hdr.f_symptr) return 0; - if ((new = open (new_name, O_RDWR)) < 0) + if ((new_ = open (new_name, O_RDWR)) < 0) { PERROR (new_name); return -1; } - lseek (new, f_hdr.f_symptr, 0); + lseek (new_, f_hdr.f_symptr, 0); for (nsyms = 0; nsyms < f_hdr.f_nsyms; nsyms++) { - read (new, &symentry, SYMESZ); + read (new_, &symentry, SYMESZ); if (symentry.n_numaux) { - read (new, &auxentry, AUXESZ); + read (new_, &auxentry, AUXESZ); nsyms++; if (ISFCN (symentry.n_type) || symentry.n_type == 0x2400) { auxentry.x_sym.x_fcnary.x_fcn.x_lnnoptr += bias; - lseek (new, -AUXESZ, 1); - write (new, &auxentry, AUXESZ); + lseek (new_, -AUXESZ, 1); + write (new_, &auxentry, AUXESZ); } } } - close (new); + close (new_); return 0; } Index: src/unexhp9k800.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexhp9k800.c,v retrieving revision 1.6 diff -u -p -r1.6 unexhp9k800.c --- src/unexhp9k800.c 2004/09/20 19:20:06 1.6 +++ src/unexhp9k800.c 2005/10/25 11:10:06 ＠＠ -90,8 +90,8 ＠＠ void write_header(int file, struct heade void read_header (int file, struct header *hdr, struct som_exec_auxhdr *auxhdr); void save_data_space (int file, struct header *hdr, struct som_exec_auxhdr *auxhdr, int size); -void copy_rest (int old, int new); -void copy_file (int old, int new, int size); +void copy_rest (int old, int new_); +void copy_file (int old, int new_, int size); void update_file_ptrs(int file, struct header *hdr, struct som_exec_auxhdr *auxhdr, unsigned int location, int offset); ＠＠ -105,7 +105,7 ＠＠ unexec (char *new_name, /* name of the uintptr_t UNUSED (dummy1), /* not used by emacs */ uintptr_t UNUSED (dummy2)) { - int old, new; + int old, new_; int old_size, new_size; struct header hdr; struct som_exec_auxhdr auxhdr; ＠＠ -122,8 +122,8 ＠＠ unexec (char *new_name, /* name of the old = open (old_name, O_RDONLY); if (old < 0) { perror(old_name); exit(1); } - new = open (new_name, O_CREAT|O_RDWR|O_TRUNC, 0777); - if (new < 0) + new_ = open (new_name, O_CREAT|O_RDWR|O_TRUNC, 0777); + if (new_ < 0) { perror(new_name); exit(1); } /* Read the old headers */ ＠＠ -141,24 +141,24 ＠＠ unexec (char *new_name, /* name of the /* Copy the old file to the new, up to the data space */ lseek(old, 0, 0); - copy_file(old, new, auxhdr.exec_dfile); + copy_file(old, new_, auxhdr.exec_dfile); /* Skip the old data segment and write a new one */ lseek(old, old_size, 1); - save_data_space(new, &hdr, &auxhdr, new_size); + save_data_space(new_, &hdr, &auxhdr, new_size); /* Copy the rest of the file */ - copy_rest(old, new); + copy_rest(old, new_); /* Update file pointers since we probably changed size of data area */ - update_file_ptrs(new, &hdr, &auxhdr, auxhdr.exec_dfile, new_size-old_size); + update_file_ptrs(new_, &hdr, &auxhdr, auxhdr.exec_dfile, new_size-old_size); /* Save the modified header */ - write_header(new, &hdr, &auxhdr); + write_header(new_, &hdr, &auxhdr); /* Close the binary file */ close (old); - close (new); + close (new_); return 0; } ＠＠ -284,7 +284,7 ＠＠ calculate_checksum(struct header *hdr) /* Copy size bytes from the old file to the new one. */ void -copy_file (int old, int new, int size) +copy_file (int old, int new_, int size) { int len; int buffer[8192]; /* word aligned will be faster */ ＠＠ -297,7 +297,7 ＠＠ copy_file (int old, int new, int size) perror ("Read failure on a.out file"); exit (1); } - if (write (new, buffer, len) != len) + if (write (new_, buffer, len) != len) { perror ("Write failure in a.out file"); exit (1); ＠＠ -307,14 +307,14 ＠＠ copy_file (int old, int new, int size) /* Copy the rest of the file, up to EOF. */ void -copy_rest (int old, int new) +copy_rest (int old, int new_) { int buffer[4096]; int len; /* Copy bytes until end of file or error */ while ( (len = read(old, buffer, sizeof(buffer))) > 0) - if (write(new, buffer, len) != len) break; + if (write(new_, buffer, len) != len) break; if (len != 0) { perror("Unable to copy the rest of the file"); exit(1); } Index: src/unexmips.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexmips.c,v retrieving revision 1.3 diff -u -p -r1.3 unexmips.c --- src/unexmips.c 2004/09/20 19:20:06 1.3 +++ src/unexmips.c 2005/10/25 11:10:06 ＠＠ -129,7 +129,7 ＠＠ unexec (new_name, a_name, data_start, bs unsigned UNUSED (bss_start); unsigned entry_address; { - int new, old; + int new_, old; int pagesize, brk; int newsyms, symrel; int nread; ＠＠ -142,8 +142,8 ＠＠ unexec (new_name, a_name, data_start, bs old = open (a_name, O_RDONLY, 0); if (old < 0) fatal_unexec ("opening %s", a_name); - new = creat (new_name, 0666); - if (new < 0) fatal_unexec ("creating %s", new_name); + new_ = creat (new_name, 0666); + if (new_ < 0) fatal_unexec ("creating %s", new_name); hdr = *((struct headers *)TEXT_START); #ifdef MIPS2 ＠＠ -275,9 +275,9 ＠＠ unexec (new_name, a_name, data_start, bs bss_section->s_scnptr = scnptr; } - WRITE (new, (void *) TEXT_START, hdr.aout.tsize, + WRITE (new_, (void *) TEXT_START, hdr.aout.tsize, "writing text section to %s", new_name); - WRITE (new, (void *) DATA_START, hdr.aout.dsize, + WRITE (new_, (void *) DATA_START, hdr.aout.dsize, "writing data section to %s", new_name); SEEK (old, hdr.fhdr.f_symptr, "seeking to start of symbols in %s", a_name); ＠＠ -307,19 +307,19 ＠＠ unexec (new_name, a_name, data_start, bs #undef symhdr do { - if (write (new, buffer, nread) != nread) + if (write (new_, buffer, nread) != nread) fatal_unexec ("writing symbols to %s", new_name); nread = read (old, buffer, BUFSIZE); if (nread < 0) fatal_unexec ("reading symbols from %s", a_name); #undef BUFSIZE } while (nread != 0); - SEEK (new, 0, "seeking to start of header in %s", new_name); - WRITE (new, &hdr, sizeof (hdr), + SEEK (new_, 0, "seeking to start of header in %s", new_name); + WRITE (new_, &hdr, sizeof (hdr), "writing header of %s", new_name); close (old); - close (new); + close (new_); mark_x (new_name); } Index: src/unicode.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unicode.c,v retrieving revision 1.30 diff -u -p -r1.30 unicode.c --- src/unicode.c 2005/10/25 08:32:49 1.30 +++ src/unicode.c 2005/10/25 11:10:07 ＠＠ -1,5 +1,5 ＠＠ /* Code to handle Unicode conversion. - Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -1260,7 +1260,7 ＠＠ CHARACTER is one of the following: DEFUN ("char-to-unicode", Fchar_to_unicode, 1, 1, 0, /* Convert character to Unicode codepoint. -When there is no international support (i.e. the 'mule feature is not +When there is no international support (i.e. the `mule' feature is not present), this function simply does `char-to-int'. */ (character)) ＠＠ -1281,7 +1281,7 ＠＠ charsets will be consulted, in the given Otherwise, the default ordering of all charsets will be given (see `set-unicode-charset-precedence'). -When there is no international support (i.e. the 'mule feature is not +When there is no international support (i.e. the `mule' feature is not present), this function simply does `int-to-char' and ignores the CHARSETS argument. Index: src/window.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v retrieving revision 1.87 diff -u -p -r1.87 window.c --- src/window.c 2005/10/25 08:32:49 1.87 +++ src/window.c 2005/10/25 11:10:08 ＠＠ -3800,11 +3800,11 ＠＠ temp_output_buffer_show (Lisp_Object buf static void make_dummy_parent (Lisp_Object window) { - Lisp_Object new; + Lisp_Object new_; struct window *o = XWINDOW (window); struct window *p = ALLOC_LCRECORD_TYPE (struct window, &lrecord_window); - new = wrap_window (p); + new_ = wrap_window (p); COPY_LCRECORD (p, o); /* Don't copy the pointers to the line start cache or the face ＠＠ -3816,13 +3816,13 ＠＠ make_dummy_parent (Lisp_Object window) make_image_instance_cache_hash_table (); /* Put new into window structure in place of window */ - replace_window (window, new); + replace_window (window, new_); o->next = Qnil; o->prev = Qnil; o->vchild = Qnil; o->hchild = Qnil; - o->parent = new; + o->parent = new_; p->start[CURRENT_DISP] = Qnil; p->start[DESIRED_DISP] = Qnil; ＠＠ -3845,7 +3845,7 ＠＠ returned. */ (window, size, horflag)) { - Lisp_Object new; + Lisp_Object new_; struct window *o, *p; struct frame *f; int csize; ＠＠ -3908,8 +3908,8 ＠＠ returned. and see the difference. See redisplay-tests.el --yh */ reset_face_cachels (XWINDOW (window)); #endif - new = o->parent; - XWINDOW (new)->vchild = window; + new_ = o->parent; + XWINDOW (new_)->vchild = window; XFRAME (o->frame)->mirror_dirty = 1; } } ＠＠ -3928,8 +3928,8 ＠＠ returned. /* #### See above. */ reset_face_cachels (XWINDOW (window)); #endif - new = o->parent; - XWINDOW (new)->hchild = window; + new_ = o->parent; + XWINDOW (new_)->hchild = window; XFRAME (o->frame)->mirror_dirty = 1; } } ＠＠ -3939,15 +3939,15 ＠＠ returned. if we are making side-by-side windows */ MARK_FRAME_WINDOWS_STRUCTURE_CHANGED (f); - new = allocate_window (); - p = XWINDOW (new); + new_ = allocate_window (); + p = XWINDOW (new_); p->frame = o->frame; p->next = o->next; if (!NILP (p->next)) - XWINDOW (p->next)->prev = new; + XWINDOW (p->next)->prev = new_; p->prev = window; - o->next = new; + o->next = new_; p->parent = o->parent; p->buffer = Qt; ＠＠ -3976,13 +3976,13 ＠＠ returned. XFRAME (p->frame)->mirror_dirty = 1; - note_object_created (new); + note_object_created (new_); /* do this last (after the window is completely initialized and the mirror-dirty flag is set) so that specifier recomputation caused as a result of this will work properly and not abort. */ - Fset_window_buffer (new, o->buffer, Qt); - return new; + Fset_window_buffer (new_, o->buffer, Qt); + return new_; } cvs server: Diffing src/m cvs server: Diffing src/s cvs server: Diffing lwlib Index: lwlib/lwlib-internal.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-internal.h,v retrieving revision 1.4 diff -u -p -r1.4 lwlib-internal.h --- lwlib/lwlib-internal.h 2003/08/28 15:44:05 1.4 +++ lwlib/lwlib-internal.h 2005/10/25 11:10:20 ＠＠ -8,12 +8,12 ＠＠ /* (thanks, Jamie, I feel better now -- ben) */ EXTERN_C void assert_failed (const char *, int, const char *); # define abort() (assert_failed (__FILE__, __LINE__, "abort()")) -# define assert(x) ((x) ? 1 : (assert_failed (__FILE__, __LINE__, #x), 0)) +# define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x)) #else # ifdef DEBUG_XEMACS -# define assert(x) ((x) ? 1 : ((void) abort (), 0)) +# define assert(x) ((x) ? (void) 0 : (void) abort ()) # else -# define assert(x) (1) +# define assert(x) ((void) 0) # endif #endif Index: lwlib/lwlib.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib.c,v retrieving revision 1.19 diff -u -p -r1.19 lwlib.c --- lwlib/lwlib.c 2004/09/20 19:19:17 1.19 +++ lwlib/lwlib.c 2005/10/25 11:10:20 ＠＠ -193,7 +193,7 ＠＠ copy_scrollbar_values (widget_value *val /* * Return true if old->scrollbar_data were not equivalent - * to new->scrollbar_data. + * to new_->scrollbar_data. */ static Boolean merge_scrollbar_values (widget_value *old, widget_value *new_) ＠＠ -238,33 +238,33 ＠＠ merge_scrollbar_values (widget_value *ol #ifdef HAVE_X_WIDGETS /* * Return true if old->args was not equivalent - * to new->args. + * to new_->args. */ static Boolean -merge_widget_value_args (widget_value *old, widget_value *new) +merge_widget_value_args (widget_value *old, widget_value *new_) { Boolean changed = False; - if (new->args && !old->args) + if (new_->args && !old->args) { - lw_copy_widget_value_args (new, old); + lw_copy_widget_value_args (new_, old); changed = True; } /* Generally we don't want to lose values that are already in the widget. */ - else if (!new->args && old->args) + else if (!new_->args && old->args) { - lw_copy_widget_value_args (old, new); + lw_copy_widget_value_args (old, new_); changed = True; } - else if (new->args && old->args && new->args != old->args) + else if (new_->args && old->args && new_->args != old->args) { /* #### Do something more sensible here than just copying the new values (like actually merging the values). */ - lw_copy_widget_value_args (new, old); + lw_copy_widget_value_args (new_, old); changed = True; } - else if (new->args && new->args == old->args && new->args->args_changed == True) + else if (new_->args && new_->args == old->args && new_->args->args_changed == True) { changed = True; } Index: lwlib/xlwtabs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v retrieving revision 1.4 diff -u -p -r1.4 xlwtabs.c --- lwlib/xlwtabs.c 2004/09/20 19:19:18 1.4 +++ lwlib/xlwtabs.c 2005/10/25 11:10:21 ＠＠ -238,7 +238,7 ＠＠ static void TabsAllocGreyGC() ; #else static void TabsClassInit(void) ; -static void TabsInit( Widget req, Widget new, ArgList, Cardinal *nargs) ; +static void TabsInit( Widget req, Widget new_, ArgList, Cardinal *nargs) ; static void TabsConstraintInitialize(Widget, Widget, ArgList, Cardinal *) ; static void TabsRealize(Widget, Mask *, XSetWindowAttributes *) ; static void TabsDestroy( Widget w) ; ＠＠ -421,10 +421,10 ＠＠ TabsClassInit(void) /* ARGSUSED */ static void -TabsInit(Widget request, Widget new, ArgList UNUSED (args), +TabsInit(Widget request, Widget new_, ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { - TabsWidget newTw = (TabsWidget)new; + TabsWidget newTw = (TabsWidget)new_; newTw->tabs.numRows = 0 ; newTw->tabs.realRows = 0; ＠＠ -448,9 +448,9 ＠＠ TabsInit(Widget request, Widget new, Arg { Dimension w,h ; PreferredSize(newTw, &w, &h, NULL,NULL) ; - if( request->core.width == 0 ) new->core.width = w ; - if( request->core.height == 0 ) new->core.height = h ; - XtClass(new)->core_class.resize(new) ; + if( request->core.width == 0 ) new_->core.width = w ; + if( request->core.height == 0 ) new_->core.height = h ; + XtClass(new_)->core_class.resize(new_) ; } /* defer GC allocation, etc., until Realize() time. */ ＠＠ -478,15 +478,15 ＠＠ TabsInit(Widget request, Widget new, Arg */ /* ARGSUSED */ static void -TabsConstraintInitialize(Widget UNUSED (request), Widget new, +TabsConstraintInitialize(Widget UNUSED (request), Widget new_, ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { - TabsConstraints tab = (TabsConstraints) new->core.constraints ; + TabsConstraints tab = (TabsConstraints) new_->core.constraints ; tab->tabs.greyAlloc = False ; /* defer allocation of pixel */ tab->tabs.visible = False ; - getBitmapInfo((TabsWidget)XtParent(new), tab) ; - TabWidth(new) ; + getBitmapInfo((TabsWidget)XtParent(new_), tab) ; + TabWidth(new_) ; } ＠＠ -605,11 +605,11 ＠＠ TabsExpose(Widget w, XEvent *UNUSED (eve /* ARGSUSED */ static Boolean -TabsSetValues(Widget current, Widget UNUSED (request), Widget new, +TabsSetValues(Widget current, Widget UNUSED (request), Widget new_, ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { TabsWidget curtw = (TabsWidget) current ; - TabsWidget tw = (TabsWidget) new ; + TabsWidget tw = (TabsWidget) new_ ; Boolean needRedraw = False ; Widget *childP ; int i ; ＠＠ -641,7 +641,7 ＠＠ TabsSetValues(Widget current, Widget UNU if( tw->core.background_pixel != curtw->core.background_pixel || tw->core.background_pixmap != curtw->core.background_pixmap || tw->tabs.font != curtw->tabs.font ) - if( XtIsRealized(new) ) + if( XtIsRealized(new_) ) { TabsFreeGCs(tw) ; TabsAllocGCs(tw) ; ＠＠ -685,12 +685,12 ＠＠ TabsSetValues(Widget current, Widget UNU /* ARGSUSED */ static Boolean -TabsConstraintSetValues(Widget current, Widget UNUSED (request), Widget new, +TabsConstraintSetValues(Widget current, Widget UNUSED (request), Widget new_, ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { - TabsWidget tw = (TabsWidget) XtParent(new) ; + TabsWidget tw = (TabsWidget) XtParent(new_) ; TabsConstraints ctab = (TabsConstraints) current->core.constraints ; - TabsConstraints tab = (TabsConstraints) new->core.constraints ; + TabsConstraints tab = (TabsConstraints) new_->core.constraints ; /* if label changes, need to re-layout the entire widget */ ＠＠ -703,7 +703,7 ＠＠ TabsConstraintSetValues(Widget current, if( tab->tabs.label != ctab->tabs.label || /* Tab size has changed. */ tab->tabs.left_bitmap != ctab->tabs.left_bitmap ) { - TabWidth(new) ; + TabWidth(new_) ; tw->tabs.needs_layout = True ; if( tab->tabs.left_bitmap != ctab->tabs.left_bitmap ) ＠＠ -722,7 +722,7 ＠＠ TabsConstraintSetValues(Widget current, * Tabs widget might. */ - if( XtIsRealized(new) ) + if( XtIsRealized(new_) ) { if( tw->tabs.needs_layout ) { XClearWindow(XtDisplay((Widget)tw), XtWindow((Widget)tw)) ; ＠＠ -730,7 +730,7 ＠＠ TabsConstraintSetValues(Widget current, } else if( tab->tabs.foreground != ctab->tabs.foreground ) - DrawTab(tw, new, True) ; + DrawTab(tw, new_, True) ; } return False ;

1 participants
0 comments

[COMMIT] more mc-alloc-related factoring; make it hard to do the wrong thing 19 years, 2 months

Ben Wing

NOTE: This patch has been committed. modules/ChangeLog addition: 2005-10-25 Ben Wing <ben(a)xemacs.org> * postgresql/postgresql.c (allocate_pgconn): * postgresql/postgresql.c (allocate_pgresult): * postgresql/postgresql.h (struct Lisp_PGconn): * postgresql/postgresql.h (struct Lisp_PGresult): MC-Alloc refactoring. 2005-10-25 Ben Wing <ben(a)xemacs.org> * ldap/eldap.c (allocate_ldap): * ldap/eldap.h (struct Lisp_LDAP): MC-Alloc refactoring. src/ChangeLog addition: 2005-10-25 Ben Wing <ben(a)xemacs.org> * alloc.c: * alloc.c (old_basic_alloc_lcrecord): * alloc.c (very_old_free_lcrecord): * alloc.c (disksave_object_finalization_1): * alloc.c (copy_lisp_object): * alloc.c (make_lcrecord_list): * alloc.c (alloc_managed_lcrecord): * alloc.c (old_free_lcrecord): * alloc.c (GC_CHECK_NOT_FREE): * alloc.c (tick_lcrecord_stats): * alloc.c (sweep_lcrecords_1): * buffer.c (compute_buffer_usage): * buffer.c (DEFVAR_BUFFER_LOCAL_1): * console.c (DEFVAR_CONSOLE_LOCAL_1): * emacs.c: * emacs.c (main_1): * file-coding.c (allocate_coding_system): * lrecord.h: * lrecord.h (struct old_lcrecord_header): * lrecord.h (struct free_lcrecord_header): * lrecord.h (struct lrecord_implementation): * lrecord.h (struct lcrecord_list): * lrecord.h (old_alloc_lcrecord_type): * lrecord.h (old_copy_sized_lcrecord): * lrecord.h (old_zero_lcrecord): * lstream.c (Lstream_new): * mule-charset.c (compute_charset_usage): * print.c (debug_p4): * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): * scrollbar-x.c (x_compute_scrollbar_instance_usage): * scrollbar.c (compute_scrollbar_instance_usage): * symbols.c (guts_of_unbound_marker): * symeval.h (DEFVAR_SYMVAL_FWD): * unicode.c (compute_from_unicode_table_size_1): * unicode.c (compute_to_unicode_table_size_1): * window.c (compute_window_mirror_usage): * window.c (compute_window_usage): * xemacs.def.in.in: rename `struct lcrecord_header' to `struct old_lcrecord_header'; likewise for `old_basic_alloc_lcrecord', `old_free_lcrecord', `old_zero_lcrecord', `old_zero_sized_lcrecord', `old_copy_lcrecord', `old_copy_sized_lcrecord', `old_alloc_lcrecord_type'. Created new LISPOBJ_STORAGE_SIZE() used only on objects created through allocation of Lisp-Object memory instead of basic xmalloc()/xfree(). This is distinguished from malloced_storage_size(), for non-Lisp-Objects. The definition of LISPOBJ_STORAGE_SIZE() can reduce down to malloced_storage_size() when not MC-ALLOC, but with MC-ALLOC it's a different function. The whole point other than cleaning up the use of LISPOBJ_STORAGE_SIZE is to make it harder to accidentally use the old kind (lowercase) of function in new code, since you get a compile error. latest source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: src/xemacs.def.in.in src/window.c src/unicode.c src/symeval.h src/symbols.c src/scrollbar.c src/scrollbar-x.c src/scrollbar-msw.c src/scrollbar-gtk.c src/print.c src/mule-charset.c src/lstream.c src/lrecord.h src/file-coding.c src/emacs.c src/console.c src/buffer.c src/alloc.c modules/postgresql/postgresql.h modules/postgresql/postgresql.c modules/ldap/eldap.h modules/ldap/eldap.c cvs server: Diffing . cvs server: Diffing dynodump cvs server: Diffing dynodump/i386 cvs server: Diffing dynodump/ppc cvs server: Diffing dynodump/sparc cvs server: Diffing etc cvs server: Diffing etc/custom cvs server: Diffing etc/custom/example-themes cvs server: Diffing etc/eos cvs server: Diffing etc/idd cvs server: Diffing etc/photos cvs server: Diffing etc/sparcworks cvs server: Diffing etc/tests cvs server: Diffing etc/tests/external-widget cvs server: Diffing etc/toolbar cvs server: Diffing etc/unicode cvs server: Diffing etc/unicode/ibm cvs server: Diffing etc/unicode/mule-ucs cvs server: Diffing etc/unicode/other cvs server: Diffing etc/unicode/unicode-consortium cvs server: Diffing info cvs server: Diffing lib-src cvs server: Diffing lisp cvs server: Diffing lisp/mule cvs server: Diffing lisp/term cvs server: Diffing lock cvs server: Diffing lwlib cvs server: Diffing man cvs server: Diffing man/internals cvs server: Diffing man/lispref cvs server: Diffing man/new-users-guide cvs server: Diffing man/xemacs cvs server: Diffing modules cvs server: Diffing modules/base64 cvs server: Diffing modules/canna cvs server: Diffing modules/common cvs server: Diffing modules/ldap Index: modules/ldap/eldap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/eldap.c,v retrieving revision 1.13 diff -u -p -r1.13 eldap.c --- modules/ldap/eldap.c 2005/04/08 23:10:55 1.13 +++ modules/ldap/eldap.c 2005/10/25 07:31:43 ＠＠ -141,11 +141,7 ＠＠ print_ldap (Lisp_Object obj, Lisp_Object static Lisp_LDAP * allocate_ldap (void) { -#ifdef MC_ALLOC - Lisp_LDAP *ldap = alloc_lrecord_type (Lisp_LDAP, &lrecord_ldap); -#else /* not MC_ALLOC */ - Lisp_LDAP *ldap = alloc_lcrecord_type (Lisp_LDAP, &lrecord_ldap); -#endif /* not MC_ALLOC */ + Lisp_LDAP *ldap = ALLOC_LCRECORD_TYPE (Lisp_LDAP, &lrecord_ldap); ldap->ld = NULL; ldap->host = Qnil; Index: modules/ldap/eldap.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/eldap.h,v retrieving revision 1.3 diff -u -p -r1.3 eldap.h --- modules/ldap/eldap.h 2005/04/08 23:10:55 1.3 +++ modules/ldap/eldap.h 2005/10/25 07:31:43 ＠＠ -31,13 +31,7 ＠＠ Boston, MA 02111-1307, USA. */ struct Lisp_LDAP { -#ifdef MC_ALLOC - /* lrecord header */ - struct lrecord_header header; -#else /* not MC_ALLOC */ - /* lcrecord header */ - struct lcrecord_header header; -#endif /* not MC_ALLOC */ + struct LCRECORD_HEADER header; /* The LDAP connection handle used by the LDAP API */ LDAP *ld; /* Name of the host we connected to */ cvs server: Diffing modules/postgresql Index: modules/postgresql/postgresql.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/postgresql/postgresql.c,v retrieving revision 1.7 diff -u -p -r1.7 postgresql.c --- modules/postgresql/postgresql.c 2005/04/08 23:11:00 1.7 +++ modules/postgresql/postgresql.c 2005/10/25 07:31:43 ＠＠ -238,21 +238,11 ＠＠ static Lisp_PGconn * allocate_pgconn (void) { #ifdef RUNNING_XEMACS_21_1 -#ifdef MC_ALLOC - Lisp_PGconn *pgconn = alloc_lrecord_type (Lisp_PGconn, - lrecord_pgconn); -#else /* not MC_ALLOC */ - Lisp_PGconn *pgconn = alloc_lcrecord_type (Lisp_PGconn, + Lisp_PGconn *pgconn = ALLOC_LCRECORD_TYPE (Lisp_PGconn, lrecord_pgconn); -#endif /* not MC_ALLOC */ #else -#ifdef MC_ALLOC - Lisp_PGconn *pgconn = alloc_lrecord_type (Lisp_PGconn, - &lrecord_pgconn); -#else /* not MC_ALLOC */ - Lisp_PGconn *pgconn = alloc_lcrecord_type (Lisp_PGconn, + Lisp_PGconn *pgconn = ALLOC_LCRECORD_TYPE (Lisp_PGconn, &lrecord_pgconn); -#endif /* not MC_ALLOC */ #endif pgconn->pgconn = (PGconn *)NULL; return pgconn; ＠＠ -373,21 +363,11 ＠＠ static Lisp_PGresult * allocate_pgresult (void) { #ifdef RUNNING_XEMACS_21_1 -#ifdef MC_ALLOC - Lisp_PGresult *pgresult = alloc_lrecord_type (Lisp_PGresult, - lrecord_pgresult); -#else /* not MC_ALLOC */ - Lisp_PGresult *pgresult = alloc_lcrecord_type (Lisp_PGresult, + Lisp_PGresult *pgresult = ALLOC_LCRECORD_TYPE (Lisp_PGresult, lrecord_pgresult); -#endif /* not MC_ALLOC */ #else -#ifdef MC_ALLOC - Lisp_PGresult *pgresult = alloc_lrecord_type (Lisp_PGresult, - &lrecord_pgresult); -#else /* not MC_ALLOC */ - Lisp_PGresult *pgresult = alloc_lcrecord_type (Lisp_PGresult, + Lisp_PGresult *pgresult = ALLOC_LCRECORD_TYPE (Lisp_PGresult, &lrecord_pgresult); -#endif /* not MC_ALLOC */ #endif pgresult->pgresult = (PGresult *)NULL; return pgresult; Index: modules/postgresql/postgresql.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/postgresql/postgresql.h,v retrieving revision 1.2 diff -u -p -r1.2 postgresql.h --- modules/postgresql/postgresql.h 2005/04/08 23:11:00 1.2 +++ modules/postgresql/postgresql.h 2005/10/25 07:31:43 ＠＠ -28,11 +28,7 ＠＠ xemacs-patches. */ struct Lisp_PGconn { -#ifdef MC_ALLOC - struct lrecord_header header; -#else /* not MC_ALLOC */ - struct lcrecord_header header; -#endif /* not MC_ALLOC */ + struct LCRECORD_HEADER header; PGconn *pgconn; }; typedef struct Lisp_PGconn Lisp_PGconn; ＠＠ -52,11 +48,7 ＠＠ DECLARE_LRECORD (pgconn, Lisp_PGconn); */ struct Lisp_PGresult { -#ifdef MC_ALLOC - struct lrecord_header header; -#else /* not MC_ALLOC */ - struct lcrecord_header header; -#endif /* not MC_ALLOC */ + struct LCRECORD_HEADER header; PGresult *pgresult; }; typedef struct Lisp_PGresult Lisp_PGresult; cvs server: Diffing modules/sample cvs server: Diffing modules/sample/external cvs server: Diffing modules/sample/internal cvs server: Diffing modules/zlib cvs server: Diffing netinstall cvs server: Diffing nt cvs server: Diffing nt/installer cvs server: Diffing nt/installer/Wise cvs server: Diffing src Index: src/alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.117 diff -u -p -r1.117 alloc.c --- src/alloc.c 2005/10/24 10:07:33 1.117 +++ src/alloc.c 2005/10/25 07:31:45 ＠＠ -587,7 +587,7 ＠＠ dec_lrecord_stats (Bytecount size_includ /* lcrecords are chained together through their "next" field. After doing the mark phase, GC will walk this linked list and free any lcrecord which hasn't been marked. */ -static struct lcrecord_header *all_lcrecords; +static struct old_lcrecord_header *all_lcrecords; #endif /* not MC_ALLOC */ #ifdef MC_ALLOC ＠＠ -653,10 +653,10 ＠＠ free_lrecord (Lisp_Object lrecord) specified size. See lrecord.h. */ void * -basic_alloc_lcrecord (Bytecount size, - const struct lrecord_implementation *implementation) +old_basic_alloc_lcrecord (Bytecount size, + const struct lrecord_implementation *implementation) { - struct lcrecord_header *lcheader; + struct old_lcrecord_header *lcheader; type_checking_assert ((implementation->static_size == 0 ? ＠＠ -667,7 +667,7 ＠＠ basic_alloc_lcrecord (Bytecount size, && (! (implementation->hash == NULL && implementation->equal != NULL))); - lcheader = (struct lcrecord_header *) allocate_lisp_storage (size); + lcheader = (struct old_lcrecord_header *) allocate_lisp_storage (size); set_lheader_implementation (&lcheader->lheader, implementation); lcheader->next = all_lcrecords; #if 1 /* mly prefers to see small ID numbers */ ＠＠ -689,7 +689,7 ＠＠ basic_alloc_lcrecord (Bytecount size, * Otherwise, just let the GC do its job -- that's what it's there for */ void -very_old_free_lcrecord (struct lcrecord_header *lcrecord) +very_old_free_lcrecord (struct old_lcrecord_header *lcrecord) { if (all_lcrecords == lcrecord) { ＠＠ -697,10 +697,10 ＠＠ very_old_free_lcrecord (struct lcrecord_ } else { - struct lrecord_header *header = all_lcrecords; + struct old_lcrecord_header *header = all_lcrecords; for (;;) { - struct lrecord_header *next = header->next; + struct old_lcrecord_header *next = header->next; if (next == lcrecord) { header->next = lrecord->next; ＠＠ -727,7 +727,7 ＠＠ disksave_object_finalization_1 (void) #ifdef MC_ALLOC mc_finalize_for_disksave (); #else /* not MC_ALLOC */ - struct lcrecord_header *header; + struct old_lcrecord_header *header; for (header = all_lcrecords; header; header = header->next) { ＠＠ -760,9 +760,11 ＠＠ copy_lisp_object (Lisp_Object dst, Lisp_ (char *) XRECORD_LHEADER (src) + sizeof (struct lrecord_header), size - sizeof (struct lrecord_header)); else - memcpy ((char *) XRECORD_LHEADER (dst) + sizeof (struct lcrecord_header), - (char *) XRECORD_LHEADER (src) + sizeof (struct lcrecord_header), - size - sizeof (struct lcrecord_header)); + memcpy ((char *) XRECORD_LHEADER (dst) + + sizeof (struct old_lcrecord_header), + (char *) XRECORD_LHEADER (src) + + sizeof (struct old_lcrecord_header), + size - sizeof (struct old_lcrecord_header)); #endif /* not MC_ALLOC */ } ＠＠ -2887,7 +2889,7 ＠＠ make_string_nocopy (const Ibyte *content /************************************************************************/ /* Lcrecord lists are used to manage the allocation of particular - sorts of lcrecords, to avoid calling basic_alloc_lcrecord() (and thus + sorts of lcrecords, to avoid calling BASIC_ALLOC_LCRECORD() (and thus malloc() and garbage-collection junk) as much as possible. It is similar to the Blocktype class. ＠＠ -2959,11 +2961,11 ＠＠ Lisp_Object make_lcrecord_list (Elemcount size, const struct lrecord_implementation *implementation) { - /* Don't use alloc_lcrecord_type() avoid infinite recursion + /* Don't use old_alloc_lcrecord_type() avoid infinite recursion allocating this, */ struct lcrecord_list *p = (struct lcrecord_list *) - basic_alloc_lcrecord (sizeof (struct lcrecord_list), - &lrecord_lcrecord_list); + old_basic_alloc_lcrecord (sizeof (struct lcrecord_list), + &lrecord_lcrecord_list); p->implementation = implementation; p->size = size; ＠＠ -3005,12 +3007,12 ＠＠ alloc_managed_lcrecord (Lisp_Object lcre free_header->lcheader.free = 0; /* Put back the correct type, as we set it to lrecord_type_free. */ lheader->type = list->implementation->lrecord_type_index; - zero_sized_lcrecord (free_header, list->size); + old_zero_sized_lcrecord (free_header, list->size); return val; } else - return wrap_pointer_1 (basic_alloc_lcrecord (list->size, - list->implementation)); + return wrap_pointer_1 (old_basic_alloc_lcrecord (list->size, + list->implementation)); } /* "Free" a Lisp object LCRECORD by placing it on its associated free list ＠＠ -3081,7 +3083,7 ＠＠ alloc_automanaged_lcrecord (Bytecount si } void -free_lcrecord (Lisp_Object rec) +old_free_lcrecord (Lisp_Object rec) { int type = XRECORD_LHEADER (rec)->type; ＠＠ -3617,7 +3619,7 ＠＠ lispdesc_block_size_1 (const void *obj, #define GC_CHECK_NOT_FREE(lheader) \ gc_checking_assert (! LRECORD_FREE_P (lheader)); \ gc_checking_assert (LHEADER_IMPLEMENTATION (lheader)->basic_p || \ - ! ((struct lcrecord_header *) lheader)->free) + ! ((struct old_lcrecord_header *) lheader)->free) #endif /* MC_ALLOC */ #ifdef USE_KKCC ＠＠ -4148,7 +4150,7 ＠＠ tick_lcrecord_stats (const struct lrecor { int type_index = h->type; - if (((struct lcrecord_header *) h)->free) + if (((struct old_lcrecord_header *) h)->free) { gc_checking_assert (!free_p); lcrecord_stats[type_index].instances_on_free_list++; ＠＠ -4175,9 +4177,9 ＠＠ tick_lcrecord_stats (const struct lrecor #ifndef MC_ALLOC /* Free all unmarked records */ static void -sweep_lcrecords_1 (struct lcrecord_header **prev, int *used) +sweep_lcrecords_1 (struct old_lcrecord_header **prev, int *used) { - struct lcrecord_header *header; + struct old_lcrecord_header *header; int num_used = 0; /* int total_size = 0; */ ＠＠ -4222,11 +4224,11 ＠＠ sweep_lcrecords_1 (struct lcrecord_heade } else { - struct lcrecord_header *next = header->next; + struct old_lcrecord_header *next = header->next; *prev = next; tick_lcrecord_stats (h, 1); /* used to call finalizer right here. */ - xfree (header, struct lcrecord_header *); + xfree (header, struct old_lcrecord_header *); header = next; } } Index: src/buffer.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/buffer.c,v retrieving revision 1.72 diff -u -p -r1.72 buffer.c --- src/buffer.c 2005/10/24 10:07:33 1.72 +++ src/buffer.c 2005/10/25 07:31:46 ＠＠ -1757,7 +1757,7 ＠＠ compute_buffer_usage (struct buffer *b, struct overhead_stats *ovstats) { xzero (*stats); - stats->other += MALLOCED_STORAGE_SIZE (b, sizeof (*b), ovstats); + stats->other += LISPOBJ_STORAGE_SIZE (b, sizeof (*b), ovstats); stats->text += compute_buffer_text_usage (b, ovstats); stats->markers += compute_buffer_marker_usage (b, ovstats); stats->extents += compute_buffer_extent_usage (b, ovstats); ＠＠ -2146,7 +2146,7 ＠＠ do { \ static const struct symbol_value_forward I_hate_C = \ { /* struct symbol_value_forward */ \ { /* struct symbol_value_magic */ \ - { /* struct lcrecord_header */ \ + { /* struct old_lcrecord_header */ \ { /* struct lrecord_header */ \ lrecord_type_symbol_value_forward, /* lrecord_type_index */ \ 1, /* mark bit */ \ Index: src/console.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.c,v retrieving revision 1.42 diff -u -p -r1.42 console.c --- src/console.c 2005/10/24 10:07:34 1.42 +++ src/console.c 2005/10/25 07:31:46 ＠＠ -1341,7 +1341,7 ＠＠ do { \ static const struct symbol_value_forward I_hate_C = \ { /* struct symbol_value_forward */ \ { /* struct symbol_value_magic */ \ - { /* struct lcrecord_header */ \ + { /* struct old_lcrecord_header */ \ { /* struct lrecord_header */ \ lrecord_type_symbol_value_forward, /* lrecord_type_index */ \ 1, /* mark bit */ \ Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.159 diff -u -p -r1.159 emacs.c --- src/emacs.c 2005/10/14 01:22:00 1.159 +++ src/emacs.c 2005/10/25 07:31:48 ＠＠ -2,7 +2,7 ＠＠ Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Ben Wing. This file is part of XEmacs. ＠＠ -1973,7 +1973,8 ＠＠ main_1 (int argc, Wexttext **argv, Wextt - make_int() - make_char() - make_extent() - - basic_alloc_lcrecord() + - BASIC_ALLOC_LCRECORD() + - ALLOC_LCRECORD_TYPE() - Fcons() - listN() - make_lcrecord_list() Index: src/file-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v retrieving revision 1.47 diff -u -p -r1.47 file-coding.c --- src/file-coding.c 2005/10/24 10:07:36 1.47 +++ src/file-coding.c 2005/10/25 07:31:49 ＠＠ -698,13 +698,8 ＠＠ allocate_coding_system (struct coding_sy { Bytecount total_size = offsetof (Lisp_Coding_System, data) + data_size; Lisp_Coding_System *codesys = -#ifdef MC_ALLOC - (Lisp_Coding_System *) alloc_lrecord (total_size, - &lrecord_coding_system); -#else /* not MC_ALLOC */ - (Lisp_Coding_System *) basic_alloc_lcrecord (total_size, + (Lisp_Coding_System *) BASIC_ALLOC_LCRECORD (total_size, &lrecord_coding_system); -#endif /* not MC_ALLOC */ codesys->methods = codesys_meths; #define MARKED_SLOT(x) codesys->x = Qnil; Index: src/lrecord.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lrecord.h,v retrieving revision 1.40 diff -u -p -r1.40 lrecord.h --- src/lrecord.h 2005/10/24 10:07:38 1.40 +++ src/lrecord.h 2005/10/25 07:31:49 ＠＠ -67,9 +67,9 ＠＠ Boston, MA 02111-1307, USA. */ Lcrecords are used for less common sorts of objects that don't do their own allocation. Each such object is malloc()ed individually, and the objects are chained together through a `next' pointer. - Lcrecords have a `struct lcrecord_header' at the top, which + Lcrecords have a `struct old_lcrecord_header' at the top, which contains a `struct lrecord_header' and a `next' pointer, and are - allocated using alloc_lcrecord_type() or its variants. + allocated using old_alloc_lcrecord_type() or its variants. Creating a new lcrecord type is fairly easy; just follow the lead of some existing type (e.g. hash tables). Note that you ＠＠ -81,6 +81,27 ＠＠ Boston, MA 02111-1307, USA. */ */ #endif /* not MC_ALLOC */ +#ifdef MC_ALLOC +#define ALLOC_LCRECORD_TYPE alloc_lrecord_type +#define COPY_SIZED_LCRECORD copy_sized_lrecord +#define COPY_LCRECORD copy_lrecord +#define LISPOBJ_STORAGE_SIZE(ptr, size, stats) \ + mc_alloced_storage_size (size, stats) +#define ZERO_LCRECORD zero_lrecord +#define LCRECORD_HEADER lrecord_header +#define BASIC_ALLOC_LCRECORD alloc_lrecord +#define FREE_LCRECORD free_lrecord +#else +#define ALLOC_LCRECORD_TYPE old_alloc_lcrecord_type +#define COPY_SIZED_LCRECORD old_copy_sized_lcrecord +#define COPY_LCRECORD old_copy_lcrecord +#define LISPOBJ_STORAGE_SIZE malloced_storage_size +#define ZERO_LCRECORD old_zero_lcrecord +#define LCRECORD_HEADER old_lcrecord_header +#define BASIC_ALLOC_LCRECORD old_basic_alloc_lcrecord +#define FREE_LCRECORD old_free_lcrecord +#endif + BEGIN_C_DECLS struct lrecord_header ＠＠ -145,13 +166,13 ＠＠ int lrecord_type_index (const struct lre #endif /* not MC_ALLOC */ #ifndef MC_ALLOC -struct lcrecord_header +struct old_lcrecord_header { struct lrecord_header lheader; /* The `next' field is normally used to chain all lcrecords together so that the GC can find (and free) all of them. - `basic_alloc_lcrecord' threads lcrecords together. + `old_basic_alloc_lcrecord' threads lcrecords together. The `next' field may be used for other purposes as long as some other mechanism is provided for letting the GC do its work. ＠＠ -159,7 +180,7 ＠＠ struct lcrecord_header For example, the event and marker object types allocate members out of memory chunks, and are able to find all unmarked members by sweeping through the elements of the list of chunks. */ - struct lcrecord_header *next; + struct old_lcrecord_header *next; /* The `uid' field is just for debugging/printing convenience. Having this slot doesn't hurt us much spacewise, since an ＠＠ -179,7 +200,7 ＠＠ struct lcrecord_header /* Used for lcrecords in an lcrecord-list. */ struct free_lcrecord_header { - struct lcrecord_header lcheader; + struct old_lcrecord_header lcheader; Lisp_Object chain; }; #endif /* not MC_ALLOC */ ＠＠ -344,7 +365,8 ＠＠ struct lrecord_implementation /* Only one of `static_size' and `size_in_bytes_method' is non-0. */ #else /* not MC_ALLOC */ /* Only one of `static_size' and `size_in_bytes_method' is non-0. - If both are 0, this type is not instantiable by basic_alloc_lcrecord(). */ + If both are 0, this type is not instantiable by + old_basic_alloc_lcrecord(). */ #endif /* not MC_ALLOC */ Bytecount static_size; Bytecount (*size_in_bytes_method) (const void *header); ＠＠ -354,7 +376,7 ＠＠ struct lrecord_implementation #ifndef MC_ALLOC /* A "basic" lrecord is any lrecord that's not an lcrecord, i.e. - one that does not have an lcrecord_header at the front and which + one that does not have an old_lcrecord_header at the front and which is (usually) allocated in frob blocks. */ unsigned int basic_p :1; #endif /* not MC_ALLOC */ ＠＠ -1496,7 +1518,7 ＠＠ extern Lisp_Object Q##c_name##p struct lcrecord_list { - struct lcrecord_header header; + struct LCRECORD_HEADER header; Lisp_Object free; Elemcount size; const struct lrecord_implementation *implementation; ＠＠ -1517,7 +1539,7 ＠＠ DECLARE_LRECORD (lcrecord_list, struct l lrecords. lcrecords themselves are divided into three types: (1) auto-managed, (2) hand-managed, and (3) unmanaged. "Managed" refers to using a special object called an lcrecord-list to keep track of freed - lcrecords, which can freed with free_lcrecord() or the like and later be + lcrecords, which can freed with FREE_LCRECORD() or the like and later be recycled when a new lcrecord is required, rather than requiring new malloc(). Thus, allocation of lcrecords can be very cheap. (Technically, the lcrecord-list manager could divide up large ＠＠ -1531,9 +1553,9 ＠＠ DECLARE_LRECORD (lcrecord_list, struct l in particular dictate the various types of management: -- "Auto-managed" means that you just go ahead and allocate the lcrecord - whenever you want, using alloc_lcrecord_type(), and the appropriate + whenever you want, using old_alloc_lcrecord_type(), and the appropriate lcrecord-list manager is automatically created. To free, you just call - "free_lcrecord()" and the appropriate lcrecord-list manager is + "FREE_LCRECORD()" and the appropriate lcrecord-list manager is automatically located and called. The limitation here of course is that all your objects are of the same size. (#### Eventually we should have a more sophisticated system that tracks the sizes seen and creates one ＠＠ -1554,7 +1576,7 ＠＠ DECLARE_LRECORD (lcrecord_list, struct l to hand-manage them, or (b) the objects you create are always or almost always Lisp-visible, and thus there's no point in freeing them (and it wouldn't be safe to do so). You just create them with - basic_alloc_lcrecord(), and that's it. + BASIC_ALLOC_LCRECORD(), and that's it. --ben ＠＠ -1567,9 +1589,9 ＠＠ DECLARE_LRECORD (lcrecord_list, struct l 1) Create an lcrecord-list object using make_lcrecord_list(). This is often done at initialization. Remember to staticpro_nodump() this object! The arguments to make_lcrecord_list() are the same as would be - passed to basic_alloc_lcrecord(). + passed to BASIC_ALLOC_LCRECORD(). - 2) Instead of calling basic_alloc_lcrecord(), call alloc_managed_lcrecord() + 2) Instead of calling BASIC_ALLOC_LCRECORD(), call alloc_managed_lcrecord() and pass the lcrecord-list earlier created. 3) When done with the lcrecord, call free_managed_lcrecord(). The ＠＠ -1580,7 +1602,7 ＠＠ DECLARE_LRECORD (lcrecord_list, struct l lcrecord goodbye as if it were garbage-collected. This means: -- the contents of the freed lcrecord are undefined, and the contents of something produced by alloc_managed_lcrecord() - are undefined, just like for basic_alloc_lcrecord(). + are undefined, just like for BASIC_ALLOC_LCRECORD(). -- the mark method for the lcrecord's type will *NEVER* be called on freed lcrecords. -- the finalize method for the lcrecord's type will be called ＠＠ -1588,8 +1610,8 ＠＠ DECLARE_LRECORD (lcrecord_list, struct l */ /* UNMANAGED MODEL: */ -void *basic_alloc_lcrecord (Bytecount size, - const struct lrecord_implementation *); +void *old_basic_alloc_lcrecord (Bytecount size, + const struct lrecord_implementation *); /* HAND-MANAGED MODEL: */ Lisp_Object make_lcrecord_list (Elemcount size, ＠＠ -1603,27 +1625,28 ＠＠ MODULE_API void * alloc_automanaged_lcrecord (Bytecount size, const struct lrecord_implementation *); -#define alloc_lcrecord_type(type, lrecord_implementation) \ +#define old_alloc_lcrecord_type(type, lrecord_implementation) \ ((type *) alloc_automanaged_lcrecord (sizeof (type), lrecord_implementation)) -void free_lcrecord (Lisp_Object rec); +void old_free_lcrecord (Lisp_Object rec); /* Copy the data from one lcrecord structure into another, but don't overwrite the header information. */ -#define copy_sized_lcrecord(dst, src, size) \ - memcpy ((Rawbyte *) (dst) + sizeof (struct lcrecord_header), \ - (Rawbyte *) (src) + sizeof (struct lcrecord_header), \ - (size) - sizeof (struct lcrecord_header)) - -#define copy_lcrecord(dst, src) copy_sized_lcrecord (dst, src, sizeof (*(dst))) - -#define zero_sized_lcrecord(lcr, size) \ - memset ((Rawbyte *) (lcr) + sizeof (struct lcrecord_header), 0, \ - (size) - sizeof (struct lcrecord_header)) +#define old_copy_sized_lcrecord(dst, src, size) \ + memcpy ((Rawbyte *) (dst) + sizeof (struct old_lcrecord_header), \ + (Rawbyte *) (src) + sizeof (struct old_lcrecord_header), \ + (size) - sizeof (struct old_lcrecord_header)) + +#define old_copy_lcrecord(dst, src) \ + old_copy_sized_lcrecord (dst, src, sizeof (*(dst))) + +#define old_zero_sized_lcrecord(lcr, size) \ + memset ((Rawbyte *) (lcr) + sizeof (struct old_lcrecord_header), 0, \ + (size) - sizeof (struct old_lcrecord_header)) -#define zero_lcrecord(lcr) zero_sized_lcrecord (lcr, sizeof (*(lcr))) +#define old_zero_lcrecord(lcr) old_zero_sized_lcrecord (lcr, sizeof (*(lcr))) #else /* MC_ALLOC */ ＠＠ -1693,27 +1716,6 ＠＠ lisp_object_size (Lisp_Object o) { return detagged_lisp_object_size (XRECORD_LHEADER (o)); } - -#ifdef MC_ALLOC -#define ALLOC_LCRECORD_TYPE alloc_lrecord_type -#define COPY_SIZED_LCRECORD copy_sized_lrecord -#define COPY_LCRECORD copy_lrecord -#define MALLOCED_STORAGE_SIZE(ptr, size, stats) \ - mc_alloced_storage_size (size, stats) -#define ZERO_LCRECORD zero_lrecord -#define LCRECORD_HEADER lrecord_header -#define BASIC_ALLOC_LCRECORD alloc_lrecord -#define FREE_LCRECORD free_lrecord -#else -#define ALLOC_LCRECORD_TYPE alloc_lcrecord_type -#define COPY_SIZED_LCRECORD copy_sized_lcrecord -#define COPY_LCRECORD copy_lcrecord -#define MALLOCED_STORAGE_SIZE malloced_storage_size -#define ZERO_LCRECORD zero_lcrecord -#define LCRECORD_HEADER lcrecord_header -#define BASIC_ALLOC_LCRECORD basic_alloc_lcrecord -#define FREE_LCRECORD free_lcrecord -#endif /************************************************************************/ Index: src/lstream.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lstream.c,v retrieving revision 1.35 diff -u -p -r1.35 lstream.c --- src/lstream.c 2005/10/24 10:07:38 1.35 +++ src/lstream.c 2005/10/25 07:31:50 ＠＠ -220,7 +220,6 ＠＠ Lstream_new (const Lstream_implementatio } p = XLSTREAM (alloc_managed_lcrecord (Vlstream_free_list[i])); -#define COPY_SIZED_LCRECORD copy_sized_lcrecord #endif /* not MC_ALLOC */ /* Zero it out, except the header. */ memset ((char *) p + sizeof (p->header), '\0', Index: src/mule-charset.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-charset.c,v retrieving revision 1.44 diff -u -p -r1.44 mule-charset.c --- src/mule-charset.c 2005/10/24 10:07:39 1.44 +++ src/mule-charset.c 2005/10/25 07:31:50 ＠＠ -880,7 +880,7 ＠＠ compute_charset_usage (Lisp_Object chars { struct Lisp_Charset *c = XCHARSET (charset); xzero (*stats); - stats->other += MALLOCED_STORAGE_SIZE (c, sizeof (*c), ovstats); + stats->other += LISPOBJ_STORAGE_SIZE (c, sizeof (*c), ovstats); stats->from_unicode += compute_from_unicode_table_size (charset, ovstats); stats->to_unicode += compute_to_unicode_table_size (charset, ovstats); } Index: src/print.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/print.c,v retrieving revision 1.55 diff -u -p -r1.55 print.c --- src/print.c 2005/10/24 10:07:39 1.55 +++ src/print.c 2005/10/25 07:31:51 ＠＠ -2219,7 +2219,7 ＠＠ debug_p4 (Lisp_Object obj) LHEADER_IMPLEMENTATION (header)->name, LHEADER_IMPLEMENTATION (header)->basic_p ? (EMACS_INT) header : - ((struct lcrecord_header *) header)->uid); + ((struct old_lcrecord_header *) header)->uid); #endif /* not MC_ALLOC */ } Index: src/scrollbar-gtk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-gtk.c,v retrieving revision 1.18 diff -u -p -r1.18 scrollbar-gtk.c --- src/scrollbar-gtk.c 2005/10/24 10:07:40 1.18 +++ src/scrollbar-gtk.c 2005/10/25 07:31:51 ＠＠ -484,7 +484,7 ＠＠ gtk_compute_scrollbar_instance_usage (st struct gtk_scrollbar_data *data = (struct gtk_scrollbar_data *) inst->scrollbar_data; - total += MALLOCED_STORAGE_SIZE (data, sizeof (*data), ovstats); + total += malloced_storage_size (data, sizeof (*data), ovstats); inst = inst->next; } Index: src/scrollbar-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-msw.c,v retrieving revision 1.30 diff -u -p -r1.30 scrollbar-msw.c --- src/scrollbar-msw.c 2005/10/24 10:07:40 1.30 +++ src/scrollbar-msw.c 2005/10/25 07:31:51 ＠＠ -433,7 +433,7 ＠＠ mswindows_compute_scrollbar_instance_usa struct mswindows_scrollbar_data *data = (struct mswindows_scrollbar_data *) inst->scrollbar_data; - total += MALLOCED_STORAGE_SIZE (data, sizeof (*data), ovstats); + total += malloced_storage_size (data, sizeof (*data), ovstats); inst = inst->next; } Index: src/scrollbar-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-x.c,v retrieving revision 1.30 diff -u -p -r1.30 scrollbar-x.c --- src/scrollbar-x.c 2005/10/24 10:07:40 1.30 +++ src/scrollbar-x.c 2005/10/25 07:31:51 ＠＠ -703,8 +703,8 ＠＠ x_compute_scrollbar_instance_usage (stru struct x_scrollbar_data *data = (struct x_scrollbar_data *) inst->scrollbar_data; - total += MALLOCED_STORAGE_SIZE (data, sizeof (*data), ovstats); - total += MALLOCED_STORAGE_SIZE (data->name, 1 + strlen (data->name), + total += malloced_storage_size (data, sizeof (*data), ovstats); + total += malloced_storage_size (data->name, 1 + strlen (data->name), ovstats); inst = inst->next; } Index: src/scrollbar.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar.c,v retrieving revision 1.35 diff -u -p -r1.35 scrollbar.c --- src/scrollbar.c 2005/10/24 10:07:40 1.35 +++ src/scrollbar.c 2005/10/25 07:31:51 ＠＠ -272,7 +272,7 ＠＠ compute_scrollbar_instance_usage (struct while (inst) { - total += MALLOCED_STORAGE_SIZE (inst, sizeof (*inst), ovstats); + total += LISPOBJ_STORAGE_SIZE (inst, sizeof (*inst), ovstats); inst = inst->next; } Index: src/symbols.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v retrieving revision 1.53 diff -u -p -r1.53 symbols.c --- src/symbols.c 2005/10/24 10:07:41 1.53 +++ src/symbols.c 2005/10/25 07:31:52 ＠＠ -3256,7 +3256,7 ＠＠ Lisp_Object Qnull_pointer; /* some losing systems can't have static vars at function scope... */ static const struct symbol_value_magic guts_of_unbound_marker = { /* struct symbol_value_magic */ - { /* struct lcrecord_header */ + { /* struct old_lcrecord_header */ { /* struct lrecord_header */ lrecord_type_symbol_value_forward, /* lrecord_type_index */ 1, /* mark bit */ Index: src/symeval.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symeval.h,v retrieving revision 1.15 diff -u -p -r1.15 symeval.h --- src/symeval.h 2005/10/24 10:07:41 1.15 +++ src/symeval.h 2005/10/25 07:31:52 ＠＠ -420,7 +420,7 ＠＠ do \ static const struct symbol_value_forward I_hate_C = \ { /* struct symbol_value_forward */ \ { /* struct symbol_value_magic */ \ - { /* struct lcrecord_header */ \ + { /* struct old_lcrecord_header */ \ { /* struct lrecord_header */ \ lrecord_type_symbol_value_forward, /* lrecord_type_index */ \ 1, /* mark bit */ \ Index: src/unicode.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unicode.c,v retrieving revision 1.29 diff -u -p -r1.29 unicode.c --- src/unicode.c 2005/10/24 10:07:42 1.29 +++ src/unicode.c 2005/10/25 07:31:53 ＠＠ -548,7 +548,7 ＠＠ compute_from_unicode_table_size_1 (void } } - size += MALLOCED_STORAGE_SIZE (table, + size += malloced_storage_size (table, 256 * (level == 1 ? sizeof (short) : sizeof (void *)), stats); ＠＠ -573,7 +573,7 ＠＠ compute_to_unicode_table_size_1 (void *t } } - size += MALLOCED_STORAGE_SIZE (table, + size += malloced_storage_size (table, 96 * (level == 1 ? sizeof (int) : sizeof (void *)), stats); Index: src/window.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v retrieving revision 1.86 diff -u -p -r1.86 window.c --- src/window.c 2005/10/24 10:07:42 1.86 +++ src/window.c 2005/10/25 07:31:54 ＠＠ -5096,8 +5096,7 ＠＠ compute_window_mirror_usage (struct wind { if (!mir) return; - stats->other += MALLOCED_STORAGE_SIZE (mir, sizeof (struct window_mirror), - ovstats); + stats->other += LISPOBJ_STORAGE_SIZE (mir, sizeof (*mir), ovstats); #ifdef HAVE_SCROLLBARS { struct device *d = XDEVICE (FRAME_DEVICE (mir->frame)); ＠＠ -5121,7 +5120,7 ＠＠ compute_window_usage (struct window *w, struct overhead_stats *ovstats) { xzero (*stats); - stats->other += MALLOCED_STORAGE_SIZE (w, sizeof (struct window), ovstats); + stats->other += LISPOBJ_STORAGE_SIZE (w, sizeof (*w), ovstats); stats->face += compute_face_cachel_usage (w->face_cachels, ovstats); stats->glyph += compute_glyph_cachel_usage (w->glyph_cachels, ovstats); stats->line_start += Index: src/xemacs.def.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xemacs.def.in.in,v retrieving revision 1.9 diff -u -p -r1.9 xemacs.def.in.in --- src/xemacs.def.in.in 2005/05/15 16:38:14 1.9 +++ src/xemacs.def.in.in 2005/10/25 07:31:55 ＠＠ -18,7 +18,7 ＠＠ mcpro_1 /* mcpro */ #endif mc_alloc /* DEFSUBR */ #else /* not MC_ALLOC */ -alloc_automanaged_lcrecord /* alloc_lcrecord_type */ +alloc_automanaged_lcrecord /* old_alloc_lcrecord_type */ #endif /* not MC_ALLOC */ apply1 #ifdef USE_ASSERTIONS cvs server: Diffing src/m cvs server: Diffing src/s cvs server: Diffing tests cvs server: Diffing tests/DLL cvs server: Diffing tests/Dnd cvs server: Diffing tests/autoconf cvs server: Diffing tests/automated cvs server: Diffing tests/gtk cvs server: Diffing tests/mule cvs server: Diffing tests/tooltalk

1 participants
0 comments

[COMMIT] fix warning in recent patch 19 years, 2 months

Ben Wing

NOTE: This patch has been committed. src/ChangeLog addition: 2005-10-25 Ben Wing <ben(a)xemacs.org> * frame-msw.c (mswindows_window_id): Fix warning. latest source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: src/frame-msw.c Index: src/frame-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-msw.c,v retrieving revision 1.57 diff -u -p -r1.57 frame-msw.c --- src/frame-msw.c 2005/10/25 03:54:03 1.57 +++ src/frame-msw.c 2005/10/25 07:30:07 ＠＠ -581,7 +581,7 ＠＠ mswindows_window_id (Lisp_Object frame) Ibyte str[255]; struct frame *f = decode_mswindows_frame (frame); - qxesprintf (str, "%lu", FRAME_MSWINDOWS_HANDLE (f)); + qxesprintf (str, "%lu", (unsigned long) FRAME_MSWINDOWS_HANDLE (f)); return build_intstring (str); }

1 participants
0 comments

[COMMIT] add support for `window-id' property in mswindows 19 years, 2 months

Ben Wing

NOTE: This patch has been committed. src/ChangeLog addition: 2005-10-24 Ben Wing <ben(a)xemacs.org> * frame-msw.c: * frame-msw.c (decode_mswindows_frame): New function, like decode_x_frame. * frame-msw.c (mswindows_window_id): * frame-msw.c (mswindows_frame_property): * frame-msw.c (mswindows_internal_frame_property_p): * frame-msw.c (mswindows_frame_properties): * frame-msw.c (vars_of_frame_mswindows): Add `window-id' property for MS Windows frames. latest source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: src/frame-msw.c Index: src/frame-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-msw.c,v retrieving revision 1.56 diff -u -p -r1.56 frame-msw.c --- src/frame-msw.c 2005/07/24 17:53:23 1.56 +++ src/frame-msw.c 2005/10/25 03:53:12 ＠＠ -102,6 +102,18 ＠＠ const struct sized_memory_description ms /*----- DISPLAY FRAME -----*/ /*---------------------------------------------------------------------*/ +static struct frame * +decode_mswindows_frame (Lisp_Object frame) +{ + if (NILP (frame)) + frame = wrap_frame (selected_frame ()); + CHECK_LIVE_FRAME (frame); + /* this will also catch dead frames, but putting in the above check + results in a more useful error */ + CHECK_MSWINDOWS_FRAME (frame); + return XFRAME (frame); +} + HWND mswindows_get_selected_frame_hwnd (void) { ＠＠ -564,6 +576,16 ＠＠ mswindows_set_title_from_ibyte (struct f } static Lisp_Object +mswindows_window_id (Lisp_Object frame) +{ + Ibyte str[255]; + struct frame *f = decode_mswindows_frame (frame); + + qxesprintf (str, "%lu", FRAME_MSWINDOWS_HANDLE (f)); + return build_intstring (str); +} + +static Lisp_Object mswindows_frame_property (struct frame *f, Lisp_Object property) { if (EQ (Qleft, property) || EQ (Qtop, property)) ＠＠ -572,6 +594,9 ＠＠ mswindows_frame_property (struct frame * GetWindowRect (FRAME_MSWINDOWS_HANDLE (f), &rc); return make_int (EQ (Qtop, property) ? rc.top : rc.left); } + if (EQ (Qwindow_id, property)) + return mswindows_window_id (wrap_frame (f)); + return Qunbound; } ＠＠ -580,7 +605,8 ＠＠ mswindows_internal_frame_property_p (str Lisp_Object property) { return EQ (property, Qleft) - || EQ (property, Qtop); + || EQ (property, Qtop) + || EQ (property, Qwindow_id); /* #### frame-x.c has also this. Why? || STRINGP (property); */ ＠＠ -595,6 +621,7 ＠＠ mswindows_frame_properties (struct frame props = cons3 (Qtop, make_int (rc.top), props); props = cons3 (Qleft, make_int (rc.left), props); + props = cons3 (Qwindow_id, mswindows_window_id (wrap_frame (f)), props); return props; } ＠＠ -1209,6 +1236,8 ＠＠ set at any time, except as otherwise not outermost corner of the frame (i.e. the upper-left of the window-manager decorations). + window-id Window handle (HWND) of the frame. + Cannot be set. See also `default-frame-plist', which specifies properties which apply to all frames, not just mswindows frames.

1 participants
0 comments

[C] xemacsweb: Another path exception 19 years, 2 months

Adrian Aichner

COMMIT xemacsweb ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: Releases/ChangeLog Index: Releases/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/ChangeLog,v retrieving revision 1.122 diff -u -U0 -r1.122 ChangeLog --- Releases/ChangeLog 24 Oct 2005 23:32:52 -0000 1.122 +++ Releases/ChangeLog 24 Oct 2005 23:48:19 -0000 ＠＠ -2,0 +3,4 ＠＠ + * index.content: Another path exception. + +2005-10-25 Adrian Aichner <adrian(a)xemacs.org> + xemacsweb source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: Releases/index.content Index: Releases/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/index.content,v retrieving revision 1.109 diff -u -w -r1.109 index.content --- Releases/index.content 24 Oct 2005 23:32:52 -0000 1.109 +++ Releases/index.content 24 Oct 2005 23:48:00 -0000 ＠＠ -132,7 +132,7 ＠＠ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/stable">US (stealth.net)</a></li> <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/stable">US (unc.edu)</a></li> <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/stable">US (us.xemacs.org)</a></li> - <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/stable">US (utk.edu)</a></li> + <li><a href="http://ftp.sunsite.utk.edu/ftp/pub/xemacs/stable">US (utk.edu)</a></li> </ul> <h2><a id="Gamma" name="Gamma">Gamma</a> XEmacs Releases</h2> ＠＠ -347,7 +347,7 ＠＠ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/beta">US (stealth.net)</a></li> <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/beta">US (unc.edu)</a></li> <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/beta">US (us.xemacs.org)</a></li> - <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/beta">US (utk.edu)</a></li> + <li><a href="http://ftp.sunsite.utk.edu/ftp/pub/xemacs/beta">US (utk.edu)</a></li> </ul> <h2><a id="Historical" name="Historical">Historical</a> XEmacs Releases</h2> ＠＠ -437,7 +437,7 ＠＠ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/package... (stealth.net)</a></li> <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/packages">US (unc.edu)</a></li> <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/packages">US (us.xemacs.org)</a></li> - <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/packages">US (utk.edu)</a></li> + <li><a href="http://ftp.sunsite.utk.edu/ftp/pub/xemacs/packages">US (utk.edu)</a></li> </ul> <h2><a id="Pre-Releases" name="Pre-Releases">Package Pre-Releases</a></h2> ＠＠ -502,7 +502,7 ＠＠ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/beta/ex... Pre-Releases (stealth.net)</a></li> <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/beta/experimenta... Pre-Releases (unc.edu)</a></li> <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/beta/experimental/packages">US Pre-Releases (us.xemacs.org)</a></li> - <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/beta/experimental/packages">US Pre-Releases (utk.edu)</a></li> + <li><a href="http://ftp.sunsite.utk.edu/ftp/pub/xemacs/beta/experimental/package... Pre-Releases (utk.edu)</a></li> </ul> <!-- Keep this comment at the end of the file -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

1 participants
0 comments

[C] xemacsweb: substitution errors 19 years, 2 months

Adrian Aichner

COMMIT I should update xemacs-builds\adrian\website\package-get-review-download-sites.el to handle these exceptions. xemacsweb ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: Releases/ChangeLog Index: Releases/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/ChangeLog,v retrieving revision 1.121 diff -u -U0 -r1.121 ChangeLog --- Releases/ChangeLog 24 Oct 2005 22:58:51 -0000 1.121 +++ Releases/ChangeLog 24 Oct 2005 23:32:38 -0000 ＠＠ -2,0 +3,4 ＠＠ + * index.content: Manual substitution errors. + +2005-10-25 Adrian Aichner <adrian(a)xemacs.org> + xemacsweb source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: Releases/index.content Index: Releases/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/index.content,v retrieving revision 1.108 diff -u -w -r1.108 index.content --- Releases/index.content 24 Oct 2005 22:58:51 -0000 1.108 +++ Releases/index.content 24 Oct 2005 23:30:48 -0000 ＠＠ -313,11 +313,11 ＠＠ <li><a href="http://ftp.au.xemacs.org/pub/xemacs/beta">Australia (au.xemacs.org)</a></li> <li><a href="http://ftp.at.xemacs.org/editors/xemacs/beta">Austria (at.xemacs.org)</a></li> <li><a href="http://ftp.be.xemacs.org/ftp/xemacs/beta">Belgium (be.xemacs.org)</a></li> - <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/beta">Brazil (br.xemacs.org)</a></li> + <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/xemacs-21.5">Brazil (br.xemacs.org)</a></li> <li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/beta">Canada (ca.xemacs.org)</a></li> <li><a href="ftp://ftp.crc.ca/pub/packages/editors/xemacs/beta">Canada (crc.ca)</a></li> <li><a href="ftp://ftp.nrc.ca/pub/packages/editors/xemacs/beta">Canada (nrc.ca)</a></li> - <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/beta">Czech Republic (cz.xemacs.org)</a></li> + <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21... Republic (cz.xemacs.org)</a></li> <li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/beta">Denmark (dk.xemacs.org)</a></li> <li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... (fi.xemacs.org)</a></li> <li><a href="http://ftp.fr.xemacs.org/pub/xemacs/beta">France (fr.xemacs.org)</a></li> ＠＠ -333,7 +333,7 ＠＠ <li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/beta">Japan (dti.ad.jp)</a></li> <li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/beta">Japan (jaist.ac.jp)</a></li> <li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/beta">Japan (jp.xemacs.org)</a></li> - <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/beta">Japan (sut.ac.jp)</a></li> + <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/xemacs-21.5">Japan (sut.ac.jp)</a></li> <li><a href="http://ftp.kr.xemacs.org/pub/tools/emacs/xemacs/beta">Korea (kr.xemacs.org)</a></li> <li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/beta">New Zealand (nz.xemacs.org)</a></li> <li><a href="http://ftp.no.xemacs.org/pub/xemacs/beta">Norway (no.xemacs.org)</a></li> -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

1 participants
0 comments

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches October 2005