XEmacs-Patches August 2006

xemacs-patches@xemacs.org

15 participants
38 discussions

Attachments not Delivered by eScan! 17 years, 8 months

pubblipel.ri＠tiscali.it

The attachment(s) that you sent with the following mail was deleted by eScan (not delivered to the recipient) ========================================================== The Mail came from : xemacs-patches(a)xemacs.org The Mail recipient : pubblipel.ri＠tiscalinet.it(a)mail-5.tiscali.it Subject of the Mail : Mail System Error - Returned Mail Message-ID: Received : from xemacs.org (143.238.139.119) by mail-mx-4.tiscali.it (7.2.069.3) Sender IP : 143.238.139.119 The following attachments were deleted: Attachment: DOCUMENT.ZIP ========================================================== Use MailScan on your EMail Servers and eScan on your Windows-based PCs and Servers for maximum protection from Internet-borne viruses.

1 participants
0 comments

[PATCH] xemacs-21.5-clean: Workaround long-standing crash in start-profiling 17 years, 8 months

Adrian Aichner

I've seen these crashes for a long time in XEmacs 21.5, which kept me from using C-c p (toggle-profiling) This trivial patch cures the symptom for me, but I wonder: Are others seeing this as well? Is this the right fix? Best regards! Adrian xemacs-21.5-clean ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: src/ChangeLog Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.997 diff -u -U0 -r1.997 ChangeLog --- src/ChangeLog 8 Aug 2006 15:26:05 -0000 1.997 +++ src/ChangeLog 15 Aug 2006 17:17:58 -0000 ＠＠ -0,0 +1,9 ＠＠ +2006-08-15 Adrian Aichner <adrian(a)xemacs.org> + + * profile.c (profile_reap_backtrace): Only dereference function + pointer, if not NULL. + xemacs-21.5-clean source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: src/profile.c =================================================================== RCS Index: src/profile.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/profile.c,v retrieving revision 1.25 diff -u -w -r1.25 profile.c --- src/profile.c 10 Mar 2005 09:12:38 -0000 1.25 +++ src/profile.c 15 Aug 2006 17:16:27 -0000 ＠＠ -253,6 +253,7 ＠＠ handler will record more ticks for the function while the post-amble is executing, and its value will be > our total value. */ bt->function_being_called = 0; + if (bt->function != NULL) { Fputhash (*bt->function, /* This works even when the total_ticks value has overwrapped. Same for total_consing below. */ ＠＠ -265,6 +266,7 ＠＠ + bt->current_total_gc_usage_val), Vtotal_gc_usage_profile_table); } +} void profile_record_just_called (struct backtrace *bt) -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

2 participants
1 comments

[general-docs] Updates to fontconfig.texi 17 years, 8 months

Stephen J. Turnbull

general-docs I've finally got around to doing some long-postponed work in general-docs. These are some accumulated changes to fontconfig.texi. Aidan, I would appreciate it if you would take a look at the Initialization node, where you've done some work recently. I will check again before committing, but (knowing me) I think the odds are pretty good that if I've done violence to your changes, I'll overlook them, while (if you're anything like me ;-) you can probably detect such offenses blindfolded. There are definitely lags between this version and the current documents in upstream. I'm not sure whether it's worth syncing or not, since those are in man format, not texi. Index: xemacs-packages/general-docs/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/packages/xemacs-packages/general-docs/ChangeLog,v retrieving revision 1.16 diff -u -U 0 -r1.16 ChangeLog --- xemacs-packages/general-docs/ChangeLog 7 May 2005 12:23:53 -0000 1.16 +++ xemacs-packages/general-docs/ChangeLog 12 Aug 2006 13:26:18 -0000 ＠＠ -0,0 +1,24 ＠＠ +2006-08-12 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi (Top, Overview): Note need for sync. + +2006-07-13 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi (Querying Fonts and Their Properties): + Fix typos. + +2005-08-01 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi (Initialization): Reorganize. Make + clear that FcInit() doesn't need to be called, and that any + function that forces reexamination of the fonts is expensive. + +2005-04-09 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi (FcPattern): Fix typo. + +2005-01-23 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi (Querying Fonts and Their + Properties): Improve organization. + Index: xemacs-packages/general-docs/texi/xemacs/fontconfig.texi =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/packages/xemacs-packages/general-docs/texi/xemacs/fontconfig.texi,v retrieving revision 1.3 diff -u -r1.3 fontconfig.texi --- xemacs-packages/general-docs/texi/xemacs/fontconfig.texi 5 May 2005 18:06:43 -0000 1.3 +++ xemacs-packages/general-docs/texi/xemacs/fontconfig.texi 12 Aug 2006 12:07:10 -0000 ＠＠ -38,7 +38,8 ＠＠ This file documents fontconfig, a rendering-engine-independent library for managing font metainformation (＠emph{i.e.}, everything but the glyph -data themselves). It is ＠emph{not} part of XEmacs. +data themselves). It is ＠emph{not} part of XEmacs. It is also +＠emph{not} very current with upstream documentation. Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. Copyright © 2003 Stephen J. Turnbull, member of the XEmacs Project ＠＠ -164,7 +165,8 ＠＠ Fontconfig is a library designed to provide system-wide font configuration, customization and application access. -This manual describes fontconfig version 1.0.2. +This manual describes fontconfig version 1.0.2. ＠strong{It is still +useful, but should be sync'ed to upstream.} ＠c FUNCTIONAL OVERVIEW Fontconfig contains two essential modules, the configuration module which ＠＠ -315,12 +317,12 ＠＠ Here are some examples: ＠example -Times-12 12 point Times Roman -Times-12:bold 12 point Times Bold +Times-12 12-point Times Roman +Times-12:bold 12-point Times Bold Courier:italic Courier Italic in the default size -Monospace:matrix=1 .1 0 1 The users preferred monospace font +Monospace:matrix=1 .1 0 1 The user's preferred monospace font with artificial obliquing -Mikachan\-PB-16 12 point Mikachan-PB +Mikachan\-PB-16 16-point Mikachan-PB ＠end example ＠node LANG Tags, , Font Names, Overview ＠＠ -526,7 +528,8 ＠＠＠item FcPattern holds a set of names with associated value lists; each name refers to a -property of a font. FcPatterns are used as inputs to the matching code as +property of a font. The names are interned in an internal hash table. +FcPatterns are used as inputs to the matching code as well as holding information about specific fonts. Each property can hold one or more values; conventionally all of the same type, although the interface doesn't demand that. ＠＠ -576,8 +579,9 ＠＠＠} FcObjectType; ＠end example marks the type of a pattern element generated when parsing font names. -Applications can add new object types so that font names may contain the new -elements. +Applications can add new object types so that font names which contain +the new elements can be parsed correctly. (Note: this is not the +representation of an object in an FcPattern.) ＠item FcConstant ＠＠ -847,15 +851,20 ＠＠ Destroys a pattern, in the process destroying all related values. ＠end deftypefun +＠deftypefun FcPattern *FcPatternDuplicate (FcPattern *p) + +Returns a copy of pattern ＠var{p}. +＠end deftypefun + ＠deftypefun FcBool FcPatternEqual (const FcPattern *pa, const FcPattern *pb); -Returns whether 'pa' and 'pb' are exactly alike. +Returns whether ＠var{pa} and ＠var{pb} are exactly alike. ＠end deftypefun ＠deftypefun FcBool FcPatternEqualSubset (const FcPattern *pa, const FcPattern *pb, const FcObjectSet *os) -Returns whether 'pa' and 'pb' have exactly the same values for all of the -objects in 'os'. +Returns whether ＠var{pa} and ＠var{pb} have exactly the same values for +all of the objects in ＠var{os}. ＠end deftypefun ＠deftypefun FcChar32 FcPatternHash (const FcPattern *p) ＠＠ -867,15 +876,17 ＠＠＠deftypefun FcBool FcPatternAdd (FcPattern *p, const char *object, FcValue value, FcBool append) Adds a single value to the list of values associated with the property named -`object'. If `append' is FcTrue, the value is added at the end of any -existing list, otherwise it is inserted at the begining. `value' is saved +`object'. (The name of the object added to the FcPattern is a pointer to a +copy stored in an internal hash table, not the pointer ＠var{object} itself.) +If `append' is FcTrue, the value is added at the end of any +existing list, otherwise it is inserted at the beginning. `value' is saved (with FcValueSave) when inserted into the pattern so that the library retains no reference to any application-supplied data structure. ＠end deftypefun ＠deftypefun FcBool FcPatternAddWeak (FcPattern *p, const char *object, FcValue value, FcBool append) -FcPatternAddWeak is essentially the same as FcPatternAdd except that any +FcPatternAddWeak is the same as FcPatternAdd except that any values added to the list have binding 'weak' instead of 'strong'. ＠end deftypefun ＠＠ -1027,7 +1038,9 ＠＠＠deftypefun FcBool FcObjectSetAdd (FcObjectSet *os, const char *object) -Adds a property name to the set. +Adds a property name to the set. (The name of the object added to the +FcPattern is a pointer to a copy stored in an internal hash table, not +the pointer ＠var{object} itself.) ＠end deftypefun ＠deftypefun void FcObjectSetDestroy (FcObjectSet *os) ＠＠ -1157,55 +1170,15 ＠＠＠node Querying Fonts and Their Properties, Initialization, FcLangSet, Functions ＠subsection Querying Fonts and Their Properties -An FcBlanks object holds a list of Unicode chars which are expected to -be blank when drawn. When scanning new fonts, any glyphs which are -empty and not in this list will be assumed to be broken and not placed in -the FcCharSet associated with the font. This provides a significantly more -accurate CharSet for applications. - -＠deftypefun FcBlanks *FcBlanksCreate (void) - -Creates an empty FcBlanks object. -＠end deftypefun - -＠deftypefun void FcBlanksDestroy (FcBlanks *b) - -Destroys an FcBlanks object, freeing any associated memory. -＠end deftypefun - -＠deftypefun FcBool FcBlanksAdd (FcBlanks *b, FcChar32 ucs4) - -Adds a single character to an FcBlanks object, returning FcFalse -if this process ran out of memory. -＠end deftypefun - -＠deftypefun FcBool FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4) - -Returns whether the specified FcBlanks object contains the indicated Unicode -value. -＠end deftypefun - -The site or user may specify substitutions for certain font patterns, -for convenience or to get more accurate results for the local -installation or preferences. These functions execute the substitution -based on a specified configuration. - -＠deftypefun FcBool FcConfigSubstituteWithPat (FcConfig *config, FcPattern *p, FcPattern *p_pat FcMatchKind kind) - -Performs the sequence of pattern modification operations, if 'kind' is -FcMatchPattern, then those tagged as pattern operations are applied, else -if 'kind' is FcMatchFont, those tagged as font operations are applied and -p_pat is used for <test> elements with target=pattern. -＠end deftypefun - -＠deftypefun FcBool FcConfigSubstitute (FcConfig *config, FcPattern *p, FcMatchKind kind) - -Calls FcConfigSubstituteWithPat setting p_pat to NULL. -＠end deftypefun +The mission of the ＠file{fontconfig} library is providing a standard +interface to query the fonts available to a program. This section +describes the query functions, followed by descriptions of auxiliary +facilities for default pattern substitutions and handling of blank +characters. The following functions return fonts that match a certain pattern. ＠code{FcFontRenderPrepare} and ＠code{FcFontMatch} always return a single -best match. ＠code{FcFontList} returns the list of fonts that match a a +best match. ＠code{FcFontList} returns the list of fonts that match a given pattern on a certain set of properties. ＠code{FcFontSort} returns the entire list of fonts, sorted in order of match quality, possibly filtering out fonts that do not provide additional characters beyond ＠＠ -1221,7 +1194,7 ＠＠＠deftypefun {FcPattern *} FcFontMatch (FcConfig *config, FcPattern *p, FcResult *result) -Returns the font in 'config' most close matching 'p'. This function +Returns the font in 'config' most closely matching 'p'. This function should be called only after FcConfigSubstitute and FcDefaultSubstitute have been called for 'p'; otherwise the results will not be correct. ＠end deftypefun ＠＠ -1229,7 +1202,10 ＠＠＠deftypefun FcFontSet *FcFontList (FcConfig *config, FcPattern *p, FcObjectSet *os) Selects fonts matching 'p', creates patterns containing only the objects in -'os' from those fonts, and returns the set of unique such patterns. +'os' from those fonts, and returns the set of such patterns (with duplicates +deleted). Any object unspecified in ＠var{pattern} is a wildcard, and the +returned fonts must match on all specified objects. The patterns are +truncated after matching. The FcFontSet returned by FcFontList is destroyed by calling FcFontSetDestroy. ＠end deftypefun ＠＠ -1252,10 +1228,135 ＠＠ The FcFontSet returned by FcFontSort is destroyed by calling FcFontSetDestroy. ＠end deftypefun +The site or user may specify substitutions for certain font patterns, +for convenience or to get more accurate results for the local +installation or preferences. These functions execute the substitution +based on a specified configuration. + +＠deftypefun FcBool FcConfigSubstituteWithPat (FcConfig *config, FcPattern *p, FcPattern *p_pat FcMatchKind kind) + +Performs the sequence of pattern modification operations, if 'kind' is +FcMatchPattern, then those tagged as pattern operations are applied, else +if 'kind' is FcMatchFont, those tagged as font operations are applied and +p_pat is used for <test> elements with target=pattern. +＠end deftypefun + +＠deftypefun FcBool FcConfigSubstitute (FcConfig *config, FcPattern *p, FcMatchKind kind) + +Calls FcConfigSubstituteWithPat setting p_pat to NULL. +＠end deftypefun + +An FcBlanks object holds a list of Unicode chars which are expected to +be blank when drawn. When scanning new fonts, any glyphs which are +empty and not in this list will be assumed to be broken and not placed in +the FcCharSet associated with the font. This provides a significantly more +accurate CharSet for applications. + +＠deftypefun FcBlanks *FcBlanksCreate (void) + +Creates an empty FcBlanks object. +＠end deftypefun + +＠deftypefun void FcBlanksDestroy (FcBlanks *b) + +Destroys an FcBlanks object, freeing any associated memory. +＠end deftypefun + +＠deftypefun FcBool FcBlanksAdd (FcBlanks *b, FcChar32 ucs4) + +Adds a single character to an FcBlanks object, returning FcFalse +if this process ran out of memory. +＠end deftypefun + +＠deftypefun FcBool FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4) + +Returns whether the specified FcBlanks object contains the indicated Unicode +value. +＠end deftypefun + ＠node Initialization, FcAtomic, Querying Fonts and Their Properties, Functions ＠subsection Initialization + +For most purposes, the default configuration (parsed and initialized +from both system and user configuration files) is sufficient. + +＠deftypefun FcBool FcInit (void) + +Loads the default configuration file and the fonts referenced therein and +sets the default configuration to that result. Returns whether this +process succeeded or not. If the default configuration has already +been loaded, this routine does nothing and returns FcTrue. + +The default configuration is normally implicitly initialized; you +probably do not have to call this function, but it shouldn't hurt to do +so. +＠end deftypefun + +＠deftypefun FcBool FcInitBringUptoDate (void) + +Checks the rescan interval in the default configuration, checking the +configuration if the interval has passed and reloading the configuration +when any changes are detected. +＠end deftypefun + +＠deftypefun FcBool FcInitReinitialize (void) + +Forces the default configuration file to be reloaded and resets the default +configuration. +＠c #### CHECK THIS!! +This is an expensive operation. +＠end deftypefun + + +These functions provide some control over how the default configuration of +the library is initialized. (This configuration is normally implicitly +initialized.) + +＠deftypefun char *FcConfigFilename (const char *name) + +Given the specified external entity name, return the associated filename. +This provides applications a way to convert various configuration file +references into filename form. + +A null or empty 'name' indicates that the default configuration file should +be used; which file this references can be overridden with the +FC_CONFIG_FILE environment variable. Next, if the name starts with '~', it +refers to a file in the current users home directory. Otherwise if the name +doesn't start with '/', it refers to a file in the default configuration +directory; the built-in default directory can be overridden with the +FC_CONFIG_DIR environment variable. +＠end deftypefun + +＠deftypefun FcConfig *FcInitLoadConfig (void) + +Loads the default configuration file and returns the resulting configuration. +Does not load any font information. Unless you need to use multiple +configs, it is probably not very useful to call this function from user +code (use ＠code{FcInit()} or ＠code{FcInitReinitialize()} instead). +＠end deftypefun + +＠deftypefun FcConfig *FcInitLoadConfigAndFonts (void) + +Loads the default configuration file and builds information about the +available fonts. Returns the resulting configuration. Unless you need to +use multiple configs, it is probably not very useful to call this function +from user code (use ＠code{FcInit()} or ＠code{FcInitReinitialize()} instead). +This is an expensive operation since it searches for and reads the font +files. +＠end deftypefun + + +If you need to work with different versions of the API, use +＠code{FcGetVersion} to get the library's version information. + +＠deftypefun int FcGetVersion (void) + +Returns the version number of the library. +＠end deftypefun + + An FcConfig object holds the internal representation of a configuration. There is a default configuration which applications may use by passing 0 to any function using the data within an FcConfig. ＠＠ -1360,64 +1461,6 ＠＠ Clears the set of application-specific fonts. ＠end deftypefun -These functions provide some control over how the default configuration of -the library is initialized. (This configuration is normally implicitly -initialized.) - -＠deftypefun char *FcConfigFilename (const char *name) - -Given the specified external entity name, return the associated filename. -This provides applications a way to convert various configuration file -references into filename form. - -A null or empty 'name' indicates that the default configuration file should -be used; which file this references can be overridden with the -FC_CONFIG_FILE environment variable. Next, if the name starts with '~', it -refers to a file in the current users home directory. Otherwise if the name -doesn't start with '/', it refers to a file in the default configuration -directory; the built-in default directory can be overridden with the -FC_CONFIG_DIR environment variable. -＠end deftypefun - -＠deftypefun FcConfig *FcInitLoadConfig (void) - -Loads the default configuration file and returns the resulting configuration. -Does not load any font information. -＠end deftypefun - -＠deftypefun FcConfig *FcInitLoadConfigAndFonts (void) - -Loads the default configuration file and builds information about the -available fonts. Returns the resulting configuration. -＠end deftypefun - -＠deftypefun FcBool FcInit (void) - -Loads the default configuration file and the fonts referenced therein and -sets the default configuration to that result. Returns whether this -process succeeded or not. If the default configuration has already -been loaded, this routine does nothing and returns FcTrue. -＠end deftypefun - -＠deftypefun int FcGetVersion (void) - -Returns the version number of the library. -＠end deftypefun - -＠deftypefun FcBool FcInitReinitialize (void) - -Forces the default configuration file to be reloaded and resets the default -configuration. -＠end deftypefun - -＠deftypefun FcBool FcInitBringUptoDate (void) - -Checks the rescan interval in the default configuration, checking the -configuration if the interval has passed and reloading the configuration -when any changes are detected. -＠end deftypefun - - ＠node FcAtomic, FreeType-Specific Functions, Initialization, Functions ＠subsection FcAtomic -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

2 participants
1 comments

[AC latin-unity] ignore non-Latin charsets 17 years, 8 months

Stephen J. Turnbull

APPROVE COMMIT latin-unity This patch resolves a problem discussed in a thread starting at http://list-archive.xemacs.org/xemacs-beta/200606/msg00162.html. I imagine Aidan still has it applied, that's why he hasn't complained that I haven't applied it yet. I would guess that means he hasn't run into any problems, so it's probably OK (if charset abuse were a crime, Aidan would no doubt be in for life ;-). I think this is OK. FWIW, if this is going to cause any problems, I would expect it to crop up with Cyrillic and Asian "wide" character sets. Index: mule-packages/latin-unity/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/ChangeLog,v retrieving revision 1.47 diff -u -U0 -r1.47 ChangeLog --- mule-packages/latin-unity/ChangeLog 28 Jun 2006 07:58:32 -0000 1.47 +++ mule-packages/latin-unity/ChangeLog 13 Aug 2006 07:42:53 -0000 ＠＠ -0,0 +1,8 ＠＠ +2006-06-22 Stephen J. Turnbull <stephen(a)xemacs.org> + + * latin-unity-vars.el (latin-unity-non-latin-bit-flag): New constant. + + * latin-unity.el (latin-unity-representations-present-region): Use + it to kludge around bug reported in + <m364iwq4yq.fsf(a)jerrypc.cs.usu.edu>. + Index: mule-packages/latin-unity/latin-unity-vars.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-vars.el,v retrieving revision 1.6 diff -u -r1.6 latin-unity-vars.el --- mule-packages/latin-unity/latin-unity-vars.el 15 Feb 2005 22:22:48 -0000 1.6 +++ mule-packages/latin-unity/latin-unity-vars.el 13 Aug 2006 07:42:59 -0000 ＠＠ -150,14 +150,17 ＠＠ "Bit vector representing the set of all Latin character sets.") ;; put the character set indicies and flag bits in reasonable places -(let ((index 1) (bit 1)) - (if (> (length latin-unity-character-sets) 25) - (error "representation too small to support so many charsets!")) - (mapcar (lambda (cs) - (put cs 'latin-unity-flag-bit bit) - (put cs 'latin-unity-index index) - (setq bit (lsh bit 1) - index (1+ index))) - latin-unity-character-sets)) +(defconst latin-unity-non-latin-bit-flag + (let ((index 1) (bit 1)) + (if (> (length latin-unity-character-sets) 25) + (error "representation too small to support so many charsets!")) + (mapcar (lambda (cs) + (put cs 'latin-unity-flag-bit bit) + (put cs 'latin-unity-index index) + (setq bit (lsh bit 1) + index (1+ index))) + latin-unity-character-sets) + bit) + "A bit-flag indicating charsets not handled by latin-unity.") ;;; end of latin-unity-vars. Index: mule-packages/latin-unity/latin-unity.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity.el,v retrieving revision 1.14 diff -u -r1.14 latin-unity.el --- mule-packages/latin-unity/latin-unity.el 2 May 2006 21:58:12 -0000 1.14 +++ mule-packages/latin-unity/latin-unity.el 13 Aug 2006 07:42:59 -0000 ＠＠ -469,21 +469,23 ＠＠ (goto-char (point-min)) (while (not (eobp)) (let* ((ch (char-after)) - (cs (car (split-char ch)))) + (cs (car (split-char ch))) + (flag (get cs 'latin-unity-flag-bit 0))) (cond ((eq cs 'ascii) (setq skipchars (concat "\000-\177" skipchars)) - (setq asets (logior (get cs 'latin-unity-flag-bit 0) asets))) + (setq asets (logior flag asets))) ((eq cs 'latin-jisx0201) ;; #### get this someday ;;(setq skipchars (concat skipchars latin-unity-latin-jisx0201)) (setq skipchars (concat skipchars (list ch))) - (setq asets (logior (get cs 'latin-unity-flag-bit 0) asets))) + (setq asets (logior flag asets))) (t ;; #### actually we can do the whole charset here ;; precompute and set a property on the cs symbol (setq skipchars (concat skipchars (list ch))) - (setq lsets (logior (get cs 'latin-unity-flag-bit 0) lsets))))) + (when (= flag 0) (setq lsets (logior latin-unity-non-latin-bit-flag lsets))) + (setq lsets (logior flag lsets))))) ;; The characters skipped here can't change asciisets (skip-chars-forward skipchars)))) (cons lsets asets))) -- School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

Re: [PATCH] (Draft) Make X11 server-side fonts and Mule suck less. 17 years, 8 months

Aidan Kehoe

Ar an dara lá déag de mí Lúnasa, scríobh Stephen J. Turnbull: > Anyway, that's the rationale, and I appreciate the questioning. But > (at least for now) I'd rather leave it as is. It's worth thinking > about the issue for lisp.h (and maybe even going to C++ to get rid of > some of the more opaque "object-oriented" macros), though. On that issue; I like Ben’s macros, in general. They often give a level of abstraction and clean structure that would be otherwise impossible in C, and when debugging them is an issue (which is not that often, because Ben’s code tends not to be buggy) cc -E and temporarily replacing one or more of them with their expansions is trivial. (I certainly was daunted at first, though!) -- Santa Maradona, priez pour moi!

1 participants
0 comments

[general-docs] Developer's Guide is almost ready for beta 17 years, 8 months

Stephen J. Turnbull

general-docs After a delay of well over a year, I've put the Developer's Guide into some kind of condition to be distributed. I've moved the probably controversial section on dispute resolution into a separate file. The rest codifies our consensus on procedure and best practices as I understand them. I think it's worth circulating, but it should be viewed as descriptive, not as policy. In particular, people should feel free to update or correct my misperceptions, and I don't think there's reason to solicit consensus unless experience shows that some point is flammable. There are lots of niggling details (like ＠refs) that need checking before adding it to the distributed package. Checking would be very welcome, but no need to chase down correct references if you don't feel like it, just let me know which ＠node and ＠ref were bad. I also plan to scarf the descriptions of the various mailing lists from the web for that section of the guide, move beta.texi into the guide, and things like that. Unless somebody thinks this is a bad idea in principle, I'll commit in a couple days. Note that until added to EXPLICIT_DOCS in the Makefile, this will not be part of the official package distribution. I do hope to do that shortly. Index: xemacs-packages/general-docs/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/packages/xemacs-packages/general-docs/ChangeLog,v retrieving revision 1.16 diff -u -U 0 -r1.16 ChangeLog --- xemacs-packages/general-docs/ChangeLog 7 May 2005 12:23:53 -0000 1.16 +++ xemacs-packages/general-docs/ChangeLog 12 Aug 2006 13:26:18 -0000 ＠＠ -0,0 +1,19 ＠＠ +2006-08-12 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/xemacs-devguide.texi: Massive changes to conform to + XEmacs reality. + (Index): Sync function and variable indicies to concept index. + +2005-03-13 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/xemacs-devguide.texi: References to Debian removed. + +2005-01-30 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/xemacs-devguide.texi: New file based on MH-E's. + Index: xemacs-packages/general-docs/texi/xemacs/xemacs-devguide.texi =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/packages/xemacs-packages/general-docs/texi/xemacs/xemacs-devguide.texi,v retrieving revision 1.1 diff -u -r1.1 xemacs-devguide.texi --- xemacs-packages/general-docs/texi/xemacs/xemacs-devguide.texi 1 Feb 2005 16:08:35 -0000 1.1 +++ xemacs-packages/general-docs/texi/xemacs/xemacs-devguide.texi 12 Aug 2006 13:32:43 -0000 ＠＠ -1,20 +1,27 ＠＠ -\input texinfo ＠c -*-texinfo-*- -＠c $Id: xemacs-devguide.texi,v 1.1 2005/02/01 16:08:35 stephent Exp $ +\input texinfo ＠c -*-texinfo-*- + +＠c This file was originally derived from the MH-E Developer's Guide +＠c version: devguide.texi,v 1.38 2004/08/22 04:40:48 wohler Exp +＠c by Bill Wohler. There's no possibility of synching, but it's worth +＠c paying attention to changes in their practices IMO. -- stephen +＠c ＠c Generate HTML with: ＠c (shell-command "texi2html -number -monolithic xemacs-devguide.texi" nil) -＠c -＠c Preamble edited: stephen 2005-01-20 + ＠c %**start of header ＠setfilename ../../info/xemacs-devguide.info ＠settitle xemacs-devguide +＠syncodeindex vr cp +＠syncodeindex fn cp ＠c %**end of header ＠c Version variables. -＠set EDITION 0.5 -＠set UPDATED 2005-01-20 -＠set UPDATE-MONTH January, 2005 +＠set EDITION 0.9 +＠set UPDATED 2006-08-12 +＠set UPDATE-MONTH August, 2006 ＠c Other variables. +＠set GUIDE ＠emph{XEmacs Developers' Guide} ＠set XEMACSORG XEmacs.ORG ＠set PROJECT XEmacs Project ＠set HOMEPAGE ＠uref{http://www.xemacs.org/,XEmacs Project Website} ＠＠ -27,13 +34,16 ＠＠＠set PATCHES-LIST the ＠email{xemacs-patches＠(a)xemacs.org,XEmacs Patches} mailing list ＠set CVS-LIST the ＠email{xemacs-cvs＠(a)xemacs.org,XEmacs CVS Notices} mailing list ＠set BUILDREPORTS-LIST the ＠email{xemacs-buildreports＠(a)xemacs.org,XEmacs Build Reports} mailing list +＠set WINNT-LIST the ＠email{xemacs-winnt＠(a)xemacs.org,XEmacs Windows Port} mailing list +＠set VERSIONFILE ＠file{$＠{srcdir(a)}/version.sh} ＠copying This is Edition ＠value{EDITION} of the ＠cite{XEmacs Developers Guide}, last updated ＠value{UPDATED}. -Copyright ＠copyright{} 2000, 01, 02, 03, 2004 Bill Wohler -Copyright ＠copyright{} 2005 Free Software Foundation +Copyright ＠copyright{} 2000, 2001, 2002, 2003, 2004 Bill Wohler + +Copyright ＠copyright{} 2005, 2006 Free Software Foundation ＠quotation The ＠cite{XEmacs Developers Guide} is free documentation; you can ＠＠ -96,6 +106,7 ＠＠ * Philosophy:: * The Work Roles:: * The Work Flow:: +* Release Engineering:: * XEmacs Resources on the Internet:: Nodes borrowed from other projects, not adapted to XEmacs: ＠＠ -104,11 +115,10 ＠＠ * Bugs:: * Feature Requests:: * Patch Queue:: -* File Releases:: * News:: * Surveys:: * Free Software Directories:: -* Copying:: +* Copying:: Permissions for this document. * Index:: ＠detailmenu ＠＠ -169,50 +179,48 ＠＠ * Project Website:: * CVS Repository:: -* comp.emacs.xemacs:: +* The comp.emacs.xemacs Newsgroup:: +* XEmacs Mailing Lists:: + +XEmacs Mailing Lists + +* Maintaining the Mailing Lists:: * xemacs-beta:: * xemacs-design:: * xemacs-patches:: * xemacs-mule:: * xemacs-winnt:: -Nodes borrowed from other projects, not adapted to XEmacs - -Bugs - -* Category:: -* Status:: -* Group:: -* Resolution:: - -File Releases +Release Engineering * Release Schedule:: -* Release Prerequisites:: +* Release Prerequisites:: * Updating NEWS:: -* Updating README:: * Updating Version Number:: * Updating ChangeLogs:: * Tagging Releases:: * Creating Tarballs:: * Creating ＠value{XEMACSORG} Releases:: -* Updating the Tracker:: * Announce the Release:: -* Updating the Emacs Repository:: -* Updating the Debian Package:: -* Updating the XEmacs Package:: * Updating the Online Documentation:: * Updating the Free Software Directories:: * After the Release:: +Nodes borrowed from other projects, not adapted to XEmacs + +Bugs + +* Category:: +* Status:: +* Group:: +* Resolution:: + ＠end detailmenu ＠end menu ＠node Acknowledgments, Introduction, Top, Top ＠chapter Acknowledgments -＠c Edited: stephen 2005-01-18 - Special thanks go to Bill Wohler, whose ＠emph{MH-E Developers Guide} formed the framework for this document, and contributed a lot of text as well, for permission to redistribute the derived work under the GNU ＠＠ -227,8 +235,6 ＠＠＠node Introduction, Philosophy, Acknowledgments, Top ＠chapter Introduction -＠c Edited: stephen 2005-01-18 - ＠cindex Introduction ＠cindex ＠value{XEMACSORG} ＠＠ -286,14 +292,13 ＠＠＠node Philosophy, The Work Roles, Introduction, Top ＠chapter Philosophy -＠c Edited: stephen 2005-01-18 - ＠cindex Philosophy -＠strong{Currently pretty much everything in this node is hardly -representative of the ＠value{PROJECT}. Sometimes stephen thinks much of -this would be a good statement of values, other times he doesn't. What -do you think? Submit a patch!} +＠strong{Currently pretty much everything in this node is drawn from the +MH-E Developer's Guide, and is hardly representative of the +＠value{PROJECT}. Sometimes stephen thinks much of this would be a good +statement of values, other times he doesn't. What do you think? Submit +a patch!} This chapter discusses the philosophy and principles of the XEmacs project. The first section covers our coding philosophy, while the ＠＠ -421,7 +426,11 ＠＠ not. This will aid future project admins greatly if there ever is a merger.} -You ＠strong{must} reference the GPL correctly in every file. +You ＠strong{must} reference the GPL correctly in every file. If you +believe that an entire file can be placed in the public domain, or +under another license, you are quite possibly right. However, because +this is very unusual, it is very important to discuss this with the +＠value{BOARD} to ensure that your wishes are respected in the future. Manuals must also follow these rules, except that for historical reasons they have various different licenses. ＠emph{Be careful}: it is ＠＠ -437,11 +446,13 ＠＠ licenses are preferred. The ＠uref{http://www.gnu.org/prep/standards.html, GNU -Coding Conventions} is required reading. - -Before checking in files, load ＠file{lisp-mnt} into Emacs, and run -＠code{lm-verify} within the lisp file you are editing to ensure that -all of the fields described in +Coding Conventions} is required reading. The Info version distributed +with XEmacs is the preferred edition. Note that some GNU practices are +modified for XEmacs; please refer to the XEmacs Internals Manual. + +Before checking in Lisp files, load ＠file{lisp-mnt} into Emacs, and run +＠code{lm-verify} within the Lisp file you are editing to ensure that all +of the fields described in ＠ifnothtml ＠ref{Library Headers, , , elisp}, ＠end ifnothtml ＠＠ -463,8 +474,6 ＠＠＠node The Work Roles, The Work Flow, Philosophy, Top ＠chapter The Work Roles -＠c Created: stephen 2005-01-20 - On the one hand, ``open source'' means that you are free to take the existing program, make it into whatever you want, and nobody will stop you. On the other hand, ``open source'' means that you are free to ＠＠ -534,7 +543,8 ＠＠ A developer who may authorize developers, including himself, to write to the XEmacs CVS repository. ＠xref{XEmacs Reviewer}. Should participate in ＠value{BETA-LIST} ＠ref{xemacs-beta}, ＠value{DESIGN-LIST} -＠ref{xemacs-design}, and ＠value{PATCHES-LIST} ＠ref{xemacs-patches}. +＠ref{xemacs-design}, ＠value{PATCHES-LIST} ＠ref{xemacs-patches}, as well +as ＠value{REVIEW-LIST} ＠ref{xemacs-review} (restricted to reviewers). ＠item XEmacs Review Board The reviewers as a group, responsible for delegating access to ＠＠ -555,7 +565,8 ＠＠ done, and finding someone to do it. The latter title allows him to tell his mother how important he is. More seriously, the meta-maintainer often functions as a spokesman for the Board or the project as a whole. -Should be highly visible on ＠value{C-E-X} ＠ref{comp.emacs.xemacs} and +Should be highly visible on ＠value{C-E-X} +＠ref{The comp.emacs.xemacs Newsgroup} and ＠value{BETA-LIST} ＠ref{xemacs-beta}. ＠item Release engineer ＠＠ -637,10 +648,12 ＠＠＠cindex committer ＠c MH-E says that committers may be _assigned_ bugs -A ＠dfn{committer} is one who is authorized to check in approved changes -into the CVS repository, including changes to private branches they may -maintain. Developers who do not have CVS access contribute by -submitting patches to ＠value{PATCHES-LIST}. +A ＠dfn{committer} is one whose SSH key has been added to the set on the +CVS repository. This gives the necessary access to check in approved +changes into the CVS repository, including changes to private branches +they may maintain. Whether a developers has CVS access or not, their +patches must be submitted to ＠value{PATCHES-LIST} for review, and be +approved, before committing. Commit access is generally given to those who have submitted several good patches, to ``well-known'' developers on request, and to XEmacs ＠＠ -656,8 +669,6 ＠＠＠node Commit Access, Committer Welcome Message, Committer, Committer ＠subsection Commit Access -＠c Edited: stephen 2005-01-18 - ＠cindex commit access ＠cindex cvs.xemacs.org committer accounts ＠＠ -674,9 +685,13 ＠＠＠c #### fix these urefs!! Developers should be familiar with the -＠uref{http://www.xemacs.org/Documentation/,XEmacs Lisp Manual} +＠uref{http://www.xemacs.org/Documentation/,XEmacs Lisp Manual}, ＠ifinfo -＠xref{Top, XEmacs Lisp Reference, , lispref}. +＠xref{Top, XEmacs Lisp Reference, , lispref}, +＠end ifinfo +＠uref{http://www.xemacs.org/Documentation/,XEmacs Internals Manual} +＠ifinfo +＠xref{Top, XEmacs Internals Reference, , internals}, ＠end ifinfo as well as the ＠uref{http://www.xemacs.org/Documentation/,XEmacs Manual}. ＠＠ -684,8 +699,6 ＠＠＠xref{Top, XEmacs User's Guide, , xemacs}. ＠end ifinfo -＠cindex xemacs-design mailing list -＠cindex mailing lists, xemacs-design ＠cindex committer If you think that you may contribute enough to want access to the CVS ＠＠ -962,7 +975,6 ＠＠＠node Appointing New Reviewers, Welcoming New Reviewers, XEmacs Reviewer, XEmacs Reviewer ＠subsection Appointing New Reviewers -＠c Created: stephen 2005-01-19 ＠strong{This node needs improvement!!} ＠cindex ＠value{BOARD} ＠＠ -1153,14 +1165,14 ＠＠＠cindex meta-maintainer -The ＠dfn{meta-maintainer} is a reviewer who -is responsible for general administration, including recruiting -personnel to handle various chores required to keep the project running -smoothly and handling correspondence for the XEmacs Review Board. The -meta-maintainer generally also fills the role of ``Mr. XEmacs,'' the -public representative of the project. For this reason the -meta-maintainer should be an individual who has earned the respect and -some power in the community, but the role does not provide any +The ＠dfn{meta-maintainer} is a reviewer who is responsible for general +administration, including recruiting personnel to handle various chores +required to keep the project running smoothly and handling +correspondence for the XEmacs Review Board. The meta-maintainer +generally also fills the role of ``Mr. XEmacs,'' the public +representative of the project. For this reason the meta-maintainer +should be an individual who has earned the respect and some personal +power in the community, but the role does ＠emph{not} provide any exceptional power itself. ＠＠ -1200,10 +1212,9 ＠＠ -＠node The Work Flow, XEmacs Resources on the Internet, The Work Roles, Top +＠node The Work Flow, Release Engineering, The Work Roles, Top ＠chapter The Work Flow -＠c Created: stephen 2005-01-20 This section is a description of current best practices, rather than an attempt to define a standard. ＠＠ -1234,7 +1245,8 ＠＠＠item Submit the patch. Compose the message so it's easy to find, easy to identify, easy to -review, and easy to apply. +review, and easy to apply. Didier Verna's ＠file{patcher.el} library in +the ＠file{xemacs-devel} package is very useful. ＠item Review the patch. The primary function of the ＠value{BOARD} is to help you improve your ＠＠ -1287,11 +1299,10 ＠＠＠value{PROJECT} neither advocates nor discourages this action; it's up to you. -Also, be aware that at the time of writing, January 2005, -Richard Stallman had recently denied that such assignments would -facilitate adoption of XEmacs code by GNU Emacs; if you want your code -to be used in GNU Emacs, you will have to resubmit it directly to the -GNU Emacs project. +Also, be aware that in January 2005 Richard Stallman denied that such +assignments would facilitate adoption of XEmacs code by GNU Emacs; if +you want your code to be used in GNU Emacs, you will have to resubmit it +directly to the GNU Emacs project. Get more information about procedures from the ＠email{emacs-devel＠(a)gnu.org,GNU Emacs developers' mailing list} or from ＠＠ -1305,9 +1316,6 ＠＠＠node Scratching That Itch, Get the Sources, About Copyright Assignment, The Work Flow ＠section Scratching That Itch -＠c Edited: stephen 2005-01-18 -＠c #### needs revision - As always in free software, a patch starts life when some developer somewhere gets an itch. It might be an irritating bug, or someone's report of a bug that bites them; a new feature, whether one's own ＠＠ -1319,7 +1327,8 ＠＠＠node Get the Sources, Write Low-Profile Code, Scratching That Itch, The Work Flow ＠section Get the Sources -Maybe he's never worked on XEmacs before. In that case, he'll need to +Maybe our developer has never worked on XEmacs before. In that case, +he'll need to check out the ＠samp{xemacs} module from the CVS repository ＠ref{CVS Repository}. True, he may already have the whole package because he built from source after downloading a tarball. However, tarballs often ＠＠ -1407,7 +1416,6 ＠＠＠node Add a ChangeLog Entry, Create the Patch, Test Your Changes, The Work Flow ＠section Add a ChangeLog Entry -＠c Created: stephen 2005-01-21 ＠strong{Needs revision!!} Add a log entry to ＠file{ChangeLog} file in the ancestor directory ＠＠ -1421,8 +1429,6 ＠＠＠node ChangeLogs, Log Messages, Add a ChangeLog Entry, Add a ChangeLog Entry ＠subsection ChangeLogs -＠c Edited: stephen 2005-01-18 - ＠strong{This section is pretty close to correct for XEmacs. Needs review.} ＠cindex ChangeLog ＠＠ -1459,7 +1465,7 ＠＠ (install-online): Implemented. (%.info,%.html,%.dvi,%.ps): Added. - *doc/mh-e.texi (Viewing, Showing): Use new keymaps (closes + * doc/mh-e.texi (Viewing, Showing): Use new keymaps (closes SF #621632). ＠end example ＠＠ -1474,22 +1480,21 ＠＠ Multiple targets with the same text may appear in the same entry. -＠cindex Debian - -For consistency, phrase the issue number as follows (＠pxref{Updating -NEWS}): - -＠example - (closes SF #621632). -＠end example - -or - -＠example - (closes Debian #234234). -＠end example +＠c #### we don't have a tracker yet. +＠c For consistency, phrase the issue number as follows (＠pxref{Updating +＠c NEWS}): +＠c +＠c ＠example +＠c (closes SF #621632). +＠c ＠end example + +If there are relevant messages on ＠value{BETA-LIST} or other mailing +lists, you may include one Message-ID, usually the beginning or end of +the thread, in angle brackets as documentation. However, you should +give a brief description of both the issue addressed and the code change +to allow the reader to judge whether he wants to read the thread or not. -The Emacs manual has full documentation on the ＠file{ChangeLog} +The XEmacs manual has full documentation on the ＠file{ChangeLog} commands. When you check in the change log, you do not need to supply any log ＠＠ -1498,8 +1503,6 ＠＠＠node Log Messages, , ChangeLogs, Add a ChangeLog Entry ＠subsection Log Messages -＠c Edited: stephen 2005-01-18 - ＠strong{This section, written by Bill Wohler for MH-E and lightly edited to substitute ``XEmacs'' for ``MH-E'', is pretty close to correct for XEmacs, at least in the case of implicit self-approval. Needs review.} ＠＠ -1507,26 +1510,11 ＠＠＠cindex log messages ＠cindex ChangeLog -Log messages should be taken from ＠file{ChangeLog}. Given the -＠file{ChangeLog} in the previous section, here is what the log for -＠file{fixhtml} might look like: - -＠example - (dohtml): Now part of main program now that program - only fixes HTML files. Added -w and strict usage. - (usage,dodvi,doinfo): Deleted. - (fix_ref_links): Fixed a few uninitialized variables. Found a - couple of variables and commands that weren't indexed. -＠end example - -Note that the ＠code{*} and the filename have been removed, but this is -not mandatory. However, if the same log message is used for multiple -files, then the associated ＠code{*} and filenames will need to be -present to separate the messages. ＠strong{Is this appropriate for -XEmacs?} - -It is not necessary to add release information since that -information will be encoded in the tags. +One reasonable style for log messages is to take them from +＠file{ChangeLog}. It is not necessary to add release information since +that information will be encoded in the tags. It is a good idea, though +not mandatory, to include the Message-ID of the APPROVE message(s) for +the the patch. At worst, setting the log information will be a cut and paste operation. At best, it will be a keystroke or two. In pcl-cvs, you can ＠＠ -1552,10 +1540,8 ＠＠＠node Create the Patch, Submit the Patch, Add a ChangeLog Entry, The Work Flow ＠section Create the Patch -(The following lines describe the current patch creation standard for -developers without commit access, committers, and reviewers alike. An -optional alternative procedure for ＠emph{reviewers only} is likely to be -adopted in first quarter 2005.) +(The following lines describe the patch creation standard for developers +without commit access, committers, and reviewers alike.) Patches should be created using a standard diff(1) such as provided by GNU diffutils, or implemented by CVS. A patch should be a ＠＠ -1575,7 +1561,7 ＠＠＠emph{every} patch, context conflicts are extremely likely. On the contrary, since ＠file{ChangeLog} entries are essentially independent of each other, a ＠emph{contextless} ＠samp{diff -U 0} format patch at line -1, or plain text that can be easily cut and pasted, is the preferred +0, or plain text that can be easily cut and pasted, is the preferred format for the ＠file{ChangeLog} diff. These should be prepended to the changeset. ＠＠ -1591,10 +1577,8 ＠＠＠cindex patch submission ＠cindex submission, patch -(The following lines describe the current patch submission procedure for -developers without commit access, committers, and reviewers alike. An -optional alternative procedure for ＠emph{reviewers only} is likely to be -adopted in first quarter 2005.) +(The following lines describe the patch submission procedure for +developers without commit access, committers, and reviewers alike.) Send the patch by email to ＠value{PATCHES-LIST}. The subject line should indicate the branch or CVS module in square brackets at the ＠＠ -1671,7 +1655,7 ＠＠ self-approval}. ＠strong{This procedure is not yet in effect, and the commit-trigger has -not yet been implemented at the time of writing. (2005-01-20)} +been only partially implemented at the time of writing. (2006-08-12)} ＠＠ -1683,10 +1667,7 ＠＠ (The following lines describe the current patch submission procedure for developers without commit access and committers. Reviewers may -optionally use ``commit-and-review,'' described later. Another optional -alternative procedure for ＠emph{reviewers only} is likely to be adopted -in first quarter 2005. Called ``implicit self-approval,'' it was -described in the previous section.) +optionally use ``commit-and-review,'' described later.) After the patch has been distributed via ＠value{PATCHES-LIST} reviewers and other developers should review and test the patch. Discussion ＠＠ -1729,7 +1710,7 ＠＠ In cases of the first three actions, the future path of the patch is clear. In the case of a ＠samp{VETO}, the veto may be overridden by three votes for ＠samp{APPROVE} among the reviewers. (It's not clear -to me whether an override requires a majority, including at least three +whether an override requires a majority, including at least three approvals, or a supermajority of two more approvals than vetos.) ＠＠ -1785,7 +1766,7 ＠＠ is no way to supply a message ID reference; that requirement is nullified. ＠strong{This procedure is not yet in effect, and the commit-trigger has -not yet been implemented at the time of writing. (2005-01-20)} +not yet been implemented at the time of writing. (2006-08-12)} ＠＠ -1798,1391 +1779,1251 ＠＠＠cindex check-ins, protesting ＠cindex dispute resolution -＠strong{This is a first hack draft by ＠samp{stephen}. I have no idea -whether it represents my own ``true'' opinion, let alone anyone else's.} - -There seems to be general agreement that ＠value{PROJECT} resources -should be used to serve ``the users' needs'' first, before being used -for developers' play---but there is disagreement over who those users -are, and what their needs might be. - -There is general agreement that one of the advantages to working on -XEmacs is the overall coherence of most of its architecture, and the -dedication of the team to refactoring broken designs. However, the -developers with fewer resources to devote feel overwhelmed by the ``code -churn'' generated by the most prolific developers, and protest that -memorizing global renamings and the like are rather frivolous ways to -spend reviewer resources. - -These conflicts typically manifest as a dispute over some reviewer's use -of a veto. Therefore I propose the following guidelines for use of -vetos. - -＠table ＠emph -＠item Only patches can be reviewed. - -And therefore, only patches can be vetoed. People can propose, purely -for discussion, whatever they like. Such proposals ＠strong{may not} be -vetoed. If somebody wants to submit a patch that's clearly against the -sense of some member of the board, let them. It will be vetoed. If -they resubmit a real revision, the reviewers must be allowed to consider -it. - -Note how this deals with the ``use the ISO standard ＠samp{size_t} type -for positive variables'' kind of issue. There's essentially only one -way to write that patch. If it is vetoed and an attempt to override -fails, the policy of the ＠value{BOARD} is clear. The patch should not -be resubmitted until there's good reason to suppose the average stance -of the board has shifted considerably. - -＠item Reviewer decisions apply to the whole patch. - -Including vetos. This makes megapatches risky, obviously. It's up -to the contributor to separate the parts; if something unacceptable is -submitted as part of the megapatch, the reviewer should not be -pressured to accept the whole, nor to do the surgery himself. If the -megapatch is that important to the project, the board should be willing -to override the veto. If the contributor can't get that support, he -must split out the acceptable parts. - -＠item Reasonable time constraints for reviewers. - -Except for global substitutions, megapatches are normally the result of -weeks, even months, of secret work; reviewers should be allowed -proportionate amounts of time to review them. If the work is done -serially via commit-and-review, or on a branch, or (with approval of the -Board) in ＠samp{#ifdef}s, then the reviewers get just as much time as -the originator does, and they have no excuse for being ``surprised'' by -the megamerge at the end. - -Note that the point of a branch here is ＠emph{not} incremental merging, -it is to make progress on the megapatch public. So this costs only the -trivial effort of committing your workspace to the branch every week or -two. (Of course the big merge at the end will still be a lot of work, -but that would be true if all the work was done in a local workspace and -never committed to a branch.) - -＠item Each resubmission of a patch restarts the clock. - -Reviewers need not work faster just because somebody has resubmitted the -patch three times. If you submit a large patch with 52 major bugs, you -had better be prepared to wait a year as it gets vetoed once a week, -once for each bug. - -＠item The submitter must revert an immediate commit if vetoed. - -If you take advantage of implicit self-approval, you have no arguments -because you've short-circuited the review process. Had the patch gone -through the full process, it never would have been applied---you're way -ahead of the game as it is. Revert the patch. - -If the veto is abusive, the abusive reviewer should be disciplined---but -showing that will take discussion, and that must happen after reversion. - -＠item A veto after commit of a fully reviewed patch must be supported. - -If a patch goes through the full submit---review---approve---commit -cycle, it may still be vetoed. However, in this case the burden of -proof should be on the vetoer. The committer ＠emph{may} refuse to -revert, and in that case, the vetoer needs two concurring vetos. This -constitutes a blocking coalition of three---the patch must be reverted -immediately, even if it seems likely that a vote of the board would back -the commit. The patch can be reapplied after the vote. - -Some patches, ie, not submitted by reviewers, need the full -submit---review---approve---commit process in any case. So if reviewers -want some assurance that their patch won't be reverted after commit, -they can take advantage of full review process (which still allows -self-approval). -＠end table +There is no formal dispute resolution procedure. -＠node XEmacs Resources on the Internet, Support Requests, The Work Flow, Top -＠chapter XEmacs Resources on the Internet +＠node Release Engineering, XEmacs Resources on the Internet, The Work Flow, Top +＠chapter Release Engineering -＠c Edited: stephen 2005-01-18 -＠strong{Write this node! Get mailing list and newsgroup information -from the ＠uref{http://www.xemacs.org/Lists/, mailing list page}, -available as the module ＠emph{xemacsweb} ＠ref{CVS Repository}. +＠strong{This node and all of its children need to be reviewed and +adapted to the XEmacs process. One topic that ＠emph{must} be addressed +is regenerating and checking in generated files.} -There should also be a node for the Emacs Wiki.} +＠cindex Release Engineering -＠cindex XEmacs Resources on the Internet +This section contains information about how the XEmacs Project releases +its products. The XEmacs Project is basically an open-access +bazaar-style organization, so it's reasonable to think of the CVS +repository as its primary product. There is no particular ``process'' +for releasing it, it's just there, continuously growing and improving. +The XEmacs Review Board tries to ensure that the CVS HEAD will build +``most of the time'' (at least, for anybody who has successfully +recently built XEmacs). Obviously, however, this can't be guaranteed. + +Note: since the website is automatically regenerated when changes are +committed to its CVS module, even it may be considered to ``live'' in +the CVS repository. + +Some developers have argued that there is no need to go beyond the CVS +repository to a formal release process. This position has some merit, +of course. However, many users and redistributors want and expect some +quality assurance. In order to satisfy this demand, XEmacs has three +independent release series, one for the ＠emph{stable} branch of the core +＠samp{xemacs} module, one for the ＠emph{development} mainline of the +core ＠samp{xemacs} module, and one for the ＠samp{packages} module (which +is currently intended to be ＠emph{stable} at all times). + +This chapter is not a specification mandated by XEmacs Project policy. +Rather, it is a description of ＠dfn{best current practices}, as +understood by Stephen Turnbull. Release policy is determined by the +release engineers. Currently (March 2005) the position of Beta Release +Engineer is open, the Stable Release Engineer is Vin Shelton, and the +Package Release Engineer is Norbert Koch. All of the release engineers +since Steve Baur (1996--1998), as well as a number of other developers +who are involved in publishing XEmacs products, make their tools +available in the ＠samp{xemacs-builds} module of the CVS repository, in +directories named after their common ＠value{XEMACSORG} email nickname. +＠ref{CVS Repository}. These tools can be considered reference +implementations of the release process. + +The next section, Release Schedule, will describe all three +distributions. The remainder will refer specifically to the core +distributions, as content and quality control of packages is generally +the responsibility of the upstream maintainers. The final section will +describe a few tasks that are specific to the package release. ＠menu -* Project Website:: -* CVS Repository:: -* comp.emacs.xemacs:: -* xemacs-beta:: -* xemacs-design:: -* xemacs-patches:: -* xemacs-mule:: -* xemacs-winnt:: +* Release Schedule:: +* Release Prerequisites:: +* Updating NEWS:: +* Updating Version Number:: +* Updating ChangeLogs:: +* Tagging Releases:: +* Creating Tarballs:: +* Creating ＠value{XEMACSORG} Releases:: +* Announce the Release:: +* Updating the Online Documentation:: +* Updating the Free Software Directories:: +* After the Release:: ＠end menu +＠node Release Schedule, Release Prerequisites, Release Engineering, Release Engineering +＠section Release Schedule +This manual does not describe a formal release schedule. However, a +major or minor release which certifies the new features in development +code base stable as a whole should be expected to take six months or +more from the time the proposal is made. + +``Micro'' or ``patchlevel'' releases take place at irregular intervals +at the discretion of the responsible release engineer. It seems +desirable for micro releases from the mainline to occur at biweekly to +monthly intervals, based on either integration of new features that need +intensive testing, or appearance of a relatively stable code base that +can be used as a baseline for testers to fall back to in the event of +destabilizing changes. In practice beta releases seem to occur much +less frequently, sometimes as far as six months apart. + +Micro releases from the stable branch should take place after +a fix for a critical bug is integrated, or after two to four months +accumulation of minor fixes and documentation improvements. This rate +is consistent with what has been observed over the 21.1 and 21.4 stable +branches. + +The packages have a different structure. The current practice is to +create a release candidate and announce it as a ``pre-release'' +immediately after patches to an individual package, then promote it to +the main package distribution after two to four weeks with no problems. +Several years' experience have shown that this pattern serves the users +very well. SUMO tarballs are generally released two to four times +annually, often after a fix to an infrastructure package such as EFS. +This system has worked extremely well. -＠node Project Website, CVS Repository, XEmacs Resources on the Internet, XEmacs Resources on the Internet -＠section Project Website -＠c Edited: stephen 2005-01-18 -＠strong{Needs review. Adrian?} +＠node Release Prerequisites, Updating NEWS, Release Schedule, Release Engineering +＠section Release Prerequisites -＠cindex Project Website -＠cindex ＠value{XEMACSORG}, XEmacs Web space +Before XEmacs can be released, that is, the CVS repository tagged and +tarballs created and uploaded, a number of prerequisites must be +satisfied. + +＠table ＠strong +＠item The NEWS file must be updated + +On the stable branch this file is called ＠file{NEWS}. On other +branches, it's named ＠file{CHANGES-＠var{branch}} (for the mainline, +＠file{CHANGES-beta}). + +＠item Version references must be verified and updated + +Specifically, the version in ＠file{version.sh} ＠emph{must} be correct or +the release will be invalid, and several engineers' scripts try to +enforce correct versioning in ＠file{CHANGES}. + +＠item Generated source files must be regenerated + +Currently the ＠dfn{generated source} files are ＠file{configure}, +＠file{src/depend}, ＠file{src/intl-auto-encap-win32.h}, and +(a)file{src/intl-auto-encap-win32.h}. Update ＠file{configure} by running +＠file{autoconf} in the root of the source tree, ＠file{src/depend} by +running ＠code{make depend} in ＠file{src}, and +(a)file{intl-auto-encap-win32.*} by running +＠code{make unicode-encapsulate} in ＠file{src}. + +``Generated source'' may seem like an oxymoron, but it's not. Files +like ＠file{configure} are intended to be portable. If ＠file{configure} +were not in CVS and the tarballs, users wishing to install XEmacs would +need to install and keep up to date ＠file{autoconf} and its libraries, and +GNU ＠file{m4}. The other generated files require ＠file{perl}. + +＠item The release candidate must build, and pass the test suite + +For a beta release, the candidate code base must build on at least the +engineer's platform since the LISP files must be compiled. If the build +does not pass ＠code{make check}, all such failures must be noted in the +release announcement. The beta release engineer is encouraged to +subject the code base to the more rigorous tests required of the stable +branch, but it's up to his judgement whether to postpone the release in +case of failures. + +A stable release candidate must build on all platforms available to +release engineer personally, as well as on any platforms used by beta +testers. The candidate should be tested under several configurations. +In particular, it should be tested with and without Mule, with TTY +support only, with Athena, Motif, and GTK support, with and without +dialogs and widgets, and with and without the union implementation of +＠samp{Lisp_Object}. The regression tests must be passed 100% in each +case. ＠emph{(At the discretion of the release engineer, an exception +may be made for failures that occur because a new test for an as-yet +unresolved defect has been added. Unpleasant, but often necessary.)} -The ＠uref{http://www.xemacs.org/, XEmacs home page} contains a brief -overview of the XEmacs project. This Web space also includes other -internal documents, such as this one. +＠end table -＠c #### this probably belongs elsewhere? this subtree is more user-oriented. -To install your updates into the XEmacs Web space at ＠value{XEMACSORG}, -simply check out the ＠file{xemacsweb} module ＠ref{CVS Repository}, make -your changes, and check it in. The commit script takes care of -generating the HTML and pushing the changes to the web servers' document -spaces. +＠node Updating NEWS, Updating Version Number, Release Prerequisites, Release Engineering +＠section Updating NEWS -＠node CVS Repository, comp.emacs.xemacs, Project Website, XEmacs Resources on the Internet -＠section CVS Repository +＠cindex NEWS +＠cindex news -＠c Edited: stephen 2005-01-18 +The NEWS file must be updated at each release. This file announces +user- and programmer-visible changes. It should not include +implementation details. In the stable branch, the NEWS file is actually +called ＠file{NEWS}, while in the mainline it is called +＠file{CHANGES-beta}. Other branches often have their own +＠file{CHANGES-＠var{branch}}. -＠cindex CVS Repository +In order to discover items appropriate for ＠file{NEWS}, several things +can be done. -＠c #### update the specific links for convenience!! -The ＠uref{http://cvs.xemacs.org/,CVS Repository} -contains several modules. You can view the repository with ViewCVS from -a link on repository's home page, and there is a link to an explanation -of how to use CVS in the CVS Repository. +＠enumerate +＠item +Use the ChangeLog. +＠item +Once a release date has been determined, the milestones leading up to +that release should be posted as news items (＠pxref{News}). -＠node comp.emacs.xemacs, xemacs-beta, CVS Repository, XEmacs Resources on the Internet -＠section The Usenet Newsgroup comp.emacs.xemacs +＠end enumerate -＠strong{Write me!} +The previous steps usually catch most items. To use a finer sieve, use +the following commands. These assume that the last release of XEmacs +package was 21.4.17. +＠example + cvs log -rr21-4-17 + cvs diff -rr21-4-17 +＠end example +See section ＠ref{Updating ChangeLogs} before checking in this file. -＠node xemacs-beta, xemacs-design, comp.emacs.xemacs, XEmacs Resources on the Internet -＠section The xemacs-beta Mailing List -＠strong{Write me!} +＠node Updating Version Number, Updating ChangeLogs, Updating NEWS, Release Engineering +＠section Updating Version Number +XEmacs version information is kept in the file +＠value{VERSIONFILE}. This file must be valid when sourced +by a POSIX shell and when included by a portable Makefile. -＠node xemacs-design, xemacs-patches, xemacs-beta, XEmacs Resources on the Internet -＠section The xemacs-design Mailing List +The first in a series of stable releases is a special case, because it +involves creation of a new stable branch and affects numbering of the +trunk as well. In the new stable branch, ＠value{VERSIONFILE} must +assign the empty value to ＠samp{emacs_is_beta}. The value ``0'' is +assigned to ＠samp{emacs_beta_version}. The next ＠emph{even} number +(which is ``0'' in the case that ＠samp{emacs_major_version} is bumped) +is assigned to ＠samp{emacs_minor_version}, and +＠samp{emacs_major_version} is bumped if that was authorized by the +XEmacs Review Board. The codename ＠samp{xemacs_codename} is assigned at +the discretion of the stable release engineer. -＠strong{Write me!} +At the same time, a new release of the trunk, identical except for +version information, is made. ＠emph{The version information is the same +as the stable release}, except that ＠samp{emacs_is_beta} is set to +＠samp{t}, ＠samp{emacs_minor_version} is bumped to the next ＠emph{odd} +integer, and ＠samp{xemacs_codename} is assigned at the discretion of the +beta release engineer. + +(New in XEmacs 21.5.20) When a release is made, the variable +＠samp{xemacs_release_date} should be set appropriately. This variable +is not used in the build process, but simply imported into LISP, where +it is used in various documentation modules, such as ＠file{about.el}. +Release engineers usually choose a theme for codenames and make the +proposed series available in a file. The name ＠samp{emacs_beta_version} +probably could have been more aptly chosen, but it is a historical relic +of the fact that it was first used in the beta series, then adopted in +the stable branch. The name is not user-visible; the value of this +variable is called the patch level in stable branch documentation. +(a)strong{N.B.} Release engineers should avoid disturbing the order of +variables in ＠value{VERSIONFILE}. The variables +＠samp{emacs_kit_version}, ＠samp{infodock_major_version}, +＠samp{infodock_minor_version}, and ＠samp{infodock_build_version} are +used for version information of various non-＠value{PROJECT} releases, +and should be ignored. Both of these features are unclean, but users' +auxiliary tools (and some tools distributed by the ＠value{PROJECT}, +including ＠file{build.el} and ＠file{build-report.el} in some releases) +often depend on the syntax of this file to work correctly. In beta +releases, there is an optional variable ＠samp{xemacs_extra_name} which +is a string that is appended to the version string. It is currently +automatically updated, and used to identify the date of a CVS checkout. -＠node xemacs-patches, xemacs-mule, xemacs-design, XEmacs Resources on the Internet -＠section The xemacs-patches Mailing List +Except in cases involving creation of a new stable branch, update of the +version information simply requires bumping ＠samp{emacs_beta_version} +(and ＠samp{xemacs_release_date} in XEmacs releases from 21.5.20) and +assignment of a new ＠samp{xemacs_codename}. -＠strong{Write me!} +＠heading Grep the sources +The version number appears in a large number of fairly random places. +The release engineer should grep the whole tree for the pattern +(a)samp{[0-9]+\.[0-9]+\.[0-9]+}, and check each hit. First, check that +the relevant text (which might be limited to a short comment in a source +file, or might be the whole file for a documentation file like +＠file{INSTALL}) is appropriate for the version to be released. Second, +check that the version number found corresponds to the text. Third, +try to regularize references (e.g., to "XEmacs 21.4.17") so that the +grep can be refined in future versions. Fourth, try to substitute +variable or macro references in executable contexts. Fifth, try to +eliminate unnecessary references to versions. -＠node xemacs-mule, xemacs-winnt, xemacs-patches, XEmacs Resources on the Internet -＠section The xemacs-mule Mailing List -＠strong{Write me!} +＠node Updating ChangeLogs, Tagging Releases, Updating Version Number, Release Engineering +＠section Updating ChangeLogs +＠cindex ChangeLog +Add a ChangeLog entry to ＠emph{every} ＠file{ChangeLog} in the tree, +marking the release. The text of the first line should match this +regexp: -＠node xemacs-winnt, , xemacs-mule, XEmacs Resources on the Internet -＠section The xemacs-winnt Mailing List +＠example +XEmacs [0-9]+$?:\.[0-9]+$+ $?:"\(\w\|\s-$+"\)? is released. +＠end example -＠strong{Write me!} +For example, +＠example +2005-03-12 Stephen J. Turnbull <stephen＠(a)xemacs.org> + * XEmacs 21.5.20 "cilantro" is released. -＠c ########################################################################## -＠c #### I haven't seriously worked on the following material. -- stephen #### -＠c ########################################################################## +＠end example -＠node Support Requests, Bugs, XEmacs Resources on the Internet, Top -＠chapter Support Requests +(Note that the ``21.5-b20'' style used by `emacs-version' in beta +XEmacsen is deprecated.) Normally this should be the ＠emph{only} text +in the ChangeLog entry. -＠cindex Support Requests +＠node Tagging Releases, Creating Tarballs, Updating ChangeLogs, Release Engineering +＠section Tagging Releases -Support requests are made to ＠value{BETA-LIST}. Developers should read -the mailing list frequently, and after a period of inactivity, browse -the ＠uref{http://list-archive.xemacs.org/xemacs-beta/,recent archives}. +＠cindex tags +＠cindex CVS, tag +＠cindex version numbers +It is critical that a snapshot of the software is created each time +the software is released. In CVS, this is performed with tags. +Every series of stable releases must have a branch tag of the form +＠i{release-M-N}. The trunk has no branch tag. Every release must have +a fixed tag of the form ＠i{rM-N-B}, where ＠var{m} is the major +number, ＠var{n} is the minor number, and ＠var{b} is the beta release or +patch number. A hyphen is used since one cannot use dots in CVS tag +names. Note the ＠var{B} is simply a number, not something like +＠samp{b1} or ＠samp{pre2} as used in the past. -＠node Bugs, Feature Requests, Support Requests, Top -＠chapter Bugs +＠c #### is it *-current-beta or *-latest-beta?? +The stable release branch tag doubles as a tag of the most recent +release. While this is not quite true during the process of +accumulating patches to the branch, due to the conservative nature of +that process it seems very unlikely to cause trouble. Since the trunk +has no tag, and many beta testers would prefer to avoid checking out in +the middle of a series of related check-ins, a fixed tag of the form +＠i{release-M-N-current-beta} is used to identify the current beta +release. It is updated by a command like ＠samp{cvs tag -F -r +release-M-N-B release-M-N-current-beta}. (N.B. It would be preferable +to use the rtag command, since that tags ＠emph{all} files, living and +dead. However, due to bugs in CVS and the current file hierarchy on our +CVS host, ＠samp{cvs rtag} does not work.) -＠c Edited: stephen 2005-01-18 +The packages have independent release schedules, determined by each +XEmacs package maintainer and the XEmacs Package Release Engineer. -＠strong{We don't have a tracker. We should. Describe what it should -look like here.} -＠cindex Bugs -＠cindex priority -＠cindex bugs, priority +＠node Creating Tarballs, Creating ＠value{XEMACSORG} Releases, Tagging Releases, Release Engineering +＠section Creating Tarballs -Bug reports, feature requests, and discussions that are expected to lead -to bug reports or feature requests are created in -＠uref{https://sourceforge.net/bugs/?group_id=13357, Bugs}. Most -bugs should be set to a priority of 5. +＠cindex Creating Tarballs +＠cindex CVS Repository +＠cindex modules +＠cindex CVS, modules +＠cindex tarballs, naming -＠cindex bug-gnu-emacs -＠cindex Debian +Besides the CVS tag, a stable release involves uploading a number of +tarballs to the primary archive at ftp.xemacs.org. -Developers should follow the ＠i{bug-gnu-emacs} mailing lists/newsgroup -and move bug reports into Bugs if it has not been done already. -Similarly, XEmacs bugs reported in other systems should be transfered to -＠value{XEMACSORG}. The bug may be cut and pasted into a new bug report, or a -URL to the source of the original bug report may be all that appears -in the bug report. +＠c The "(b-1)" below will generate a makeinfo warning. Ignore it. +＠c +In the following descriptions, ＠var{version} refers to the release +version number as an ＠samp{＠var{m}.＠var{n}.(a)var{b}} triple. +＠var{previous} refers to the previously released version, most +frequently ＠samp{＠var{m}.＠var{n}.(a)var{(b-1)}}. -A brief lifecycle of a bug proceeds something like this. A bug is -entered. A developer ensures that the Category, Priority and Group are -correct. The Group for an Open bug should be set to the version of -software in which the bug was found, or CVS if it was found in the -latest and greatest. +＠table ＠strong -The assignment of bugs in Bugs follows the honor system. If you see an -open bug that you think you could handle, assign the bug to yourself. -Bugs that remain open should be reviewed by a member of the -＠value{BOARD}, who should try to find a developer to work on the bug. +＠item full release +＠file{xemacs-(a)var{version}.tar.gz} -If you fix a bug, set the resolution to Fixed and group to CVS. Please -also assign the bug to yourself if you have not done so already, so -you get credit in the -＠uref{https://sourceforge.net/tracker/reporting/?atid=113357&what=tech&span=&period=lifespan&group_id=13357#b, -reports}. If a documentation change is not required, set the status to -Closed. If a documentation change is required, set the category to -Documentation, and assign the bug to the documentation tsar, -leave the status Open, and set the priority to 3 to set it -aside in listings sorted by priority. +The full release, containing all architecture-independent generated +files. Equivalent to the combinarion of the source-only, compiled LISP, +and prebuilt Info tarballs. -See ＠ref{File Releases} for a motivation of why this process is useful. +＠item source-only +＠file{xemacs-(a)var{version}-src.tar.gz} -The rest of this section describes the categories and groups that have -been set up for the XEmacs project. +Contains only the pristine sources. -＠menu -* Category:: -* Status:: -* Group:: -* Resolution:: -＠end menu +＠item compiled LISP +＠file{xemacs-(a)var{version}-elc.tar.gz} -＠node Category, Status, Bugs, Bugs -＠section Category +Contains the compiled LISP (＠file{.elc}) files, ready to install. -＠cindex category -＠cindex bug category +＠item prebuilt Info +＠file{xemacs-(a)var{version}-info.tar.gz} -Several categories have been created for the XEmacs project organized by -function. They include ＠i{General}, ＠i{UI}, ＠i{MIME}, ＠i{Security}, -＠i{Documentation}, and ＠i{Contrib} +Contains the Info (＠file{.info}) files, compiled from ＠file{.texi} and +ready to install. -＠table ＠b +＠item changeset +＠file{xemacs-＠var{version}-(a)var{previous}.patch.gz} -＠item General +Contains a changeset, built by the ＠file{makepatch} utility. This is a +multipurpose file. It can be run as a shell script, or applied via the +＠file{applypatch} utility. These utilities provide some features not +available in ＠file{patch} such as file renaming. Alternatively, you +may apply it with ＠file{patch} as an ordinary diff, but in rare cases +this may fail to implement file additions, deletions, and renamings. -＠cindex general bug category -＠cindex bug categories, general +＠end table -The ＠dfn{General} category is used for bugs that do not belong in any of -the other categories. +Beta releases generally provide only the full release tarball and the +changeset. -＠item UI +＠cindex tarballs, making +＠cindex tarballs, naming +＠cindex tags +＠cindex CVS, tags +＠cindex Makefile targets, dist +＠cindex version numbers -＠cindex UI bug category -＠cindex bug categories, UI +The general procedure for making a set of tarballs is -The ＠dfn{UI} category is used for bugs in the software that the user sees -such as font-lock, key definitions, menus, and customization. +＠enumerate +＠item +Check out the current version and the previous version. -＠item MIME +＠item +Use ＠file{makepatch} to create a ＠strong{changeset} file, then compress +it with ＠file{gzip}. Run ＠file{makepatch} from the directory that is +the parent of the checked-out trees. -＠cindex MIME bug category -＠cindex bug categories, MIME +＠item +Use ＠file{tar} and ＠file{gzip} to create the ＠strong{source-only} +tarball. The tarball should include the root directory of the source +tree, which should be named ＠file{xemacs-＠var{version}}. -The ＠dfn{MIME} category is used for bugs that pertain to MIME. - -＠item Security - -＠cindex security bug category -＠cindex bug categories, security - -The ＠dfn{Security} category is used for bugs in the security arena. At -present, XEmacs does not include any security code, so this category might -be used for PGP interaction. - -＠item Documentation - -＠cindex documentation bug category -＠cindex bug categories, documentation - -The ＠dfn{Documentation} category is used for bugs in the documentation -arena. In addition, if there are any code changes made as a result of a -bug report or feature request that require changes to the documentation, -the category of that issue should be set to Documentation after the bug -has been fixed or the feature implemented. Assign the issue to -＠i{wohler} for editing and/or writing of the documentation, and set -the priority to 3 to set the issue aside in listings sorted by priority. - -＠item Contrib - -＠cindex contrib bug category -＠cindex bug categories, contrib - -The ＠dfn{Contrib} category is used for all bugs in the contributed -software. - -＠end table +＠item +Build the release, configuring ＠samp{--with-mule} (in releases 21.5.20 +and later, this option has been renamed ＠samp{--enable-mule} to conform +to Autoconf 2.5x conventions). The build must be done with Mule, as a +no-Mule XEmacs will not (and cannot) compile the Mule LISP files. -＠node Status, Group, Category, Bugs -＠section Status +＠item +Use ＠file{tar} and ＠file{gzip} to create the ＠strong{full release}, +＠strong{compiled LISP}, and ＠strong{prebuilt Info} tarballs. The +tarball should include the root directory of the source tree, which +should be named ＠file{xemacs-＠var{version}}. The ＠strong{compiled LISP} +and ＠strong{prebuilt Info} tarballs need include only the +＠file{xemacs-＠var{version}/lisp} and ＠file{xemacs-＠var{version}/info} +subtrees, respectively. -＠cindex status -＠cindex bug status +＠item +PGP sign all products. +＠end enumerate -The bug ＠dfn{status} is divided into four sections: ＠i{Open}, -＠i{Closed}, ＠i{Deleted} and ＠i{Pending}. +For more details, see the release scripts used by Steve Youngs, Vin +Shelton, Stephen Turnbull, and Martin Buchholz in the ＠file{youngs}, +＠file{acs}, ＠file{stephen}, and ＠file{martin} subdirectories of the +＠file{xemacs-builds} CVS module. When in doubt, Martin's scripts should +be considered canonical. -＠table ＠b -＠item Open -＠cindex open bug status -＠cindex bug status, open +＠node Creating ＠value{XEMACSORG} Releases, Announce the Release, Creating Tarballs, Release Engineering +＠section Creating ＠value{XEMACSORG} Releases -When bugs are initially created, they are marked ＠dfn{Open}. +＠cindex Creating ＠value{XEMACSORG} Releases +＠cindex releases +＠cindex tarballs, making -＠cindex discussing bugs -＠cindex bugs, discussing -＠cindex features, discussing +＠enumerate +＠item +Create the tarballs, changeset, and PGP signatures +(＠pxref{Creating Tarballs}). -The Bugs and Feature Requests sections are also used as a method to -get the ball rolling among developers. They are used to register what -we feel we should work on. For example, a developer may have questions -about the way XEmacs handles MIME that we should discuss before we -attempt to fix it: What do other people do? How should we attack this? -That developer opens a bug report in the MIME category and a -discussion ensues. Once the disposition of the issue is resolved, the -bug is assigned to a developer. Later, when the bug is fixed, the bug -can be closed. +＠item +Upload the tarballs, changeset, and PGP signatures to a temporary +subdirectory of the release directory on ftp.xemacs.org. (You will need +an account on tux.org, our host.) For the mainline, the release +directory is ＠file{ftp://ftp.xemacs.org/pub/xemacs/beta}, and for the +stable branch, it is ＠file{ftp://ftp.xemacs.org/pub/xemacs/stable}. -Discussion about entirely new features should be opened in the Feature -Requests section (＠pxref{Feature Requests}) but otherwise handled in -the same way. +＠item +Check the PGP signatures. -＠item Closed +＠item +Move the products into the release directory. -＠cindex closed bug status -＠cindex bug status, closed +＠item +Remove any existing ``LATEST IS'' files, and touch +＠file{LATEST-IS-＠var{version}} and ＠file{LATEST.IS.＠var{version}}. -When all aspects of a bug have been fixed, including code and -documentation, the bug is marked ＠dfn{Closed}. +＠item +Update the files ＠file{README} and ＠file{.message} in +＠file{ftp://ftp.xemacs.org/pub/xemacs}. +＠end enumerate -When setting the status to Closed, the group should be set to Fixed, -Works For Me, Invalid, or Rejected. -＠item Pending -＠cindex pending bug status -＠cindex bug status, pending +＠node Announce the Release, Updating the Online Documentation, Creating ＠value{XEMACSORG} Releases, Release Engineering +＠section Announce the Release -You can set the status to ＠dfn{Pending} if you are waiting for a -response from the tracker item author. When the author responds, the -status is automatically reset to that of Open. Otherwise, if the -author doesn't respond within 14 days, then the item is given a status -of Deleted. +＠cindex Announce the Release -＠item Deleted +Now that the release is ready for download, announce it as described +in ＠xref{News}. -＠cindex deleted bug status -＠cindex bug status, deleted +＠node Updating the Online Documentation, Updating the Free Software Directories, Announce the Release, Release Engineering +＠section Updating the Online Documentation -If an items has been marked Pending, it will be marked ＠dfn{Deleted} -if the author of the item does not respond within 14 days. +＠strong{Adrian, please review.} -＠end table +＠cindex Updating the Online Documentation +＠cindex online documentation, updating +＠cindex documentation, updating online +＠cindex CVS, update -＠node Group, Resolution, Status, Bugs -＠section Group +The entire XEmacs web site is kept in CVS, and automatically rebuilt by +the commit trigger. -＠cindex group -＠cindex bug group +Thus, the basic procedure is similar to working on XEmacs source code. -The bug ＠dfn{group} contains several items. They include: +＠enumerate +＠item +Check out the ＠samp{xemacsweb} module. -＠table ＠b +＠item +Make the needed changes. -＠item None +＠item +Update the ChangeLog(s). -Bugs are initially filed in this group. +＠item +Test the changes with ＠code{make} to ensure that all ＠file{genpage} +commands are correct. Then use ＠code{make validate} to check that the +produced HTML is reasonably correct. -＠item CVS* +＠item +Commit the workspace. +＠end enumerate -Bugs in groups starting with CVS have either been found in the CVS -version (in contrast to a released version) if the Status is Open, or -they have been fixed and checked in if the Resolution is Fixed. +The XEmacs online documentation is mostly written in the ＠file{genpage} +language, which ensures a consistent interface for internal links via +special commands processed by the ＠code{genpage} script, and a +consistent overall format enforced by use of template files. Some of +the material, such as the online versions of the ＠emph{XEmacs User's +Guide} is generated directly from Texinfo, and checked in to CVS as HTML +rather than ＠file{genpage} source. -After fixing a bug in a beta release, however, developers should not -set the group to CVS but leave it in the group named for the beta -release. Just be sure to mention the issue number in the ChangeLog so -that it can be noted in the next release announcement. +The validator used by ＠code{make validate} is based on the PSGML +package. It is not perfect, but it is more convenient than the more +accurate online validators provided by the W3C and others. The +webmaster should use the online validators and link checkers regularly. -＠item mh-e* -Bugs in groups starting with mh-e have either been found in the given -version if the Status is Open, or fixed in the given version if the -Status is Closed. -＠end table +＠node Updating the Free Software Directories, After the Release, Updating the Online Documentation, Release Engineering +＠section Updating the Free Software Directories -＠node Resolution, , Group, Bugs -＠section Resolution +＠strong{Add FreshMeat, at least.} -A bug can appear in various states: +Update the ＠i{source-tarball} and ＠i{version} fields in the FSF/UNESCO +Free Software Directory (＠pxref{Free Software Directories}), as well as +the ＠i{touched} field. Update any other fields as necessary, including +the ＠i{updated} field. -＠table ＠b +＠node After the Release, , Updating the Free Software Directories, Release Engineering +＠section After the Release -＠item Accepted +＠cindex After the Release -＠cindex accepted resolution -＠cindex resolution, accepted +Get ready for the next one! -The ＠dfn{Accepted} resolution means that QA has accepted the fix. -Since we don't have a QA department, it is unlikely that this will be -used in that fashion. Instead, it can be used to indicate that a -developer feels that a feature request (that someone else posted) has -merit. -＠item Duplicate -＠cindex duplicate resolution -＠cindex resolution, duplicate +＠node XEmacs Resources on the Internet, Support Requests, Release Engineering, Top +＠chapter XEmacs Resources on the Internet -The ＠dfn{Duplicate} resolution means that this bug is a duplicate of -another. The status may be set to Closed. Be sure to add a note which -mentions the bug number that this bug is a duplicate of. If this bug -has some good information in it, the URL to this bug should be added -to the duplicate. +＠strong{Write this node! Get mailing list and newsgroup information +from the ＠uref{http://www.xemacs.org/Lists/, mailing list page}, +available as the module ＠emph{xemacsweb} ＠ref{CVS Repository}. -＠item Fixed +There should also be a node for the Emacs Wiki.} -＠cindex fixed resolution -＠cindex resolution, fixed +＠cindex XEmacs Resources on the Internet -The ＠dfn{Fixed} group is used to indicate a bug or feature request that -has been fixed. +＠menu +* The xemacs.org Domain:: +* Project Website:: +* CVS Repository:: +* The comp.emacs.xemacs Newsgroup:: +* XEmacs Mailing Lists:: +＠end menu -＠item Invalid -＠cindex not a bug resolution -＠cindex invalid resolution -＠cindex resolution, not a bug -＠cindex resolution, invalid -The ＠dfn{Invalid} resolution is used to indicate the problem is with -the user. In other words, this is not a bug. See Works For Me. +＠node The xemacs.org Domain, Project Website, XEmacs Resources on the Internet, XEmacs Resources on the Internet +＠section -＠item Later +The xemacs.org domain is registered to Sandy Wambold, <sandy＠(a)xemacs.org>. -＠cindex later resolution -＠cindex resolution, later +The domain management services (DNS and MX) are provided by Tux.org. +The configurations are maintained by XEmacs, and installed via +＠file{sudo}. -The ＠dfn{Later} resolution is similar to the Postponed group, although -it connotates a longer delay. -＠item Out of Date -＠cindex out of date resolution -＠cindex resolution, out of date -The ＠dfn{Out of Date} resolution is similar to the term OBE (Overcome -By Events). In other words, the bug has not been fixed, but the code -has changed in ways that make it unnecessary to do so. +＠node Project Website, CVS Repository, The xemacs.org Domain, XEmacs Resources on the Internet +＠section Project Website -＠item Postponed +＠strong{Needs review. Adrian?} -＠cindex postponed resolution -＠cindex resolution, postponed +＠cindex Project Website +＠cindex ＠value{XEMACSORG}, XEmacs Web space -The ＠dfn{Postponed} resolution is similar to the Later group, although -it connotates a lesser delay. +The ＠uref{http://www.xemacs.org/, XEmacs home page} contains a brief +overview of the XEmacs project. This Web space also includes other +internal documents, such as this one. -＠item Rejected +＠c #### this probably belongs elsewhere? this subtree is more user-oriented. +To install your updates into the XEmacs Web space at ＠value{XEMACSORG}, +simply check out the ＠file{xemacsweb} module ＠ref{CVS Repository}, make +your changes, and check it in. The commit script takes care of +generating the HTML and pushing the changes to the web servers' document +spaces. -＠cindex rejected resolution -＠cindex resolution, rejected -The ＠dfn{Rejected} resolution means that QA has rejected the fix. -Since we don't have a QA department, it is unlikely that this will be -used in that fashion. Instead, it can be used to indicate that a -developer feels that a feature request does not have merit. -＠item Remind +＠node CVS Repository, The comp.emacs.xemacs Newsgroup, Project Website, XEmacs Resources on the Internet +＠section CVS Repository -＠cindex remind resolution -＠cindex resolution, remind +＠cindex CVS Repository -The ＠dfn{Remind} resolution is similar to the Postponed and Later -groups, although it connotates an even lesser delay. +＠c #### update the specific links for convenience!! +The ＠uref{http://cvs.xemacs.org/,CVS Repository} +contains several modules. You can view the repository with ViewCVS from +a link on repository's home page, and there is a link to an explanation +of how to use CVS in the CVS Repository. The repository is hosted by +SunSITE.dk. -＠item Wont Fix +＠strong{Somebody, write me! We especially need cvsaccess.html and a +description of each module here.} -＠cindex wont fix resolution -＠cindex resolution, wont fix -The ＠dfn{Wont Fix} resolution means that the XEmacs developers -acknowledge that the bug exists but are not going to fix it. Or the -developers will not implement a feature request. There is probably a -good reason for these things. -＠item Works For Me +＠node The comp.emacs.xemacs Newsgroup, XEmacs Mailing Lists, CVS Repository, XEmacs Resources on the Internet +＠section The Usenet Newsgroup comp.emacs.xemacs -＠cindex irreproducible resolution -＠cindex resolution, irreproducible -＠cindex works for me resolution -＠cindex resolution, works for me +＠strong{Somebody, write me!} -The ＠dfn{Works For Me} group is used to indicate a bug that cannot be -reproduced (irreproducible) and therefore cannot be fixed. See -Invalid. -＠end table -＠node Feature Requests, Patch Queue, Bugs, Top -＠chapter Feature Requests +＠node XEmacs Mailing Lists, , The comp.emacs.xemacs Newsgroup, XEmacs Resources on the Internet +＠section XEmacs Mailing Lists -＠c Edited: stephen 2005-01-18 +The XEmacs mailing lists are managed using the Mailman list management +package, archived and indexed with MHonArc, spam-filtered with procmail, +SpamAssassin, and locally-developed Mailman Handlers, and hosted on +Tux.org's hardware and Internet connection. -＠cindex Feature Requests +＠menu +* Maintaining the Mailing Lists:: +* xemacs-announce:: +* xemacs-beta:: +* xemacs-cvs:: +* xemacs-buildreports:: +* xemacs-design:: +* xemacs-mule:: +* xemacs-patches:: +* xemacs-review:: +* xemacs-winnt:: +＠end menu -Developers should check the -＠uref{https://sourceforge.net/patch/?group_id=13357, Feature Requests} -occasionally for new feature requests and comment on the feature's -usefulness and integrity. Unless a positive comment has -＠c #### define "reasonable" -been added within a ``reasonable'' amount of time, a member of the -＠value{BOARD} -may set the status to Closed and the group to Wont Fix. ＠value{BOARD} -members should regularly check the list of requested features and prune -the oldest in this way to keep the list to a reasonable size. -＠c mh-e-devguide sez: -＠c will set the status to Closed and the group to Wont Fix. If the -＠c feature request is not closed, anyone may assign the request to -＠c themselves and implement the feature. -After incorporating the feature, update the feature request as -described in the previous section (＠pxref{Bugs}). -＠node Patch Queue, File Releases, Feature Requests, Top -＠chapter Patch Queue +＠node Maintaining the Mailing Lists, xemacs-announce, XEmacs Mailing Lists, XEmacs Mailing Lists +＠subsection Maintaining the Mailing Lists -＠c Edited: stephen 2005-01-18 +The XEmacs mailing lists are managed with GNU Mailman, procmail, +SpamAssassin, and MHonArc. -＠cindex Patch Queue +＠heading The Life-Cycle of a Post -Developers should check ＠value{PATCHES-LIST} -occasionally for new patches and comment on the patch's usefulness and -integrity. This will greatly help reviewers to review patches. Note -that developers who are active in commenting on patches and bug reports -are the main candidates when recruiting new reviewers. +The following discussion presumes a fair familiarity with the software +used, both in general (MTAs, MLMs, etc) and the specific software used +by XEmacs (sendmail, procmail, GNU Mailman, etc.) -＠c Legally speaking, patches that are less than 15 lines can usually be -＠c incorporated, although it is always best to try to incorporate them in -＠c a ``clean room'' environment. Do read -＠c ＠uref{http://www.gnu.org/prep/maintain_6.html#SEC6, Legally -＠c Significant Changes} for the details. +Let's follow a post to XEmacs Beta (which gets the heaviest traffic of +XEmacs mailing lists). It originates at some user's MUA, gets processed +by their MTA, which gets our MX from the DNS. The post is delivered to +＠file{sendmail} on mail.xemacs.org (actually, gwyn.tux.org in drag), +which passes it through a greylisting milter, checks for some RBLs, and +a milter for ClamAV. +Then it sends the post to an alias for ＠code{xemacweb＠(a)xemacs.org}, +which uses ＠file{formail} to tag the post with a private header naming +the destination list, then passes the post through ＠file{procmail}. +＠file{procmail} in turn passes the post to ＠file{spamc} for filtering, +then checks SpamAssassin's report, as well as a large number of +hardcoded recipes for spam. If the post survives these checks, procmail +forwards it to Mailman. Most spam is simply dropped on the floor, but a +significant amount (several score posts per day) is diverted (see the +section on ``Handling Spam'' below). +Mailman passes the post through a variant of its standard pipeline, +including a couple of XEmacs-specific Handlers. The +(a)file{XEmacsSource.py} handler checks for spam that attempts to +short-circuit the pipeline. The ＠file{XEmacsArchiver.py} handler +archives the post by piping it to a Perl script originally from +majordomo called ＠file{archive2-y2k.pl} in +＠file{/opt/archives/majordomo} (if I recall correctly). +＠c #### CHECK!! +The archives themselves are simply mbox files in +＠file{/opt/archives/majordomo/xemacs}. +＠c #### CHECK!! -＠node File Releases, News, Patch Queue, Top -＠chapter File Releases +The web archive and indices are automatically generated by a cron job +that runs ＠file{MHonArc} and ＠file{glimpseindex} once per day. The +archives live in ＠file{/httpd/xemacs/list-archive}. +＠c #### CHECK!! +The MHonArc and glimpse configuration files are dotfiles in the archive +directories. +＠c #### CHECK!! -＠c Edited: stephen 2005-01-18 +XEmacs MXes are provided by mail.xemacs.org and extundo.org, courtesy of +Simon Josefsson. -＠strong{This node and all of its children need to be reviewed and -adapted to the XEmacs process. One topic that ＠emph{must} be addressed -is regenerating and checking in generated files.} +Most of the software is maintained by Tux.org. Specifically, Tux +provides up-to-date versions ＠file{sendmail} and its milters, +＠file{procmail} and its subsidiary utilities (particularly +＠file{formail}), ＠file{spamassassin}, ＠file{spamd}, and ＠file{spamc} +(the SpamAssassin suite is way out of date as of 2006/08/12), GNU +Mailman, MHonArc, the glimpse suite, ＠file{named} (BIND 9), and the +Apache ＠file{httpd}, as well as ＠file{perl} and ＠file{python}. Problems +with any of these must be resolved by Tux personnel, who can be reached +at the ＠email{administrators＠(a)tux.org, Tux Administrators} mailing list. -＠cindex File Releases +XEmacs provides and maintains ＠file{archive-y2k.pl}, ＠file{namazu} (an +indexing system, not currently implemented for the list archives), and +＠file{xemacs} itself. The xemacs.org virtual host configuration is also +handled by XEmacs. XEmacs virtual users are configured in the +＠file{/etc/mail/xemacs/virtusertable-xemacs} file, and installed by +running ＠code{make} in ＠file{/etc/mail}. This implicitly runs +＠file{sudo}; the necessary privileges are extended to XEmacs postmasters +by Tux. Aliases are configured in +＠file{/etc/mail/xemacs/aliases-xemacs}, and installed by running +＠code{sudo /usr/bin/newaliases}. -This section contains information about how the XEmacs project releases -software. In additional to making tarballs available, the software and -documentation must be incorporated into Emacs and the online -documentation must be updated. +Mailman has the usual set of aliases. Mailman itself is administered by +Tux. The XEmacs Handlers are maintained by XEmacs, and there is a +script in ＠code{/space/mailman} to restart the Mailman qrunners if the +Handlers are modified. ＠code{sudo} privilege is required. +＠c #### get the name of the script! -＠menu -* Release Schedule:: -* Release Prerequisites:: -* Updating NEWS:: -* Updating README:: -* Updating Version Number:: -* Updating ChangeLogs:: -* Tagging Releases:: -* Creating Tarballs:: -* Creating ＠value{XEMACSORG} Releases:: -* Updating the Tracker:: -* Announce the Release:: -* Updating the Emacs Repository:: -* Updating the Debian Package:: -* Updating the XEmacs Package:: -* Updating the Online Documentation:: -* Updating the Free Software Directories:: -* After the Release:: -＠end menu +Everything else runs as an appropriate user, and files are editable by +either members of the ＠samp{mailman} group, the ＠samp{xemacadm} group, +or the ＠samp{xemacweb} user. -＠node Release Schedule, Release Prerequisites, File Releases, File Releases -＠section Release Schedule +＠heading Handling Spam -＠c Edited: stephen 2005-01-18 +XEmacs lists are publicly advertised and open-post, and the archives are +publicly accessible. This results in fairly high levels of spam +directed at our lists. So far we've resisted the temptation to knuckle +under to the spammers by closing lists, ＠emph{etc.}. (Admittedly, a big +reason is the elderly Rube Goldberg contraption we use to manage the +lists, most of whose components don't support effective spam filtering.) -＠strong{Totally bogus for XEmacs historical practice, probably totally -unrealistic as future policy.} +The first line of defense is sendmail milters, administered by Tux.org. +These include the ClamAV virus scanner and a greylisting milter. -Here is a suggested schedule for a release: +A sendmail alias forwards each list's mail to the ＠samp{xemacweb} user, +which has a 4-stage ＠file{.procmailrc}. In the first stage, procmail +examines the message headers, and a few automatically approved posts are +directly forwarded to Mailman, while a large number of certified spams +are sent to the bitbucket. In the second stage, procmail filters the +post with ＠file{spamc}, and the ＠samp{X-Spam-Status} header is checked +for various conditions, and appropriate action taken. In the third +stage, procmail scans the message body for spam spoor that SpamAssassin +misses. In the fourth stage, procmail parses out the mailing list from +the ＠samp{X-XEmacs-List} header, and forwards the mail to an alias for +the Mailman wrapper. -＠quotation -＠multitable ＠columnfractions .3 .3 .4 +Besides some standard filters in Mailman itself, there is an +XEmacs-specific Handler ＠file{XEmacsSource.py}. +Basically this handler performs some extra checking for implicit +addresses (the list's posting address is not visible in the addressee +headers), and holds posts that don't satisfy the criterion. This is +necessary because the aliases for the Mailman wrapper are visible from +the outside, and a lot of spam simply bypassed the procmail and +SpamAssassin checks! Spam trapped by this handler is held for +moderation. It can be recognized by the reasons for hold in the Mailman +administration web interface, which are ``injected into the pipeline at +the wrong point'' and ``headers not consistent with this list''. -＠item ＠strong{Time} -＠tab ＠strong{Milestone} -＠tab ＠strong{Description} - -＠item T-4 weeks -＠tab Soft Freeze -＠tab -All P7 and higher features must be committed. -P6 features should be committed. -Any other new features destined for the release must be committed no -later than this time. -However, note that it is advisable not to release new user-visible -features this late in the game. It is better to add new features at -the beginning of a release cycle to allow for suitable usability -testing. -Testing commences. - -＠item T-3 weeks -＠tab Hard Freeze -＠tab -All P7 and higher bug fixes must be committed. -P6 bug fixes should be committed. -Testing continues. - -＠item T-2 weeks -＠tab Beta 1 -＠tab -Cut beta release. -Upload to ＠value{XEMACSORG}. - -＠item T-1 weeks -＠tab Beta 2 -＠tab -Cut beta release. -Upload to ＠value{XEMACSORG}. - -＠item T-0 weeks -＠tab Release! -＠tab -Cut release. -Upload to ＠value{XEMACSORG}. +Note that what we should do is fold the procmail filtering and archive +processing into the Mailman pipeline. This isn't too hard conceptually +In fact, with a little care we should be able to dispense with the +procmail invocation altogether, since procmail recipes are quite +straightforward to implement in Python. This might even decrease the +computational burden, as Mailman's qrunner daemons are long-lived +processes, so both the fork tax and the burden of compiling the regular +expressions will be amortized over hundreds, thousands, or more posts. -＠end multitable -＠end quotation -Once a release date has been determined, the milestones leading up to -that release should be posted as a news item (＠pxref{News}). -With frequent minor releases, omit the beta releases and -pre-announcement. +＠node xemacs-announce, xemacs-beta, Maintaining the Mailing Lists, XEmacs Mailing Lists +＠subsection The xemacs-announce Mailing List -＠node Release Prerequisites, Updating NEWS, Release Schedule, File Releases -＠section Release Prerequisites +＠strong{Somebody, write me!} -＠c Edited: stephen 2005-01-18 only to fix a makeinfo error -＠cindex Release Prerequisites -＠cindex Coding Conventions -＠cindex Emacs Lisp Coding Conventions -＠cindex Conventions, verification -＠cindex Verification, conventions -＠c #### is this relevant? -The first thing to do is to check the code for coding convention -compliance as described in section ＠ref{Philosophy}. +＠node xemacs-beta, xemacs-buildreports, xemacs-announce, XEmacs Mailing Lists +＠subsection The xemacs-beta Mailing List -Next, check for Emacs changes to XEmacs as described in section -＠ref{Updating the Emacs Repository}. +＠strong{Somebody, write me!} -＠node Updating NEWS, Updating README, Release Prerequisites, File Releases -＠section Updating NEWS -＠cindex NEWS -＠cindex news -＠cindex src -＠cindex Debian -When the ＠code{src} module is released (＠pxref{CVS Repository}), the -file ＠file{NEWS} needs to be updated. Separate the old news with -the new with a ＠kbd{C-l} and follow the existing format for -documenting user-visible changes only including New Features, New -Variables, and Bug Fixes. List ＠value{XEMACSORG} issues as ＠code{(closes SF -#123456)}, as well as third-party issues such as ＠code{(closes SF -#123456, Debian #123456)}. +＠node xemacs-buildreports, xemacs-cvs, xemacs-beta, XEmacs Mailing Lists +＠subsection The xemacs-buildreports Mailing List -In order to find what is appropriate for ＠file{NEWS}, several -things can be done. +＠strong{Somebody, write me!} -＠enumerate -＠item -Go to ＠uref{https://sourceforge.net/bugs/?group_id=13357, Bugs} and -search for all bugs whose status is Closed and group is CVS (no -documentation update needed) or status is Open, group is CVS, and -category is Documentation (documentation update needed but not -finished). -＠item -Repeat for -＠uref{https://sourceforge.net/tracker/?atid=363357&group_id=13357, -Feature Requests}. +＠node xemacs-cvs, xemacs-design, xemacs-buildreports, XEmacs Mailing Lists +＠subsection The xemacs-cvs Mailing List -＠item -＠cindex release-utils -Run the ＠code{release-utils --variable-changes ＠var{previous-tag}} to -produce a list of new and deleted variables suitable for inclusion in -＠file{NEWS}. +＠strong{Somebody, write me!} -＠item -Run ＠kbd{C-h m} in MH Folder and MH Letter modes in both the new and -old versions to show the key binding changes. -＠item -Search for ＠code{[0-9][0-9][0-9][0-9][0-9][0-9]} in the -＠file{ChangeLog} to get a list of SF numbers. -＠item -Use the ChangeLog. +＠node xemacs-design, xemacs-mule, xemacs-cvs, XEmacs Mailing Lists +＠subsection The xemacs-design Mailing List -＠end enumerate +＠strong{Somebody, write me!} -The previous steps usually catch most items. To use a finer sieve, use -the following commands. These assume that the last version of the XEmacs -package was 6.0. -＠example - cvs log -rmh-e-6_0 - cvs diff -rmh-e-6_0 -＠end example -See section ＠ref{Updating ChangeLogs} before checking in this file. +＠node xemacs-mule, xemacs-patches, xemacs-design, XEmacs Mailing Lists +＠subsection The xemacs-mule Mailing List -＠node Updating README, Updating Version Number, Updating NEWS, File Releases -＠section Updating README +＠strong{Somebody, write me!} -＠cindex README -Ensure that the target Emacs version is correct, as well as the -supported Emacs versions. -Update the version number in various places in the INSTALL section. +＠node xemacs-patches, xemacs-review, xemacs-mule, XEmacs Mailing Lists +＠subsection The xemacs-patches Mailing List -See section ＠ref{Updating ChangeLogs} before checking in this file. +＠strong{Somebody, write me!} -＠node Updating Version Number, Updating ChangeLogs, Updating README, File Releases -＠section Updating Version Number -＠set VERSIONFILE ＠file{$＠{srcdir(a)}/version.sh} -XEmacs version information is kept in the file -＠value{VERSIONFILE}. This file must be valid when sourced -by a POSIX shell and when included by a portable Makefile. +＠node xemacs-review, xemacs-winnt, xemacs-patches, XEmacs Mailing Lists +＠subsection The xemacs-review Mailing List -The first in a series of stable releases is a special case, because it -involves creation of a new stable branch and affects numbering of the -trunk as well. In the new stable branch, ＠value{VERSIONFILE} must -assign the empty value to ＠samp{emacs_is_beta}. The value ``0'' is -assigned to ＠samp{emacs_beta_version}. The next ＠emph{even} number -(which is ``0'' in the case that ＠samp{emacs_major_version} is bumped) -is assigned to ＠samp{emacs_minor_version}, and -＠samp{emacs_major_version} is bumped if that was authorized by the -XEmacs Review Board. The codename ＠samp{xemacs_codename} is assigned at -the discretion of the stable release engineer. +＠strong{Somebody, write me!} -At the same time, a new release of the trunk, identical except for -version information, is made. ＠emph{The version information is the same -as the stable release}, except that ＠samp{emacs_minor_version} is bumped -to the next ＠emph{odd} integer, and ＠samp{xemacs_codename} is assigned -at the discretion of the beta release engineer. -Release engineers usually choose a theme for codenames and make the -proposed series available in a file. The name ＠samp{emacs_beta_version} -probably could have been more aptly chosen, but it is a historical relic -of the fact that it was first used in the beta series, then adopted in -the stable branch. The name is not user-visible; the value of this -variable is called the patch level in stable branch documentation. -(a)strong{N.B.} Release engineers should avoid disturbing the order of -variables in ＠value{VERSIONFILE}. The variables -＠samp{emacs_kit_version}, ＠samp{infodock_major_version}, -＠samp{infodock_minor_version}, and ＠samp{infodock_build_version} are -used for version information of various non-＠value{PROJECT} releases, -and should be ignored. Both of these features are unclean, but users' -auxiliary tools (and some tools distributed by the ＠value{PROJECT}, -including ＠file{build.el} and ＠file{build-report.el} in some releases) -often depend on the syntax of this file to work correctly. In beta -releases, there is an optional variable ＠samp{xemacs_extra_name} which -is a string that is appended to the version string. It is currently -automatically updated, and used to identify the date of a CVS checkout. +＠node xemacs-winnt, , xemacs-review, XEmacs Mailing Lists +＠subsection The xemacs-winnt Mailing List -Except in cases involving creation of a new stable branch, update of the -version information simply requires bumping ＠samp{emacs_beta_version} -and assignment of a new ＠samp{xemacs_codename}. +＠strong{Somebody, write me!} -＠node Updating ChangeLogs, Tagging Releases, Updating Version Number, File Releases -＠section Updating ChangeLogs -＠cindex ChangeLog +＠c ########################################################################## +＠c #### I haven't seriously worked on the following material. -- stephen #### +＠c ########################################################################## -Add a ChangeLog entry to ＠emph{every} ChangeLog in the tree, marking the -release. The text of the first line should match this regexp: +＠node Support Requests, Bugs, XEmacs Resources on the Internet, Top +＠chapter Support Requests -＠example -XEmacs \d+$?:\.\d+$+$?:-b\d+$?$?:"\(\w\|\s-$+"\)? is released -＠end example +＠cindex Support Requests -＠node Tagging Releases, Creating Tarballs, Updating ChangeLogs, File Releases -＠section Tagging Releases +Support requests are made to ＠value{BETA-LIST}. Developers should read +the mailing list frequently, and after a period of inactivity, browse +the ＠uref{http://list-archive.xemacs.org/xemacs-beta/,recent archives}. -＠cindex tags -＠cindex CVS, tag -＠cindex version numbers -It is critical that a snapshot of the software is created each time -the software is released. In CVS, this is performed with tags. -Every series of stable releases must have a branch tag of the form -＠i{release-M-N}. The trunk has no branch tag. Every release must have -a fixed tag of the form ＠i{release-M-N-B}, where ＠var{M} is the major -number, ＠var{N} is the minor number, and ＠var{B} is the beta release or -patch number. A hyphen is used since one cannot use dots in CVS tag -names. +＠node Bugs, Feature Requests, Support Requests, Top +＠chapter Bugs -The stable release branch tag doubles as a tag of the most recent -release. While this is not quite true during the process of -accumulating patches to the branch, due to the conservative nature of -that process it seems very unlikely to cause trouble. Since the trunk -has no tag, and many beta testers would prefer to avoid checking out in -the middle of a series of related check-ins, a fixed tag of the form -＠i{release-M-N-current-beta} is used to identify the current beta -release. It is updated by a command like ＠samp{cvs rtag -F -r -release-M-N-B release-M-N-current-beta}. +＠strong{We don't have a tracker. We should. Describe what it should +look like here. References to ``The Tracker'' below were originally to +the MH-E tracker on SourceForge, since the MH-E developers' guide is +where this text came from.} -The packages have independent release schedules, determined by the -XEmacs package maintainer and the XEmacs Package Release Engineer. +＠cindex Bugs +＠cindex priority +＠cindex bugs, priority +Bug reports, feature requests, and discussions that are expected to lead +to bug reports or feature requests are created in The Tracker. Most +bugs should be set to a priority of 5. -＠node Creating Tarballs, Creating ＠value{XEMACSORG} Releases, Tagging Releases, File Releases -＠section Creating Tarballs +＠cindex xemacs-beta -＠cindex Creating Tarballs -＠cindex CVS Repository -＠cindex modules -＠cindex CVS, modules -＠cindex tarballs, naming +Developers should follow the ＠i{xemacs-beta} mailing lists/newsgroup +and move bug reports into Bugs if it has not been done already. +Similarly, XEmacs bugs reported in other systems should be transferred to +The Tracker. The bug may be cut and pasted into a new bug report, or a +URL to the source of the original bug report may be all that appears +in the bug report. -The modules in the CVS Repository (＠pxref{CVS Repository}) map to the -distribution tarballs as follows: +A brief lifecycle of a bug proceeds something like this. A bug is +entered. A developer ensures that the Category, Priority and Group are +correct. The Group for an Open bug should be set to the version of +software in which the bug was found, or CVS if it was found in the +latest and greatest. -＠quotation -＠multitable ＠columnfractions .4 .6 +The assignment of bugs in Bugs follows the honor system. If you see an +open bug that you think you could handle, assign the bug to yourself. +Bugs that remain open should be reviewed by a member of the +＠value{BOARD}, who should try to find a developer to work on the bug. -＠item ＠strong{Module} -＠tab ＠strong{Tarball} +If you fix a bug, set the resolution to Fixed and group to CVS. Please +also assign the bug to yourself if you have not done so already, so +you get credit in The +Tracker reports. If a documentation change is not required, set the status to +Closed. If a documentation change is required, set the category to +Documentation, and assign the bug to the documentation tsar, +leave the status Open, and set the priority to 3 to set it +aside in listings sorted by priority. -＠item src -＠tab mh-e-M.N.tgz +See ＠ref{Release Engineering} for a motivation of why this process is useful. -＠item doc -＠tab mh-e-doc-M.N.tgz +The rest of this section describes the categories and groups that might +be set up for the XEmacs project. Someday, when we get a tracker. -＠item contrib -＠tab mh-e-contrib-M.N.tgz +＠menu +* Category:: +* Status:: +* Group:: +* Resolution:: +＠end menu -＠end multitable -＠end quotation +＠node Category, Status, Bugs, Bugs +＠section Category -＠cindex tarballs, making -＠cindex tarballs, naming -＠cindex tags -＠cindex CVS, tags -＠cindex Makefile targets, dist -＠cindex version numbers +＠cindex category +＠cindex bug category -The tarballs listed in the table above are built as follows: +Several categories have been found useful in another project. They are +organized by +function. They include ＠i{General}, ＠i{UI}, ＠i{Security}, +＠i{Documentation}, and ＠i{Contrib}. -＠itemize +＠table ＠b -＠cindex CVS, co +＠item General -＠item If ＠var{module} has not been checked out -already, check it out: +＠cindex general bug category +＠cindex bug categories, general -＠example -export CVS_RSH=ssh -cvs -d -z3 $USER＠＠cvs.mh-e.sourceforge.net:/cvsroot/mh-e co -r ＠var{release} ＠var{module} -＠end example +The ＠dfn{General} category is used for bugs that do not belong in any of +the other categories. -＠item If ＠var{module} has been checked out -already, set the sticky tag for the release: +＠item UI -＠example -cvs update -r ＠var{release} -＠end example +＠cindex UI bug category +＠cindex bug categories, UI -＠item Build the tarball. +The ＠dfn{UI} category is used for bugs in the software that the user sees +such as font-lock, key definitions, menus, and customization. -＠example -cd ＠var{module} -make dist -＠end example +＠item Security -＠end itemize +＠cindex security bug category +＠cindex bug categories, security -The ＠code{make dist} command ensures that the tarball is named correctly -and that the tar extracts in a subdirectory that has the same name as -the tarball's prefix. For example, if ＠var{release} was mh-e-5_2, then -the tarball would be named mh-e-5.2.tgz and would extract into the -directory named mh-e-5.2. +The ＠dfn{Security} category is used for bugs in the security arena. +Although XEmacs includes little that could be called secure code, shell +modes handle authentication interactions, a few subprocesses (movemail) +have permissions that exceed the user's, and network-facing code could +have buffer overflows that could be exploited by an attacker. -＠node Creating ＠value{XEMACSORG} Releases, Updating the Tracker, Creating Tarballs, File Releases -＠section Creating ＠value{XEMACSORG} Releases +＠item Documentation -＠cindex Creating ＠value{XEMACSORG} Releases -＠cindex releases -＠cindex tarballs, making +＠cindex documentation bug category +＠cindex bug categories, documentation -First, create the tarballs (＠pxref{Creating Tarballs}). Then -＠uref{https://sourceforge.net/project/admin/editpackages.php?group_id=13357, -add the release} per the instructions in -＠uref{https://sourceforge.net/docman/display_doc.php?docid=6445&group_id=1#filereleasesteps, -The File Release System}. Be sure to check the box labeled -＠code{Preserve my pre-formatted text}. Use the entire ＠file{README} -file for the release notes and the appropriate section of the -＠file{NEWS} file for the Change Log. - -If there were any beta releases leading up to this release, -＠uref{https://sourceforge.net/project/admin/editreleases.php?package_id=11309&group_id=13357, -edit the release} and set the Status to Hidden. - -＠node Updating the Tracker, Announce the Release, Creating ＠value{XEMACSORG} Releases, File Releases -＠section Updating the Tracker - -＠cindex Updating the Tracker - -After XEmacs is released, update the tracker. First, change the group to -mh-e-doc-(a)var{m.n} (for example, mh-e-doc-1.3) for all open -＠uref{https://sourceforge.net/tracker/?group_id=13357&atid=113357, -bugs} and -＠uref{https://sourceforge.net/tracker/?group_id=13357&atid=363357&, -features} with a category of Documentation and a group of CVS. The -list is restricted to open issues since it is possible that an issue -was given a category of Documention for inclusion in the release -notes and then closed. Such an issue would not force a manual update. - -Then change the name of the group CVS to mh-e-(a)var{m.n} for both -＠uref{https://sourceforge.net/tracker/admin/index.php?group_id=13357&atid=113357&add_group=1, -bugs} and -＠uref{https://sourceforge.net/tracker/admin/index.php?group_id=13357&atid=363357&add_group=1, -features}. For example, when XEmacs version 6.0 is released, rename the -CVS group to mh-e-6.0. Then create a new CVS group. This should be -done for doc and contrib releases too. - -An exception to this occurs when releasing beta releases. The group -name in the series of beta releases leading up to the actual release -is reused. That way, in the end all the existing issues are left -pointing to the actual release rather than a beta. For example, CVS -would first be renamed to mh-e-6.1.90 which would in turn be renamed -to mh-e-6.1.91 which would in turn be renamed to mh-e-7.0. - -Another oddity occurs when you make a patch release. When you change -the name of the group from CVS to mh-e-(a)var{m.n.p}, you will probably -effect mainline work. So go back to -＠uref{https://sourceforge.net/tracker/?group_id=13357&atid=113357, -bugs} and -＠uref{https://sourceforge.net/tracker/?group_id=13357&atid=363357, -features}, and browse all issues with the new mh-e-(a)var{m.n.p} group -name. Perform a mass group name change from mh-e-(a)var{m.n.p} to CVS -for all issues that do not appear in the patch release. It may also be -easier to add a new group name of mh-e-(a)var{m.n.p} and set the group -of the items in the patch release to it. +The ＠dfn{Documentation} category is used for bugs in the documentation +arena. In addition, if there are any code changes made as a result of a +bug report or feature request that require changes to the documentation, +the category of that issue should be set to Documentation after the bug +has been fixed or the feature implemented. Set +the priority to 3 to set the issue aside in listings sorted by priority. -＠node Announce the Release, Updating the Emacs Repository, Updating the Tracker, File Releases -＠section Announce the Release +＠item Contrib -＠cindex Announce the Release +＠cindex contrib bug category +＠cindex bug categories, contrib -Now that the release is ready for download, announce it as described -in ＠xref{News}. +The ＠dfn{Contrib} category is used for all bugs in the contributed +software. -＠node Updating the Emacs Repository, Updating the Debian Package, Announce the Release, File Releases -＠section Updating the Emacs Repository +＠end table -＠c Edited: stephen 2005-01-19 +＠node Status, Group, Category, Bugs +＠section Status -＠strong{Needs review. Although on the face of it this obviously has -nothing to do with XEmacs, in fact there are probably hints here for -XEmacs release engineers.} +＠cindex status +＠cindex bug status -＠cindex Updating the Emacs Repository -＠cindex Emacs, updating +The bug ＠dfn{status} is divided into four sections: ＠i{Open}, +＠i{Closed}, ＠i{Deleted} and ＠i{Pending}. -The Emacs repository is updated by the project -admin. Other developers may skip this section. +＠table ＠b -＠cindex gnu.org -＠cindex CVS Emacs Repository -＠cindex Emacs CVS Repository -＠cindex Savannah +＠item Open -The project admin must have an account on the ＠i{gnu.org} machines, -and must also be given access to the Emacs CVS repository. This can be -accomplished by following these steps: +＠cindex open bug status +＠cindex bug status, open -＠table ＠emph +When bugs are initially created, they are marked ＠dfn{Open}. -＠item -Obtain a -＠uref{https://savannah.gnu.org/account/register.php, Savannah login}. +＠cindex discussing bugs +＠cindex bugs, discussing +＠cindex features, discussing -＠item -Become an Emacs developer by contacting one of the admins listed on -the ＠uref{https://savannah.gnu.org/projects/emacs/, Emacs main page}. +The Bugs and Feature Requests sections are also used as a method to +get the ball rolling among developers. They are used to register what +we feel we should work on. For example, a developer may have questions +about the way XEmacs handles MIME that we should discuss before we +attempt to fix it: What do other people do? How should we attack this? +That developer opens a bug report in the MIME category and a +discussion ensues. Once the disposition of the issue is resolved, the +bug is assigned to a developer. Later, when the bug is fixed, the bug +can be closed. -＠item -Follow the instructions given in -＠uref{https://savannah.gnu.org/cvs/?group=emacs, the CVS instructions}. +Discussion about entirely new features should be opened in the Feature +Requests section (＠pxref{Feature Requests}) but otherwise handled in +the same way. -＠end table +＠item Closed -＠cindex emacs-devel -＠cindex mailing lists, emacs-devel -＠cindex mailman +＠cindex closed bug status +＠cindex bug status, closed -The project admin must also join the ＠i{emacs-devel} mailing list. -Send a note to ＠i{emacs-devel-request＠(a)gnu.org} or use the -＠uref{http://mail.gnu.org/mailman/listinfo/emacs-devel, Mailman -interface} to subscribe. +When all aspects of a bug have been fixed, including code and +documentation, the bug is marked ＠dfn{Closed}. -This procedure must be performed before any changes have been made to -the XEmacs source since the release. This can be easily accomplished in -by checking out the module with a sticky tag and should be done in any -case. +When setting the status to Closed, the group should be set to Fixed, +Works For Me, Invalid, or Rejected. -＠cindex CVS, co +＠item Pending -First, check out the Emacs source: +＠cindex pending bug status +＠cindex bug status, pending -＠example - cvs -d $USER＠＠savannah.gnu.org:/cvsroot/emacs co emacs -＠end example +You can set the status to ＠dfn{Pending} if you are waiting for a +response from the tracker item author. When the author responds, the +status is automatically reset to that of Open. Otherwise, if the +author doesn't respond within 14 days, then the item is given a status +of Deleted. -If the Emacs source has already been checked out, ensure that the XEmacs -source is not locally modified. This is essential for the next step to -proceed accurately. If the install-emacs step described below had been -performed during testing leading up to the release, remove the -modified XEmacs files and run ＠code{cvs update} again. - -＠cindex import-emacs -＠cindex Makefile targets, import-emacs - -Next, ensure that there have not been any upstream changes to either -the source or documentation. If so, the changes will need to be -imported into the ＠file{src} and ＠file{doc} modules. This is done by -running: +＠item Deleted -＠example - make import-emacs -＠end example +＠cindex deleted bug status +＠cindex bug status, deleted -＠cindex EMACS_HOME -＠cindex environment variables, EMACS_HOME -＠cindex variables, EMACS_HOME -＠cindex install-emacs -＠cindex Makefile targets, install-emacs +If an items has been marked Pending, it will be marked ＠dfn{Deleted} +if the author of the item does not respond within 14 days. -Then install the sources with: +＠end table -＠example - cd src - make install-emacs -＠end example +＠node Group, Resolution, Status, Bugs +＠section Group -The ＠code{install-emacs} target copies the lisp files to -＠file{$EMACS_HOME/lisp/mh-e} and copies ＠file{NEWS} to -＠file{$EMACS_HOME/etc}. - -＠cindex EMACS_HOME -＠cindex environment variables, EMACS_HOME -＠cindex variables, EMACS_HOME -＠cindex install-emacs -＠cindex Makefile targets, install-emacs -＠cindex ChangeLog +＠cindex group +＠cindex bug group -Next, install the documentation with: +The bug ＠dfn{group} contains several items. They include: -＠example - cd doc - make install-emacs -＠end example +＠table ＠b -This target copies ＠file{mh-e.texi} to ＠file{$EMACS_HOME/man}. +＠item None -Update ＠code{$EMACS_HOME/etc/ChangeLog} and -＠code{$EMACS_HOME/man/ChangeLog}. Simply cite the XEmacs release. For -example: +Bugs are initially filed in this group. -＠example - * NEWS, NEWS: Upgraded to XEmacs version 6.1. -＠end example +＠item CVS* -and +Bugs in groups starting with CVS have either been found in the CVS +version (in contrast to a released version) if the Status is Open, or +they have been fixed and checked in if the Resolution is Fixed. -＠example - * mh-e.texi: Upgraded to XEmacs documentation version 1.3. -＠end example +After fixing a bug in a beta release, however, developers should not +set the group to CVS but leave it in the group named for the beta +release. Just be sure to mention the issue number in the ChangeLog so +that it can be noted in the next release announcement. -Update ＠code{$EMACS_HOME/etc/NEWS} by adding text similar to the -following: +＠item xemacs* -＠example - * Changes in Emacs 21.4 +Bugs in groups starting with ``xemacs'' have either been found in the +given version if the Status is Open, or fixed in the given version if +the Status is Closed. - ** XEmacs changes. +＠end table - Upgraded to XEmacs version 6.1. Upgraded to XEmacs manual version 1.3. - See NEWS for details. -＠end example +＠node Resolution, , Group, Bugs +＠section Resolution -It's possible that the update occurs before Emacs had been released -with a previous version of XEmacs; in this case, simply bump the version -number in the text above rather than add an entire new stanza. +A bug can appear in various states: -Then check in the files like this: +＠table ＠b -＠example - cvs ci -m"Upgraded to XEmacs version 6.1. - See etc/NEWS and lisp/mh-e/ChangeLog for details." -＠end example +＠item Accepted -＠cindex emacs-devel -＠cindex mailing lists, emacs-devel +＠cindex accepted resolution +＠cindex resolution, accepted -Send a note to ＠i{emacs-devel＠(a)gnu.org}, with a cc to -＠i{xemacs-design＠(a)xemacs.org} with the details. The subject -should indicate that the software has been checked in: +The ＠dfn{Accepted} resolution means that QA has accepted the fix. +Since we don't have a QA department, it is unlikely that this will be +used in that fashion. Instead, it can be used to indicate that a +developer feels that a feature request (that someone else posted) has +merit. -＠example - XEmacs 7.4.4 checked in -＠end example +＠item Duplicate -The first paragraph should include the description on the -＠uref{https://sourceforge.net/projects/mh-e/, Summary} page, and the -text: +＠cindex duplicate resolution +＠cindex resolution, duplicate -＠example - Read on for more details. -＠end example +The ＠dfn{Duplicate} resolution means that this bug is a duplicate of +another. The status may be set to Closed. Be sure to add a note which +mentions the bug number that this bug is a duplicate of. If this bug +has some good information in it, the URL to this bug should be added +to the duplicate. -The second paragraph should contain: +＠item Fixed -＠example - Project home page at: http://mh-e.sourceforge.net/. -＠end example +＠cindex fixed resolution +＠cindex resolution, fixed -Finally, append the release notes. If only the manual is updated, then -the announcement should read closer to the one used in the ＠value{XEMACSORG} -news item. +The ＠dfn{Fixed} group is used to indicate a bug or feature request that +has been fixed. -After checking XEmacs into Emacs, run ＠code{make import-emacs} a second -time to put the new code on the Emacs branch. This makes it possible -to detect changes to XEmacs that an Emacs developer may make later. - -＠node Updating the Debian Package, Updating the XEmacs Package, Updating the Emacs Repository, File Releases -＠section Updating the Debian Package - -＠cindex Updating the Debian Package -＠cindex Debian Package, Updating -＠cindex Debian - -This task is the duty of Peter Galbraith <＠i{psg＠(a)debian.org}>. It may -be useful to others to want to make an unofficial package of the CVS -tree. - -To build a Debian package, you'll need to have installed the Debian -package ＠code{build-essential} as well as those listed in the -＠code{Build-Depends-Indep:} line of the file ＠file{debian/control}. -Currently, there are the packages ＠code{debhelper} and ＠code{texinfo}. -The package ＠code{fakeroot} is also used below and ＠code{dpkg-dev-el} -is also useful. +＠item Invalid -＠example - apt-get install build-essential fakeroot debhelper texinfo dpkg-dev-el -＠end example +＠cindex not a bug resolution +＠cindex invalid resolution +＠cindex resolution, not a bug +＠cindex resolution, invalid -Run the following commands from the top of the CVS tree to clean up the -tree of backup files and make a source tar file: +The ＠dfn{Invalid} resolution is used to indicate the problem is with +the user. In other words, this is not a bug. See Works For Me. -＠example - rm `find . -name "*~"` - debian/rules source -＠end example +＠item Later -This will make a new file such as ＠code{mh-e_7.0.orig.tar.gz}. Unpack -it in a working directory and step into its top directory. Edit the -first line of the file ＠file{debian/changelog} to change the version -number between parentheses to something appropriate (e.g. -(a)code{7.0.+cvs-0}), or add another entry to the changelog and edit the -version number. If you installed the package ＠code{dpkg-dev-el} above, -simply do ＠kbd{C-c C-v} to insert this block and ＠kbd{C-c C-f} to -finalise the entry when done editing the version number. +＠cindex later resolution +＠cindex resolution, later -You can then create a Debian package by running: +The ＠dfn{Later} resolution is similar to the Postponed group, although +it connotates a longer delay. -＠example - fakeroot debian/rules binary -＠end example +＠item Out of Date -This creates ＠file{../mh-e_7.0.+cvs-0_all.deb} which can be installed -using standard Debian package management: +＠cindex out of date resolution +＠cindex resolution, out of date -＠example - dpkg -i ../mh-e_7.0.+cvs-0_all.deb -＠end example +The ＠dfn{Out of Date} resolution is similar to the term OBE (Overcome +By Events). In other words, the bug has not been fixed, but the code +has changed in ways that make it unnecessary to do so. -＠node Updating the XEmacs Package, Updating the Online Documentation, Updating the Debian Package, File Releases -＠section Updating the XEmacs Package +＠item Postponed -＠cindex Updating the XEmacs Package -＠cindex XEmacs Package, Updating -＠cindex XEmacs +＠cindex postponed resolution +＠cindex resolution, postponed -This task is the duty of XXX <＠i{XXX}>. It may be useful to others to -want to make an unofficial package of the CVS tree. +The ＠dfn{Postponed} resolution is similar to the Later group, although +it connotates a lesser delay. -The rest of this section needs to be completed. +＠item Rejected -＠node Updating the Online Documentation, Updating the Free Software Directories, Updating the XEmacs Package, File Releases -＠section Updating the Online Documentation +＠cindex rejected resolution +＠cindex resolution, rejected -＠c Edited: stephen 2005-01-19 -＠strong{Adrian, please review.} +The ＠dfn{Rejected} resolution means that QA has rejected the fix. +Since we don't have a QA department, it is unlikely that this will be +used in that fashion. Instead, it can be used to indicate that a +developer feels that a feature request does not have merit. -＠cindex Updating the Online Documentation -＠cindex online documentation, updating -＠cindex documentation, updating online -＠cindex CVS, update +＠item Remind -The entire XEmacs web site is kept in CVS, and automatically rebuilt by -the commit trigger. +＠cindex remind resolution +＠cindex resolution, remind -Thus, the basic procedure is similar to working on XEmacs source code. +The ＠dfn{Remind} resolution is similar to the Postponed and Later +groups, although it connotates an even lesser delay. -＠enumerate -＠item -Check out the ＠samp{xemacsweb} module. +＠item Wont Fix -＠item -Make the needed changes. +＠cindex wont fix resolution +＠cindex resolution, wont fix -＠item -Update the ChangeLog(s). +The ＠dfn{Wont Fix} resolution means that the XEmacs developers +acknowledge that the bug exists but are not going to fix it. Or the +developers will not implement a feature request. There is probably a +good reason for these things. -＠item -Test the changes with ＠code{make} to ensure that all ＠file{genpage} -commands are correct. Then use ＠code{make validate} to check that the -produced HTML is reasonably correct. +＠item Works For Me -＠item -Commit the workspace. -＠end enumerate +＠cindex irreproducible resolution +＠cindex resolution, irreproducible +＠cindex works for me resolution +＠cindex resolution, works for me -The XEmacs online documentation is mostly written in the ＠file{genpage} -language, which ensures a consistent interface for internal links via -special commands processed by the ＠code{genpage} script, and a -consistent overall format enforced by use of template files. Some of -the material, such as the online versions of the ＠emph{XEmacs User's -Guide} is generated directly from Texinfo, and checked in to CVS as HTML -rather than ＠file{genpage} source. +The ＠dfn{Works For Me} group is used to indicate a bug that cannot be +reproduced (irreproducible) and therefore cannot be fixed. See +Invalid. -The validator used by ＠code{make validate} is based on the PSGML -package. It is not perfect, but it is more convenient than the more -accurate online validators provided by the W3C and others. The -webmaster should use the online validators and link checkers regularly. +＠end table +＠node Feature Requests, Patch Queue, Bugs, Top +＠chapter Feature Requests +＠cindex Feature Requests -＠node Updating the Free Software Directories, After the Release, Updating the Online Documentation, File Releases -＠section Updating the Free Software Directories +Developers should check the +Feature Requests Trracker +occasionally for new feature requests and comment on the feature's +usefulness and integrity. Unless a positive comment has +＠c #### define "reasonable" +been added within a ``reasonable'' amount of time, a member of the +＠value{BOARD} +may set the status to Closed and the group to Wont Fix. ＠value{BOARD} +members should regularly check the list of requested features and prune +the oldest in this way to keep the list to a reasonable size. +＠c mh-e-devguide sez: +＠c will set the status to Closed and the group to Wont Fix. If the +＠c feature request is not closed, anyone may assign the request to +＠c themselves and implement the feature. -＠c Edited: stephen 2005-01-18 -＠strong{Add FreshMeat, at least.} +After incorporating the feature, update the feature request as +described in the previous section (＠pxref{Bugs}). -Update the ＠i{source-tarball} and ＠i{version} fields in the FSF/UNESCO -Free Software Directory (＠pxref{Free Software Directories}), as well as -the ＠i{touched} field. Update any other fields as necessary, including -the ＠i{updated} field. +＠node Patch Queue, News, Feature Requests, Top +＠chapter Patch Queue -＠node After the Release, , Updating the Free Software Directories, File Releases -＠section After the Release +＠cindex Patch Queue -＠cindex After the Release +Developers should check ＠value{PATCHES-LIST} +occasionally for new patches and comment on the patch's usefulness and +integrity. This will greatly help reviewers to review patches. Note +that developers who are active in commenting on patches and bug reports +are the main candidates when recruiting new reviewers. -After the release is complete, add the string ＠code{+cvs} to the -version number. ＠xref{Updating Version Number}. +＠c Legally speaking, patches that are less than 15 lines can usually be +＠c incorporated, although it is always best to try to incorporate them in +＠c a ``clean room'' environment. Do read +＠c ＠uref{http://www.gnu.org/prep/maintain_6.html#SEC6, Legally +＠c Significant Changes} for the details. -Then, define the next release. -Each developer goes through the bugs and feature requests and chooses -a month's worth of work for him to do. For each selected item, he -increases the priority to 7 and assigns the task to himself. Another -guideline for release size is that releases should only include 7 +/- -2 new features or bug fixes. - -The first month should be full of fervent activity. Development should -slow down in the second month while the new features are fine-tuned. -The third month is devoted to the release. ＠xref{Release Schedule}. It -is acceptable and often desirable to shorten each step in this cycle -in order to keep the number of release note bullet items to 7 +/- 2, -but in order to keep the releases fresh, it's probably not a good idea -to lengthen the process. - -If a new bug or feature arises that a developer wants to work on, the -developer sets the priority of that item to 7 and resets the priority -of one of his other items back to 5. This keeps the release from -growing without bound. - -The motivation for this schedule is to keep the iteration cycle short, -to keep from adding new features just before a release, and from the -user's point of view, to increase the timeliness and quality of -releases. It also limits the scope of the release, and makes it clear -when we're done. -＠node News, Surveys, File Releases, Top +＠node News, Surveys, Patch Queue, Top ＠chapter News -＠c Edited: stephen 2005-01-18 - ＠strong{Needs review.} ＠cindex News ＠＠ -3207,8 +3048,6 ＠＠＠example XEmacs m.n.p released - XEmacs contributed software m.n.p released - XEmacs manual m.n.p released ＠end example As only the first paragraph is shown on the ＠value{XEMACSORG} front page, it ＠＠ -3259,14 +3098,11 ＠＠ and doc releases, which lack release notes, should be closer to the news item. -The Emacs announcement is described in ＠ref{Updating the Emacs -Repository}. + ＠node Surveys, Free Software Directories, News, Top ＠chapter Surveys -＠c Edited: stephen 2005-01-18 - ＠strong{Interesting. Should we do this, maybe?} ＠cindex Surveys ＠＠ -3318,13 +3154,9 ＠＠ Finally, if any changes were made to the short or long descriptions, it is likely that the following will have to be updated: the -＠value{XEMACSORG} XEmacs project description (see -＠uref{https://sourceforge.net/project/admin/editgroupinfo.php?group_id=13357, -Editing the ＠value{XEMACSORG} Project Description}), the top-level -(a)file{index.php} file in the Project Website (＠pxref{Project -Website}), the ＠file{control} file in the Debian package -(＠pxref{Updating the Debian Package}), and the XEmacs package -(＠pxref{Updating the XEmacs Package}). +＠value{XEMACSORG} XEmacs project description in the top-level +(a)file{index.content} file in the Project Website (＠pxref{Project +Website}). ＠c #### Nuke this, but check whether the topics below need discussion. -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

1 participants
0 comments

Re: [PATCH] (Draft) Make X11 server-side fonts and Mule suck less. 17 years, 8 months

Aidan Kehoe

Ar an dara lá déag de mí Lúnasa, scríobh Stephen J. Turnbull: > Aidan> available, otherwise generates legal C89 but no debug > Aidan> output. I will be shocked if someone compiling with > Aidan> fontconfig support and in need of debug output doesn’t > Aidan> have a compiler that can handle variadic macros. > > You're thinking about this incorrectly. Users don't need debug > output, *we* do, and for those users who are as lacking in interest in > debug output as you suggest, we enforce it by making debug output the > default. How likely are people with no interest in debugging problems to make a useful bug report? And the XFT code is currently, not to put too fine a point on it, only suitable for people with an interest in debugging problems. > Let's not introduce a potential for a build failure unless it really > improves things. Let's *definitely* not defeat debugging output on > precisely those platforms we have the least information about! I wasn’t proposing to change it, just enquiring as to its rationale. It’s primarily your code, if that structure works for you, well and good. -- Santa Maradona, priez pour moi!

2 participants
1 comments

[PATCH] (Draft) Make X11 server-side fonts and Mule suck less. 17 years, 8 months

Aidan Kehoe

In the spirit of communication, here’s a draft patch of some work to make Mule redisplay suck less, mainly on server-side X11. It involves: 1. No longer supporting the registry charset property (which was a regexp to match against X11 registries and encodings) to the same extent. Instead, each charset has a registries property, an ordered vector of non-regexp strings, specifying the actual X11 registries and encodings that have been seen in the wild for that charset, in order of preference. Patterns passed to XListFonts() are modified to have the X11 registries and encodings included. This gives a huge performance increase for looking up non-ASCII fonts, especially for negative results. Without this, in an xemacs -vanilla, M-? h takes a count of fifteen from typing the h to completed redisplay of HELLO, and that remains the same after a restart; with it, the same operation takes a count of 2, and is instantaneous after a restart. (This will be dependent on how many server-side fonts you have available; xlsfonts | wc -l gives me 4602.) Also a big improvement is that, if there is a font available that’s identical to that specified by default in the desired face except that it has the registry and encoding of the desired charset, that font is now selected immediately. A version of set-charset-registry is provided that prepends the given pattern to the registries supplied, and warns if it contains characters that would need to be quoted in a regexp. This is actually compatible with most places that use the charset registry; outside of the Mule implementors, very few people use it to its full extent. 2. Providing an optional third argument, CHARSET-PREDICATE to define-specifier-tag, and supporting this to allow you to choose the X11 font for a face - charset - device combination from Lisp, which was previously impossible. Sample code: (define-specifier-tag 'encode-as-utf-8 nil (lambda (charset) (charset-property charset 'encode-as-utf-8))) (define-specifier-tag 'x-server-side-fonts (lambda (device) (and (eq 'x (device-type device)) (not (featurep 'fontconfig))))) (set-face-font 'default "-misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1" nil '(x-server-side-fonts encode-as-utf-8) 'append) Remaining to do here before I feel comfortable with the changes are: 1. Charset-specific fallback XLFDs. (The below allows you to specify an XLFD for a face + charset + device combination; it doesn’t attempt any fallbacks.) This will be mostly device-independent once in place, so I intend adding charset-specific fallbacks for XFT (and perhaps even Windows) at the same time. 2.“Stage-2” X11 support; that is, when lookup of a font with the registry "Ethiopic-Unicode" fails, make a device-specific note of that, and try again with the registry "iso10646-1" and Unicode conversion in place. 3. Mechanical copying of the X11-specific code to the GTK port; perhaps a move to something like event-xlike-inc.c 4. Addition of a heuristic to xft_find_charset_font to accept reasonable font values for the fallback Unicode charsets. lisp/ChangeLog addition: 2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net> * mule/arabic.el (arabic-digit): * mule/arabic.el (arabic-1-column): * mule/arabic.el (arabic-2-column): * mule/chinese.el (make-chinese-cns11643-charset): * mule/chinese.el (chinese-sisheng): * mule/english.el (ascii-right-to-left): * mule/ethiopic.el (ethiopic): * mule/european.el (latin-iso8859-14): * mule/european.el (latin-iso8859-16): * mule/indian.el (indian-is13194): * mule/indian.el (indian-1-column): * mule/indian.el (indian-2-column): * mule/japanese.el (japanese-jisx0213-1): * mule/japanese.el (japanese-jisx0213-2): * mule/lao.el (lao): * mule/misc-lang.el (ipa): * mule/mule-charset.el: * mule/thai-xtis.el (thai-xtis): * mule/tibetan.el (tibetan-1-column): * mule/tibetan.el (tibetan): * mule/vietnamese.el (vietnamese-viscii-lower): * mule/vietnamese.el (vietnamese-viscii-upper): Stop using the `registry' charset property; use `registries' instead. The difference is that registries is an ordered vector of X11 registries and encodings rather than a regexp; this means we can leave the matching to the X11 server, avoiding transferring huge amounts of data (perhaps across the network!) in order to do a regexp search on it. * mule/mule-charset.el (charset-registries): New. * mule/mule-charset.el (set-charset-registry): New. charset-registries returns the registries of a charset; 2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net> * faces.el (set-face-font): Give more details on common values for font instantiators, LOCALEs. src/ChangeLog addition: 2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net> * font-mgr.h: Move some XFT debug macros here from objects-x.c. * intl.c (init_intl): Correct a comment on garbage collecting. * faces.c (complex_vars_of_faces): Minimize the use of fallbacks for the moment. * charset.h: * lisp.h: * mule-charset.c: Remove the `registry' charset property; add the `registries' charset property; call setup_charset_initial_specifier_tags on charset creation. * objects-x.c: Handle Mule font instantiation less resource-intensively ; if we have the XLFD of a desired font, modify it to include the desired registry and encoding, _then_ call XListFonts. Eliminates calling XListFonts on a pattern of "*", which is nice, because the huge IPC necessary to parse that was a problem. * specifier.c: * specifier.h: Add a new optional argument, CHARSET-PREDICATE to define-specifier-tag. This is a function taking one charset argument; if the tag is to match that charset, it should return true, otherwise false. We want charset predicates to be false by default -- in contrast to device predicates -- and this means we now need two passes to match specifiers, if charset predicates have been specified. The implementation -- with caching of the predicate results -- is modelled on the device specifier tag cache. * unicode.c (unicode_to_ichar): Use the `registries' property when initialising the just-in-time Mule character setss. XEmacs Trunk source patch: Diff command: cvs -q diff -Nu Files affected: src/unicode.c src/specifier.h src/specifier.c src/objects-x.c src/mule-charset.c src/lisp.h src/intl.c src/font-mgr.h src/faces.c src/charset.h lisp/mule/vietnamese.el lisp/mule/tibetan.el lisp/mule/thai-xtis.el lisp/mule/mule-charset.el lisp/mule/misc-lang.el lisp/mule/lao.el lisp/mule/japanese.el lisp/mule/indian.el lisp/mule/european.el lisp/mule/ethiopic.el lisp/mule/english.el lisp/mule/chinese.el lisp/mule/arabic.el lisp/faces.el Index: lisp/faces.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/faces.el,v retrieving revision 1.38 diff -u -u -r1.38 faces.el --- lisp/faces.el 2006/04/25 14:01:52 1.38 +++ lisp/faces.el 2006/08/06 16:42:01 ＠＠ -483,15 +483,17 ＠＠ FACE may be either a face object or a symbol representing a face. -FONT should be an instantiator (see `make-font-specifier'), a list of - instantiators, an alist of specifications (each mapping a - locale to an instantiator list), or a font specifier object. +FONT should be an instantiator (see `make-font-specifier'; a common + instantiator is a platform-dependent string naming the font), a list + of instantiators, an alist of specifications (each mapping a 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', - 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'. +If FONT is an alist, LOCALE must be omitted. If FONT is a specifier + object, LOCALE can be a locale, a locale type, `all', or nil; see + `copy-specifier' for its semantics. Common LOCALEs are buffers + objects, windows objects, device objects and `global'. Otherwise + LOCALE specifies the locale under which the specified + instantiator(s) will be added, and defaults to `global'. See `set-face-property' for more information." (interactive (face-interactive "font")) Index: lisp/mule/arabic.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/arabic.el,v retrieving revision 1.7 diff -u -u -r1.7 arabic.el --- lisp/mule/arabic.el 2002/03/16 10:39:05 1.7 +++ lisp/mule/arabic.el 2006/08/06 16:42:01 ＠＠ -47,9 +47,8 ＠＠ ;; Others are of direction right-to-left and of width 1-column or ;; 2-column. (make-charset 'arabic-digit "Arabic digit" - '(dimension - 1 - registry "MuleArabic-0" + '(dimension 1 + registries ["MuleArabic-0"] chars 94 columns 1 direction l2r ＠＠ -62,7 +61,7 ＠＠ (make-charset 'arabic-1-column "Arabic 1-column" '(dimension 1 - registry "MuleArabic-1" + registries ["MuleArabic-1"] chars 94 columns 1 direction r2l ＠＠ -75,7 +74,7 ＠＠ (make-charset 'arabic-2-column "Arabic 2-column" '(dimension 1 - registry "MuleArabic-2" + registries ["MuleArabic-2"] chars 94 columns 2 direction r2l Index: lisp/mule/chinese.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/chinese.el,v retrieving revision 1.12 diff -u -u -r1.12 chinese.el --- lisp/mule/chinese.el 2005/12/24 22:31:51 1.12 +++ lisp/mule/chinese.el 2006/08/06 16:42:01 ＠＠ -146,8 +146,8 ＠＠ (name plane final) (make-charset name (concat "CNS 11643 Plane " plane " (Chinese traditional)") - `(registry - ,(concat "CNS11643[.-]\$.*[.-]\$?" plane "$") + `(registries + ,(vector (concat "cns11643.1992-" plane )) dimension 2 chars 94 final ,final ＠＠ -171,7 +171,7 ＠＠ (make-charset ;; not in FSF 21.1 'chinese-isoir165 "ISO-IR-165 (CCITT Extended GB; Chinese simplified)" - `(registry "isoir165" + `(registries ["isoir165-0"] dimension 2 chars 94 final ?E ＠＠ -185,7 +185,7 ＠＠ '(dimension 1 ;; XEmacs addition: second half of registry spec - registry "sisheng_cwnn\\|OMRON_UDC_ZH" + registries ["omron_udc_zh-0" "sisheng_cwnn-0"] chars 94 columns 1 direction l2r Index: lisp/mule/english.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/english.el,v retrieving revision 1.6 diff -u -u -r1.6 english.el --- lisp/mule/english.el 2002/03/29 04:46:41 1.6 +++ lisp/mule/english.el 2006/08/06 16:42:01 ＠＠ -36,7 +36,7 ＠＠ "ASCII (left half of ISO 8859-1) with right-to-left direction" '(dimension 1 - registry "ISO8859-1" + registries ["ISO8859-1"] chars 94 columns 1 direction r2l Index: lisp/mule/ethiopic.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/ethiopic.el,v retrieving revision 1.6 diff -u -u -r1.6 ethiopic.el --- lisp/mule/ethiopic.el 2002/03/16 10:39:06 1.6 +++ lisp/mule/ethiopic.el 2006/08/06 16:42:01 ＠＠ -32,7 +32,7 ＠＠ (make-charset 'ethiopic "Ethiopic characters" '(dimension 2 - registry "Ethiopic-Unicode" + registries ["Ethiopic-Unicode"] chars 94 columns 2 direction l2r Index: lisp/mule/european.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/european.el,v retrieving revision 1.12 diff -u -u -r1.12 european.el --- lisp/mule/european.el 2005/05/10 17:02:59 1.12 +++ lisp/mule/european.el 2006/08/06 16:42:01 ＠＠ -121,7 +121,7 ＠＠ "Right-Hand Part of Latin Alphabet 8 (ISO/IEC 8859-14)" '(dimension 1 - registry "ISO8859-14" + registries ["ISO8859-14"] chars 96 columns 1 direction l2r ＠＠ -135,7 +135,7 ＠＠ "Right-Hand Part of Latin Alphabet 10 (ISO/IEC 8859-16)" '(dimension 1 - registry "ISO8859-16" + registries ["ISO8859-16"] chars 96 columns 1 direction l2r Index: lisp/mule/indian.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/indian.el,v retrieving revision 1.3 diff -u -u -r1.3 indian.el --- lisp/mule/indian.el 2002/03/16 10:39:06 1.3 +++ lisp/mule/indian.el 2006/08/06 16:42:01 ＠＠ -99,7 +99,7 ＠＠ "Generic Indian charset for data exchange with IS 13194" '(dimension 1 - registry "IS13194-Devanagari" + registries ["IS13194-Devanagari"] chars 94 columns 2 direction l2r ＠＠ -114,7 +114,7 ＠＠ "Indian charset for 2-column width glyphs" '(dimension 2 - registry "MuleIndian-1" + registries ["MuleIndian-1"] chars 94 columns 1 direction l2r ＠＠ -129,7 +129,7 ＠＠ "Indian charset for 2-column width glyphs" '(dimension 2 - registry "MuleIndian-2" + registries ["MuleIndian-2"] chars 94 columns 2 direction l2r Index: lisp/mule/japanese.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/japanese.el,v retrieving revision 1.11 diff -u -u -r1.11 japanese.el --- lisp/mule/japanese.el 2004/01/29 05:22:40 1.11 +++ lisp/mule/japanese.el 2006/08/06 16:42:01 ＠＠ -106,7 +106,7 ＠＠ (make-charset 'japanese-jisx0213-1 "JISX0213 Plane 1 (Japanese)" '(dimension 2 - registry "JISX0213.2000-1" + registries ["JISX0213.2000-1"] chars 94 columns 2 direction l2r ＠＠ -120,7 +120,7 ＠＠ (make-charset 'japanese-jisx0213-2 "JISX0213 Plane 2 (Japanese)" '(dimension 2 - registry "JISX0213.2000-2" + registries ["JISX0213.2000-2"] chars 94 columns 2 direction l2r Index: lisp/mule/lao.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/lao.el,v retrieving revision 1.4 diff -u -u -r1.4 lao.el --- lisp/mule/lao.el 2002/03/18 10:07:37 1.4 +++ lisp/mule/lao.el 2006/08/06 16:42:01 ＠＠ -33,7 +33,7 ＠＠ (make-charset 'lao "Lao characters (ISO10646 0E80..0EDF)" '(dimension 1 - registry "MuleLao-1" + registries ["MuleLao-1"] chars 94 columns 1 direction l2r Index: lisp/mule/misc-lang.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/misc-lang.el,v retrieving revision 1.5 diff -u -u -r1.5 misc-lang.el --- lisp/mule/misc-lang.el 2002/03/16 10:39:07 1.5 +++ lisp/mule/misc-lang.el 2006/08/06 16:42:01 ＠＠ -34,7 +34,7 ＠＠ (make-charset 'ipa "IPA (International Phonetic Association)" '(dimension 1 - registry "MuleIPA" + registries ["MuleIPA"] chars 96 columns 1 direction l2r Index: lisp/mule/mule-charset.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-charset.el,v retrieving revision 1.18 diff -u -u -r1.18 mule-charset.el --- lisp/mule/mule-charset.el 2005/12/23 11:42:35 1.18 +++ lisp/mule/mule-charset.el 2006/08/06 16:42:02 ＠＠ -106,12 +106,29 ＠＠ 0 1)) -;; Not in Emacs/Mule +;; Not in GNU Emacs/Mule (defun charset-registry (charset) "Return the registry of CHARSET. This is a regular expression matching the registry field of fonts that can display the characters in CHARSET." - (charset-property charset 'registry)) + (lwarn 'xintl 'warning + "charset-registry is obsolete--use charset-registries instead. ") + (when (charset-property charset 'registries) + (elt 0 (charset-property charset 'registries)))) + +(defun charset-registries (charset) + "Return the registries of CHARSET." + (charset-property charset 'registries)) + +(defun set-charset-registry (charset registry) + "Obsolete; use set-charset-registries instead. " + (check-argument-type 'stringp registry) + (check-argument-type 'charsetp (find-charset charset)) + (assert (equal registry (regexp-quote registry)) t + "We don't accept regexps in set-charset-registry any more.") + (set-charset-registries + charset + (apply 'vector registry (append (charset-registries charset) nil)))) (defun charset-ccl-program (charset) "Return the CCL program of CHARSET. Index: lisp/mule/thai-xtis.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/thai-xtis.el,v retrieving revision 1.4 diff -u -u -r1.4 thai-xtis.el --- lisp/mule/thai-xtis.el 2002/03/18 10:07:37 1.4 +++ lisp/mule/thai-xtis.el 2006/08/06 16:42:02 ＠＠ -35,12 +35,12 ＠＠ ;;; Code: (make-charset 'thai-xtis "Precomposed Thai (XTIS by Virach)." - '(registry "xtis-0" - dimension 2 - columns 1 - chars 94 - final ?? - graphic 0)) + '(registries ["xtis-0"] + dimension 2 + columns 1 + chars 94 + final ?? + graphic 0)) (define-category ?x "Precomposed Thai character.") (modify-category-entry 'thai-xtis ?x) Index: lisp/mule/tibetan.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/tibetan.el,v retrieving revision 1.3 diff -u -u -r1.3 tibetan.el --- lisp/mule/tibetan.el 2002/03/16 10:39:07 1.3 +++ lisp/mule/tibetan.el 2006/08/06 16:42:02 ＠＠ -87,7 +87,7 ＠＠ (make-charset 'tibetan-1-column "Tibetan 1 column glyph" '(dimension 2 - registry "MuleTibetan-1" + registries ["MuleTibetan-1"] chars 94 columns 1 direction l2r ＠＠ -101,7 +101,7 ＠＠ (make-charset 'tibetan "Tibetan characters" '(dimension 2 - registry "MuleTibetan-2" + registries ["MuleTibetan-2"] chars 94 columns 2 direction l2r Index: lisp/mule/vietnamese.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/vietnamese.el,v retrieving revision 1.6 diff -u -u -r1.6 vietnamese.el --- lisp/mule/vietnamese.el 2002/03/21 07:30:24 1.6 +++ lisp/mule/vietnamese.el 2006/08/06 16:42:02 ＠＠ -37,7 +37,7 ＠＠ (make-charset 'vietnamese-viscii-lower "VISCII1.1 lower-case" '(dimension 1 - registry "VISCII1.1" + registries ["VISCII1.1"] chars 96 columns 1 direction l2r ＠＠ -50,7 +50,7 ＠＠ (make-charset 'vietnamese-viscii-upper "VISCII1.1 upper-case" '(dimension 1 - registry "VISCII1.1" + registries ["VISCII1.1"] chars 96 columns 1 direction l2r Index: src/charset.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/charset.h,v retrieving revision 1.14 diff -u -u -r1.14 charset.h --- src/charset.h 2006/07/07 23:01:11 1.14 +++ src/charset.h 2006/08/06 16:42:03 ＠＠ -186,7 +186,7 ＠＠ int id; Lisp_Object name; Lisp_Object doc_string; - Lisp_Object registry; + Lisp_Object registries; Lisp_Object short_name; Lisp_Object long_name; ＠＠ -271,7 +271,7 ＠＠ #define CHARSET_DIRECTION(cs) ((cs)->direction) #define CHARSET_FINAL(cs) ((cs)->final) #define CHARSET_DOC_STRING(cs) ((cs)->doc_string) -#define CHARSET_REGISTRY(cs) ((cs)->registry) +#define CHARSET_REGISTRIES(cs) ((cs)->registries) #define CHARSET_CCL_PROGRAM(cs) ((cs)->ccl_program) #define CHARSET_DIMENSION(cs) ((cs)->dimension) #define CHARSET_CHARS(cs) ((cs)->chars) ＠＠ -280,7 +280,6 ＠＠ #define CHARSET_FROM_UNICODE_TABLE(cs) ((cs)->from_unicode_table) #define CHARSET_FROM_UNICODE_LEVELS(cs) ((cs)->from_unicode_levels) - #define CHARSET_PRIVATE_P(cs) leading_byte_private_p (CHARSET_LEADING_BYTE (cs)) #define XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs)) ＠＠ -295,11 +294,12 ＠＠ #define XCHARSET_DIRECTION(cs) CHARSET_DIRECTION (XCHARSET (cs)) #define XCHARSET_FINAL(cs) CHARSET_FINAL (XCHARSET (cs)) #define XCHARSET_DOC_STRING(cs) CHARSET_DOC_STRING (XCHARSET (cs)) -#define XCHARSET_REGISTRY(cs) CHARSET_REGISTRY (XCHARSET (cs)) +#define XCHARSET_REGISTRIES(cs) CHARSET_REGISTRIES (XCHARSET (cs)) #define XCHARSET_LEADING_BYTE(cs) CHARSET_LEADING_BYTE (XCHARSET (cs)) #define XCHARSET_CCL_PROGRAM(cs) CHARSET_CCL_PROGRAM (XCHARSET (cs)) #define XCHARSET_DIMENSION(cs) CHARSET_DIMENSION (XCHARSET (cs)) #define XCHARSET_CHARS(cs) CHARSET_CHARS (XCHARSET (cs)) + #define XCHARSET_PRIVATE_P(cs) CHARSET_PRIVATE_P (XCHARSET (cs)) #define XCHARSET_REVERSE_DIRECTION_CHARSET(cs) \ CHARSET_REVERSE_DIRECTION_CHARSET (XCHARSET (cs)) Index: src/faces.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v retrieving revision 1.49 diff -u -u -r1.49 faces.c --- src/faces.c 2005/11/26 11:46:08 1.49 +++ src/faces.c 2006/08/06 16:42:04 ＠＠ -2063,7 +2063,7 ＠＠ #else /************** ISO-8859 fonts *************/ - +#ifndef MULE "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*", /* under USE_XFT, we always succeed, so let's not waste the effort */ "-*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-*", ＠＠ -2092,7 +2092,6 ＠＠ "-*-*-*-r-*-*-*-120-*-*-*-*-iso8859-*", "-*-*-*-r-*-*-*-*-*-*-*-*-iso8859-*", "-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-*", - /************* Japanese fonts ************/ /* Following 3 fonts proposed by Teruhiko.Kurosaka(a)Japan.eng.sun */ ＠＠ -2196,6 +2195,7 ＠＠ "-*-*-*-r-*-*-*-120-*-*-*-*-*-*", "-*-*-*-*-*-*-*-120-*-*-*-*-*-*", "-*-*-*-*-*-*-*-*-*-*-*-*-*-*", +#endif /* MULE */ "*" #endif }; Index: src/font-mgr.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/font-mgr.h,v retrieving revision 1.2 diff -u -u -r1.2 font-mgr.h --- src/font-mgr.h 2006/04/25 14:02:09 1.2 +++ src/font-mgr.h 2006/08/06 16:42:04 ＠＠ -68,4 +68,75 ＠＠ #define CONCHECK_FCPATTERN(x) CONCHECK_RECORD (x, fc_pattern) #define XFCPATTERN_PTR(x) (XFCPATTERN(x)->fcpatPtr) +#ifdef USE_XFT +/* #### all these #defines should probably move to font-mgr.h */ + +/* + The format of a fontname (as returned by fontconfig) is not well-documented, + But the character repertoire is represented in an ASCII-compatible way. See + fccharset.c (FcCharSetUnparse). So we can use UTF-8 for long names. + + Currently we have a hack where different versions of the unparsed name are + used in different contexts fairly arbitrarily. I don't think this is close + to coherency; even without the charset and lang properties fontconfig names + are too unwieldy to use. We need to rethink the approach here. I think + probably Lisp_Font_Instance.name should contain the font name as specified + to Lisp (almost surely much shorter than shortname, even, and most likely + wildcarded), while Lisp_Font_Instance.truename should contain the longname. + For now, I'm going to #ifdef the return values defaulting to short. -- sjt +*/ + +/* DEBUGGING STUFF */ + +/* print message to stderr: one internal-format string argument */ +#define DEBUG_XFT0(level,s) \ + if (debug_xft > level) stderr_out (s) + +/* print message to stderr: one formatted argument */ +#define DEBUG_XFT1(level,format,x1) \ + if (debug_xft > level) stderr_out (format, x1) + +/* print message to stderr: two formatted arguments */ +#define DEBUG_XFT2(level,format,x1,x2) \ + if (debug_xft > level) stderr_out (format, x1, x2) + +/* print message to stderr: three formatted arguments */ +#define DEBUG_XFT3(level,format,x1,x2,x3) \ + if (debug_xft > level) stderr_out (format, x1, x2, x3) + +/* print message to stderr: four formatted arguments */ +#define DEBUG_XFT4(level,format,x1,x2,x3,x4) \ + if (debug_xft > level) stderr_out (format, x1, x2, x3, x4) + +/* print an Xft pattern to stderr + LEVEL is the debug level (to compare to debug_xft) + FORMAT is a newline-terminated printf format with one %s for the pattern + and must be internal format (eg, pure ASCII) + PATTERN is an FcPattern *. */ +#define PRINT_XFT_PATTERN(level,format,pattern) \ + do { \ + DECLARE_EISTRING (eistrpxft_name); \ + FcChar8 *name = FcNameUnparse (pattern); \ + \ + eicpy_ext(eistrpxft_name, name, Qfc_font_name_encoding); \ + DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ + free (name); \ + } while (0) + +/* print a progress message + LEVEL is the debug level (to compare to debug_xft) + FONT is the Xft font name in UTF-8 (the native encoding of Xft) + LANG is the language being checked for support (must be ASCII). */ +#define CHECKING_LANG(level,font,lang) \ + do { \ + DECLARE_EISTRING (eistrcl_name); \ + eicpy_ext(eistrcl_name, font, Qfc_font_name_encoding); \ + DEBUG_XFT2 (level, "checking if %s handles %s\n", \ + eidata(eistrcl_name), lang); \ + } while (0) + +#else /* USE_XFT */ + +#endif /* USE_XFT */ + #endif /* INCLUDED_font_mgr_h_ */ Index: src/intl.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl.c,v retrieving revision 1.10 diff -u -u -r1.10 intl.c --- src/intl.c 2005/09/24 16:31:39 1.10 +++ src/intl.c 2006/08/06 16:42:05 ＠＠ -167,7 +167,7 ＠＠ void init_intl (void) { - /* This function can GC */ + /* This function cannot GC, because it explicitly prevents it. */ if (initialized) { int count = begin_gc_forbidden (); Index: src/lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.143 diff -u -u -r1.143 lisp.h --- src/lisp.h 2006/07/08 16:15:56 1.143 +++ src/lisp.h 2006/08/06 16:42:07 ＠＠ -5601,7 +5601,7 ＠＠ extern Lisp_Object Qprogn, Qquit, Qquote, Qrange_error; extern Lisp_Object Qread_char, Qread_from_minibuffer; extern Lisp_Object Qreally_early_error_handler, Qregion_beginning; -extern Lisp_Object Qregion_end, Qregistry, Qreverse_direction_charset; +extern Lisp_Object Qregion_end, Qregistries, Qreverse_direction_charset; extern Lisp_Object Qrun_hooks, Qsans_modifiers, Qsave_buffers_kill_emacs; extern Lisp_Object Qself_insert_command, Qself_insert_defer_undo, Qsequencep; extern Lisp_Object Qset, Qsetting_constant, Qshort_name, Qsingularity_error; Index: src/mule-charset.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-charset.c,v retrieving revision 1.47 diff -u -u -r1.47 mule-charset.c --- src/mule-charset.c 2006/06/03 17:50:54 1.47 +++ src/mule-charset.c 2006/08/06 16:42:08 ＠＠ -35,6 +35,7 ＠＠ #include "lstream.h" #include "mule-ccl.h" #include "objects.h" +#include "specifier.h" /* The various pre-defined charsets. */ ＠＠ -79,7 +80,7 ＠＠ Lisp_Object Qcharsetp; /* Qdoc_string, Qdimension, Qchars defined in general.c */ -Lisp_Object Qregistry, Qfinal, Qgraphic; +Lisp_Object Qregistries, Qfinal, Qgraphic; Lisp_Object Qdirection; Lisp_Object Qreverse_direction_charset; Lisp_Object Qshort_name, Qlong_name; ＠＠ -128,7 +129,7 ＠＠ mark_object (cs->short_name); mark_object (cs->long_name); mark_object (cs->doc_string); - mark_object (cs->registry); + mark_object (cs->registries); mark_object (cs->ccl_program); return cs->name; } ＠＠ -158,7 +159,7 ＠＠ CHARSET_COLUMNS (cs), CHARSET_GRAPHIC (cs), CHARSET_FINAL (cs)); - print_internal (CHARSET_REGISTRY (cs), printcharfun, 0); + print_internal (CHARSET_REGISTRIES (cs), printcharfun, 0); write_fmt_string (printcharfun, " 0x%x>", cs->header.uid); } ＠＠ -167,7 +168,7 ＠＠ { XD_INT, offsetof (Lisp_Charset, from_unicode_levels) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, name) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, doc_string) }, - { XD_LISP_OBJECT, offsetof (Lisp_Charset, registry) }, + { XD_LISP_OBJECT, offsetof (Lisp_Charset, registries) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, short_name) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, long_name) }, { XD_LISP_OBJECT, offsetof (Lisp_Charset, reverse_direction_charset) }, ＠＠ -239,7 +240,8 ＠＠ CHARSET_GRAPHIC (cs) = graphic; CHARSET_FINAL (cs) = final; CHARSET_DOC_STRING (cs) = doc; - CHARSET_REGISTRY (cs) = reg; + CHECK_VECTOR(reg); + CHARSET_REGISTRIES (cs) = reg; CHARSET_ENCODE_AS_UTF_8 (cs) = encode_as_utf_8 ? 1 : 0; CHARSET_CCL_PROGRAM (cs) = Qnil; CHARSET_REVERSE_DIRECTION_CHARSET (cs) = Qnil; ＠＠ -271,6 +273,8 ＠＠ } recalculate_unicode_precedence (); + setup_charset_initial_specifier_tags (obj); + return obj; } ＠＠ -419,8 +423,8 ＠＠ `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. +`registries' A vector of possible XLFD REGISTRY-ENCODING combinations for + this character set. Note that this is not a regular expression. `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. ＠＠ -468,7 +472,7 ＠＠ Ibyte final = 0; int direction = CHARSET_LEFT_TO_RIGHT; int type; - Lisp_Object registry = Qnil; + Lisp_Object registries = Qnil; Lisp_Object charset = Qnil; Lisp_Object ccl_program = Qnil; Lisp_Object short_name = Qnil, long_name = Qnil; ＠＠ -538,10 +542,10 ＠＠ invalid_constant ("Invalid value for `graphic'", value); } - else if (EQ (keyword, Qregistry)) + else if (EQ (keyword, Qregistries)) { - CHECK_STRING (value); - registry = value; + CHECK_VECTOR (value); + registries = value; } else if (EQ (keyword, Qdirection)) ＠＠ -613,8 +617,8 ＠＠ } if (NILP (doc_string)) doc_string = build_string (""); - if (NILP (registry)) - registry = build_string (""); + if (NILP (registries)) + registries = make_vector(0, Qnil); if (NILP (short_name)) short_name = XSYMBOL (name)->name; if (NILP (long_name)) ＠＠ -624,7 +628,7 ＠＠ charset = make_charset (id, name, dimension + 2, type, columns, graphic, final, direction, short_name, long_name, - doc_string, registry, !NILP (existing_charset), + doc_string, registries, !NILP (existing_charset), encode_as_utf_8); XCHARSET (charset)->temporary = temporary; ＠＠ -657,7 +661,7 ＠＠ int id, dimension, columns, graphic, encode_as_utf_8; Ibyte final; int direction, type; - Lisp_Object registry, doc_string, short_name, long_name; + Lisp_Object registries, doc_string, short_name, long_name; Lisp_Charset *cs; charset = Fget_charset (charset); ＠＠ -684,12 +688,12 ＠＠ doc_string = CHARSET_DOC_STRING (cs); short_name = CHARSET_SHORT_NAME (cs); long_name = CHARSET_LONG_NAME (cs); - registry = CHARSET_REGISTRY (cs); + registries = CHARSET_REGISTRIES (cs); encode_as_utf_8 = CHARSET_ENCODE_AS_UTF_8 (cs); new_charset = make_charset (id, new_name, dimension + 2, type, columns, graphic, final, direction, short_name, long_name, - doc_string, registry, 0, encode_as_utf_8); + doc_string, registries, 0, encode_as_utf_8); CHARSET_REVERSE_DIRECTION_CHARSET (cs) = new_charset; XCHARSET_REVERSE_DIRECTION_CHARSET (new_charset) = charset; ＠＠ -820,7 +824,7 ＠＠ if (EQ (prop, Qgraphic)) return make_int (CHARSET_GRAPHIC (cs)); if (EQ (prop, Qfinal)) return make_char (CHARSET_FINAL (cs)); if (EQ (prop, Qchars)) return make_int (CHARSET_CHARS (cs)); - if (EQ (prop, Qregistry)) return CHARSET_REGISTRY (cs); + if (EQ (prop, Qregistries)) return CHARSET_REGISTRIES (cs); if (EQ (prop, Qencode_as_utf_8)) return CHARSET_ENCODE_AS_UTF_8 (cs) ? Qt : Qnil; if (EQ (prop, Qccl_program)) return CHARSET_CCL_PROGRAM (cs); ＠＠ -861,16 +865,40 ＠＠ face_property_was_changed (Vdefault_face, Qfont, Qglobal); return Qnil; } + +DEFUN ("set-charset-registries", Fset_charset_registries, 2, 2, 0, /* +Set the `registries' property of CHARSET to REGISTRIES. -/* 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. +REGISTRIES is an ordered vector of strings that describe the X11 +CHARSET_REGISTRY and the CHARSET_ENCODINGs appropriate for this charset. +Separate each registry from the corresponding encoding with a dash. The +strings are not regular expressions, in contrast to the old behavior of +the `charset-registry' property. + +One reason to call this function might be if you're in Japan and you'd +prefer the backslash to display as a Yen sign; the corresponding syntax +would be: + +(set-charset-registries 'ascii ["jisx0201.1976-0"]) + */ - (charset, registry)) + (charset, registries)) { + int i; charset = Fget_charset (charset); - CHECK_STRING (registry); - XCHARSET_REGISTRY (charset) = registry; + CHECK_VECTOR (registries); + + for (i = 0; i < XVECTOR_LENGTH(registries); ++i) + { + CHECK_STRING (XVECTOR_DATA(registries)[i]); + if (NULL == qxestrchr(XSTRING_DATA(XVECTOR_DATA(registries)[i]), '-')) + { + invalid_argument("Not an X11 REGISTRY-ENCODING combination", + XVECTOR_DATA(registries)[i]); + } + } + + XCHARSET_REGISTRIES (charset) = registries; invalidate_charset_font_caches (charset); face_property_was_changed (Vdefault_face, Qfont, Qglobal); return Qnil; ＠＠ -967,14 +995,14 ＠＠ DEFSUBR (Fcharset_property); DEFSUBR (Fcharset_id); DEFSUBR (Fset_charset_ccl_program); - DEFSUBR (Fset_charset_registry); + DEFSUBR (Fset_charset_registries); #ifdef MEMORY_USAGE_STATS DEFSUBR (Fcharset_memory_usage); #endif DEFSYMBOL (Qcharsetp); - DEFSYMBOL (Qregistry); + DEFSYMBOL (Qregistries); DEFSYMBOL (Qfinal); DEFSYMBOL (Qgraphic); DEFSYMBOL (Qdirection); ＠＠ -1056,7 +1084,9 ＠＠ build_string ("ASCII"), build_msg_string ("ASCII"), build_msg_string ("ASCII (ISO646 IRV)"), - build_string ("\$iso8859-[0-9]*\\|-ascii\$"), 0, 0); + vector3(build_string("iso8859-1"), + build_string("ascii-0"), + build_string("iso8859-2")), 0, 0); staticpro (&Vcharset_control_1); Vcharset_control_1 = make_charset (LEADING_BYTE_CONTROL_1, Qcontrol_1, 2, ＠＠ -1065,7 +1095,7 ＠＠ build_string ("C1"), build_msg_string ("Control characters"), build_msg_string ("Control characters 128-191"), - build_string (""), 0, 0); + vector1(build_string("iso8859-1")), 0, 0); staticpro (&Vcharset_latin_iso8859_1); Vcharset_latin_iso8859_1 = make_charset (LEADING_BYTE_LATIN_ISO8859_1, Qlatin_iso8859_1, 2, ＠＠ -1074,7 +1104,7 ＠＠ build_string ("Latin-1"), build_msg_string ("ISO8859-1 (Latin-1)"), build_msg_string ("ISO8859-1 (Latin-1)"), - build_string ("iso8859-1"), 0, 0); + vector1(build_string("iso8859-1")), 0, 0); staticpro (&Vcharset_latin_iso8859_2); Vcharset_latin_iso8859_2 = make_charset (LEADING_BYTE_LATIN_ISO8859_2, Qlatin_iso8859_2, 2, ＠＠ -1083,7 +1113,7 ＠＠ build_string ("Latin-2"), build_msg_string ("ISO8859-2 (Latin-2)"), build_msg_string ("ISO8859-2 (Latin-2)"), - build_string ("iso8859-2"), 0, 0); + vector1(build_string("iso8859-2")), 0, 0); staticpro (&Vcharset_latin_iso8859_3); Vcharset_latin_iso8859_3 = make_charset (LEADING_BYTE_LATIN_ISO8859_3, Qlatin_iso8859_3, 2, ＠＠ -1092,7 +1122,7 ＠＠ build_string ("Latin-3"), build_msg_string ("ISO8859-3 (Latin-3)"), build_msg_string ("ISO8859-3 (Latin-3)"), - build_string ("iso8859-3"), 0, 0); + vector1(build_string("iso8859-3")), 0, 0); staticpro (&Vcharset_latin_iso8859_4); Vcharset_latin_iso8859_4 = make_charset (LEADING_BYTE_LATIN_ISO8859_4, Qlatin_iso8859_4, 2, ＠＠ -1101,7 +1131,7 ＠＠ build_string ("Latin-4"), build_msg_string ("ISO8859-4 (Latin-4)"), build_msg_string ("ISO8859-4 (Latin-4)"), - build_string ("iso8859-4"), 0, 0); + vector1(build_string("iso8859-2")), 0, 0); staticpro (&Vcharset_thai_tis620); Vcharset_thai_tis620 = make_charset (LEADING_BYTE_THAI_TIS620, Qthai_tis620, 2, ＠＠ -1110,7 +1140,7 ＠＠ build_string ("TIS620"), build_msg_string ("TIS620 (Thai)"), build_msg_string ("TIS620.2529 (Thai)"), - build_string ("tis620"), 0, 0); + vector1(build_string("tis620.2529-1")), 0, 0); staticpro (&Vcharset_greek_iso8859_7); Vcharset_greek_iso8859_7 = make_charset (LEADING_BYTE_GREEK_ISO8859_7, Qgreek_iso8859_7, 2, ＠＠ -1119,7 +1149,7 ＠＠ build_string ("ISO8859-7"), build_msg_string ("ISO8859-7 (Greek)"), build_msg_string ("ISO8859-7 (Greek)"), - build_string ("iso8859-7"), 0, 0); + vector1(build_string("iso8859-7")), 0, 0); staticpro (&Vcharset_arabic_iso8859_6); Vcharset_arabic_iso8859_6 = make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, ＠＠ -1128,7 +1158,7 ＠＠ build_string ("ISO8859-6"), build_msg_string ("ISO8859-6 (Arabic)"), build_msg_string ("ISO8859-6 (Arabic)"), - build_string ("iso8859-6"), 0, 0); + vector1(build_string ("iso8859-6")), 0, 0); staticpro (&Vcharset_hebrew_iso8859_8); Vcharset_hebrew_iso8859_8 = make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, ＠＠ -1137,7 +1167,7 ＠＠ build_string ("ISO8859-8"), build_msg_string ("ISO8859-8 (Hebrew)"), build_msg_string ("ISO8859-8 (Hebrew)"), - build_string ("iso8859-8"), 0, 0); + vector1(build_string ("iso8859-8")), 0, 0); staticpro (&Vcharset_katakana_jisx0201); Vcharset_katakana_jisx0201 = make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, 2, ＠＠ -1146,7 +1176,7 ＠＠ build_string ("JISX0201 Kana"), build_msg_string ("JISX0201.1976 (Japanese Kana)"), build_msg_string ("JISX0201.1976 Japanese Kana"), - build_string ("jisx0201.1976"), 0, 0); + vector1(build_string ("jisx0201.1976-0")), 0, 0); staticpro (&Vcharset_latin_jisx0201); Vcharset_latin_jisx0201 = make_charset (LEADING_BYTE_LATIN_JISX0201, Qlatin_jisx0201, 2, ＠＠ -1155,7 +1185,7 ＠＠ build_string ("JISX0201 Roman"), build_msg_string ("JISX0201.1976 (Japanese Roman)"), build_msg_string ("JISX0201.1976 Japanese Roman"), - build_string ("jisx0201.1976"), 0, 0); + vector1(build_string ("jisx0201.1976-0")), 0, 0); staticpro (&Vcharset_cyrillic_iso8859_5); Vcharset_cyrillic_iso8859_5 = make_charset (LEADING_BYTE_CYRILLIC_ISO8859_5, Qcyrillic_iso8859_5, 2, ＠＠ -1164,7 +1194,7 ＠＠ build_string ("ISO8859-5"), build_msg_string ("ISO8859-5 (Cyrillic)"), build_msg_string ("ISO8859-5 (Cyrillic)"), - build_string ("iso8859-5"), 0, 0); + vector1(build_string ("iso8859-5")), 0, 0); staticpro (&Vcharset_latin_iso8859_9); Vcharset_latin_iso8859_9 = make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, 2, ＠＠ -1173,7 +1203,7 ＠＠ build_string ("Latin-5"), build_msg_string ("ISO8859-9 (Latin-5)"), build_msg_string ("ISO8859-9 (Latin-5)"), - build_string ("iso8859-9"), 0, 0); + vector1(build_string ("iso8859-9")), 0, 0); staticpro (&Vcharset_latin_iso8859_15); Vcharset_latin_iso8859_15 = make_charset (LEADING_BYTE_LATIN_ISO8859_15, Qlatin_iso8859_15, 2, ＠＠ -1182,7 +1212,7 ＠＠ build_string ("Latin-9"), build_msg_string ("ISO8859-15 (Latin-9)"), build_msg_string ("ISO8859-15 (Latin-9)"), - build_string ("iso8859-15"), 0, 0); + vector1(build_string ("iso8859-15")), 0, 0); staticpro (&Vcharset_japanese_jisx0208_1978); Vcharset_japanese_jisx0208_1978 = make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, Qjapanese_jisx0208_1978, 3, ＠＠ -1192,7 +1222,8 ＠＠ build_msg_string ("JISX0208.1978 (Japanese)"), build_msg_string ("JISX0208.1978 Japanese Kanji (so called \"old JIS\")"), - build_string ("\$jisx0208\\|jisc6226\$\\.1978"), 0, 0); + vector2(build_string("jisx0208.1978-0"), + build_string("jisc6226.1978-0")), 0, 0); staticpro (&Vcharset_chinese_gb2312); Vcharset_chinese_gb2312 = make_charset (LEADING_BYTE_CHINESE_GB2312, Qchinese_gb2312, 3, ＠＠ -1201,7 +1232,8 ＠＠ build_string ("GB2312"), build_msg_string ("GB2312)"), build_msg_string ("GB2312 Chinese simplified"), - build_string ("gb2312"), 0, 0); + vector2(build_string("gb2312.1980-0"), + build_string("gb2312.80&gb8565.88-0")), 0, 0); staticpro (&Vcharset_japanese_jisx0208); Vcharset_japanese_jisx0208 = make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qjapanese_jisx0208, 3, ＠＠ -1210,7 +1242,8 ＠＠ build_string ("JISX0208"), build_msg_string ("JISX0208.1983/1990 (Japanese)"), build_msg_string ("JISX0208.1983/1990 Japanese Kanji"), - build_string ("jisx0208.19\$83\\|90\$"), 0, 0); + vector2(build_string("jisx0208.1983-0"), + build_string("jisx0208.1990-0")), 0, 0); staticpro (&Vcharset_korean_ksc5601); Vcharset_korean_ksc5601 = make_charset (LEADING_BYTE_KOREAN_KSC5601, Qkorean_ksc5601, 3, ＠＠ -1219,7 +1252,7 ＠＠ build_string ("KSC5601"), build_msg_string ("KSC5601 (Korean"), build_msg_string ("KSC5601 Korean Hangul and Hanja"), - build_string ("ksc5601"), 0, 0); + vector1(build_string("ksc5601.1987-0")), 0, 0); staticpro (&Vcharset_japanese_jisx0212); Vcharset_japanese_jisx0212 = make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qjapanese_jisx0212, 3, ＠＠ -1228,9 +1261,9 ＠＠ build_string ("JISX0212"), build_msg_string ("JISX0212 (Japanese)"), build_msg_string ("JISX0212 Japanese Supplement"), - build_string ("jisx0212"), 0, 0); + vector1(build_string("jisx0212.1990-0")), 0, 0); -#define CHINESE_CNS_PLANE_RE(n) "cns11643[.-]\$.*[.-]\$?" n "$" +#define CHINESE_CNS_PLANE(n) "cns11643.1992-" n staticpro (&Vcharset_chinese_cns11643_1); Vcharset_chinese_cns11643_1 = make_charset (LEADING_BYTE_CHINESE_CNS11643_1, Qchinese_cns11643_1, 3, ＠＠ -1240,7 +1273,7 ＠＠ build_msg_string ("CNS11643-1 (Chinese traditional)"), build_msg_string ("CNS 11643 Plane 1 Chinese traditional"), - build_string (CHINESE_CNS_PLANE_RE("1")), 0, 0); + vector1(build_string (CHINESE_CNS_PLANE("1"))), 0, 0); staticpro (&Vcharset_chinese_cns11643_2); Vcharset_chinese_cns11643_2 = make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qchinese_cns11643_2, 3, ＠＠ -1250,7 +1283,7 ＠＠ build_msg_string ("CNS11643-2 (Chinese traditional)"), build_msg_string ("CNS 11643 Plane 2 Chinese traditional"), - build_string (CHINESE_CNS_PLANE_RE("2")), 0, 0); + vector1(build_string (CHINESE_CNS_PLANE("2"))), 0, 0); staticpro (&Vcharset_chinese_big5_1); Vcharset_chinese_big5_1 = make_charset (LEADING_BYTE_CHINESE_BIG5_1, Qchinese_big5_1, 3, ＠＠ -1260,7 +1293,7 ＠＠ build_msg_string ("Big5 (Level-1)"), build_msg_string ("Big5 Level-1 Chinese traditional"), - build_string ("big5"), 0, 0); + vector1(build_string ("big5.eten-0")), 0, 0); staticpro (&Vcharset_chinese_big5_2); Vcharset_chinese_big5_2 = make_charset (LEADING_BYTE_CHINESE_BIG5_2, Qchinese_big5_2, 3, ＠＠ -1270,7 +1303,7 ＠＠ build_msg_string ("Big5 (Level-2)"), build_msg_string ("Big5 Level-2 Chinese traditional"), - build_string ("big5"), 0, 0); + vector1(build_string ("big5.eten-0")), 0, 0); #ifdef ENABLE_COMPOSITE_CHARS ＠＠ -1285,7 +1318,7 ＠＠ build_string ("Composite"), build_msg_string ("Composite characters"), build_msg_string ("Composite characters"), - build_string (""), 0, 0); + vector1(build_string ("")), 0, 0); #else /* We create a hack so that we have a way of storing ESC 0 and ESC 1 sequences as "characters", so that they will be output correctly. */ ＠＠ -1297,6 +1330,6 ＠＠ build_string ("Composite hack"), build_msg_string ("Composite characters hack"), build_msg_string ("Composite characters hack"), - build_string (""), 0, 0); + vector1(build_string ("")), 0, 0); #endif /* ENABLE_COMPOSITE_CHARS */ } Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.43 diff -u -u -r1.43 objects-x.c --- src/objects-x.c 2006/06/23 15:45:03 1.43 +++ src/objects-x.c 2006/08/06 16:42:09 ＠＠ -44,6 +44,15 ＠＠ int x_handle_non_fully_specified_fonts; +#ifdef DEBUG_XEMACS +Fixnum debug_x_objects; + +#define DEBUG_OBJECTS(FORMAT, ...) \ + do { if (debug_x_objects) stderr_out(FORMAT, __VA_ARGS__); } while (0) +#else +#define DEBUG_OBJECTS(X) +#endif + /************************************************************************/ /* color instances */ ＠＠ -205,74 +214,6 ＠＠ /* font instances */ /************************************************************************/ -#ifdef USE_XFT -/* #### all these #defines should probably move to font-mgr.h */ - -/* - The format of a fontname (as returned by fontconfig) is not well-documented, - But the character repertoire is represented in an ASCII-compatible way. See - fccharset.c (FcCharSetUnparse). So we can use UTF-8 for long names. - - Currently we have a hack where different versions of the unparsed name are - used in different contexts fairly arbitrarily. I don't think this is close - to coherency; even without the charset and lang properties fontconfig names - are too unwieldy to use. We need to rethink the approach here. I think - probably Lisp_Font_Instance.name should contain the font name as specified - to Lisp (almost surely much shorter than shortname, even, and most likely - wildcarded), while Lisp_Font_Instance.truename should contain the longname. - For now, I'm going to #ifdef the return values defaulting to short. -- sjt -*/ - -/* DEBUGGING STUFF */ - -/* print message to stderr: one internal-format string argument */ -#define DEBUG_XFT0(level,s) \ - if (debug_xft > level) stderr_out (s) - -/* print message to stderr: one formatted argument */ -#define DEBUG_XFT1(level,format,x1) \ - if (debug_xft > level) stderr_out (format, x1) - -/* print message to stderr: two formatted arguments */ -#define DEBUG_XFT2(level,format,x1,x2) \ - if (debug_xft > level) stderr_out (format, x1, x2) - -/* print message to stderr: three formatted arguments */ -#define DEBUG_XFT3(level,format,x1,x2,x3) \ - if (debug_xft > level) stderr_out (format, x1, x2, x3) - -/* print message to stderr: four formatted arguments */ -#define DEBUG_XFT4(level,format,x1,x2,x3,x4) \ - if (debug_xft > level) stderr_out (format, x1, x2, x3, x4) - -/* print an Xft pattern to stderr - LEVEL is the debug level (to compare to debug_xft) - FORMAT is a newline-terminated printf format with one %s for the pattern - and must be internal format (eg, pure ASCII) - PATTERN is an FcPattern *. */ -#define PRINT_XFT_PATTERN(level,format,pattern) \ - do { \ - DECLARE_EISTRING (eistrpxft_name); \ - Extbyte *name = (Extbyte *) FcNameUnparse (pattern); \ - \ - eicpy_ext(eistrpxft_name, name, Qfc_font_name_encoding); \ - DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ - free (name); \ - } while (0) - -/* print a progress message - LEVEL is the debug level (to compare to debug_xft) - FONT is the Xft font name in UTF-8 (the native encoding of Xft) - LANG is the language being checked for support (must be ASCII). */ -#define CHECKING_LANG(level,font,lang) \ - do { \ - DECLARE_EISTRING (eistrcl_name); \ - eicpy_ext(eistrcl_name, (Extbyte *) font, Qfc_font_name_encoding); \ - DEBUG_XFT2 (level, "checking if %s handles %s\n", \ - eidata(eistrcl_name), lang); \ - } while (0) - -#endif /* USE_XFT */ static int x_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object UNUSED (name), ＠＠ -814,7 +755,7 ＠＠ if (res) { FONT_INSTANCE_TRUENAME (f) = - build_ext_string ((Extbyte *) res, Qfc_font_name_encoding); + build_ext_string ((Extbyte *)res, Qfc_font_name_encoding); free (res); return FONT_INSTANCE_TRUENAME (f); } ＠＠ -946,6 +887,30 ＠＠ #ifdef MULE +static int +count_hyphens(const Ibyte *str, Bytecount length, Ibyte **last_hyphen) +{ + int hyphen_count = 0; + const Ibyte *hyphening = str; + const Ibyte *new_hyphening; + + for (hyphen_count = 0; + NULL != (new_hyphening = memchr((const void *)hyphening, '-', length)); + hyphen_count++) + { + ++new_hyphening; + length -= new_hyphening - hyphening; + hyphening = new_hyphening; + } + + if (NULL != last_hyphen) + { + *last_hyphen = (Ibyte *)hyphening; + } + + return hyphen_count; +} + static int x_font_spec_matches_charset (struct device * USED_IF_XFT (d), Lisp_Object charset, ＠＠ -953,6 +918,19 ＠＠ Bytecount offset, Bytecount length, int stage) { + Lisp_Object registries; + long i, registries_len; + const Ibyte *the_nonreloc; + Bytecount the_length; + + the_nonreloc = nonreloc; + the_length = length; + + if (!the_nonreloc) + the_nonreloc = XSTRING_DATA (reloc); + fixup_internal_substring (nonreloc, reloc, offset, &the_length); + the_nonreloc += offset; + if (stage) #ifdef USE_XFT { ＠＠ -967,6 +945,7 ＠＠ LISP_STRING_TO_EXTERNAL (reloc, extname, Qx_font_name_encoding); rf = xft_open_font_by_name (dpy, extname); return 0; /* #### maybe this will compile and run ;) */ + /* Jesus, Stephen, what the fuck? */ } } #else ＠＠ -975,6 +954,7 ＠＠ if (UNBOUNDP (charset)) return 1; + /* Hack! Short font names don't have the registry in them, so we just assume the user knows what they're doing in the case of ASCII. For other charsets, you gotta give the ＠＠ -986,41 +966,45 ＠＠ between faces and fonts? No - it looks like that would be an abuse (fontconfig doesn't know about colors, although Xft does). */ - if (EQ (charset, Vcharset_ascii)) + if (EQ (charset, Vcharset_ascii) && (!memchr (the_nonreloc, '*', the_length)) + && (5 > (count_hyphens(the_nonreloc, the_length, NULL)))) { - const Ibyte *the_nonreloc = nonreloc; - int i; - Bytecount the_length = length; - - if (!the_nonreloc) - the_nonreloc = XSTRING_DATA (reloc); - fixup_internal_substring (nonreloc, reloc, offset, &the_length); - the_nonreloc += offset; - if (!memchr (the_nonreloc, '*', the_length)) - { - for (i = 0;; i++) - { - const Ibyte *new_nonreloc = (const Ibyte *) - memchr (the_nonreloc, '-', the_length); - if (!new_nonreloc) - break; - new_nonreloc++; - the_length -= new_nonreloc - the_nonreloc; - the_nonreloc = new_nonreloc; - } - - /* If it has less than 5 dashes, it's a short font. - Of course, long fonts always have 14 dashes or so, but short - fonts never have more than 1 or 2 dashes, so this is some - sort of reasonable heuristic. */ - if (i < 5) - return 1; - } + return 1; } - return (fast_string_match (XCHARSET_REGISTRY (charset), - nonreloc, reloc, offset, length, 1, - ERROR_ME, 0) >= 0); + registries = XCHARSET_REGISTRIES (charset); + + if (NILP(registries)) + { + return 0; + } + + CHECK_VECTOR (registries); + registries_len = XVECTOR_LENGTH(registries); + + for (i = 0; i < registries_len; ++i) + { + if (!(STRINGP(XVECTOR_DATA(registries)[i])) + || (XSTRING_LENGTH(XVECTOR_DATA(registries)[i]) > the_length)) + { + continue; + } + + /* Check if the font spec ends in the registry specified. X11 says + this comparison is case insensitive: XLFD, section 3.11: + + "Alphabetic case distinctions are allowed but are for human + readability concerns only. Conforming X servers will perform + matching on font name query or open requests independent of case." */ + if (0 == qxestrcasecmp(XSTRING_DATA(XVECTOR_DATA(registries)[i]), + the_nonreloc + (the_length - + XSTRING_LENGTH + (XVECTOR_DATA(registries)[i])))) + { + return 1; + } + } + return 0; } #ifdef USE_XFT ＠＠ -1170,26 +1154,17 ＠＠ : eistr_shortname; \ } while (0) -#endif /* USE_XFT */ - -/* find a font spec that matches font spec FONT and also matches - (the registry of) CHARSET. */ static Lisp_Object -x_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset, - int stage) +xft_find_charset_font (Lisp_Object font, Lisp_Object charset, int stage) { - Extbyte **names; - int count = 0; const Extbyte *patternext; Lisp_Object result = Qnil; - int i; /* #### with Xft need to handle second stage here -- sjt Hm. Or maybe not. That would be cool. :-) */ if (stage) return Qnil; -#ifdef USE_XFT /* Fontconfig converts all FreeType names to UTF-8 before passing them back to callers---see fcfreetype.c (FcFreeTypeQuery). I don't believe this is documented. */ ＠＠ -1339,7 +1314,6 ＠＠ } ASSERT_ASCTEXT_ASCII((Extbyte *) lang); - } if (fccs) { ＠＠ -1356,7 +1330,7 ＠＠ else if (r == FcResultMatch && FcCharSetIsSubset (fccs, v)) { /* The full pattern with the bitmap coverage is massively - unwieldy, but the shorter names are's just *wrong*. We + unwieldy, but the shorter names are just *wrong*. We should have the full thing internally as truename, and filter stuff the client doesn't want to see on output. Should we just store it into the truename right here? */ ＠＠ -1432,42 +1406,156 ＠＠ return result; } - DEBUG_XFT1 (0, "shit happens, try X11 charset match for %s\n", - XSTRING_DATA(font)); + return Qnil; #undef DECLARE_DEBUG_FONTNAME +} + #endif /* USE_XFT */ + +static Lisp_Object +xlistfonts_checking_charset (Lisp_Object device, const Extbyte *xlfd, + Lisp_Object charset) +{ + Extbyte **names; + Lisp_Object result = Qnil; + int count = 0, i; + DECLARE_EISTRING(ei_single_result); - LISP_STRING_TO_EXTERNAL (font, patternext, Qx_font_name_encoding); names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)), - patternext, MAX_FONT_COUNT, &count); - /* #### This code seems awfully bogus -- mrb */ - /* #### fontconfig does it better -- sjt */ - for (i = 0; i < count; i ++) - { - const Ibyte *intname; - Bytecount intlen; - - TO_INTERNAL_FORMAT (C_STRING, names[i], - ALLOCA, (intname, intlen), - Qx_font_name_encoding); + xlfd, MAX_FONT_COUNT, &count); + for (i = 0; i < count; ++i) + { + eireset(ei_single_result); + eicpy_ext(ei_single_result, names[i], Qx_font_name_encoding); + if (x_font_spec_matches_charset (XDEVICE (device), charset, - intname, Qnil, 0, -1, 0)) + eidata(ei_single_result), Qnil, 0, + -1, 0)) { - result = build_ext_string ((const Extbyte *) intname, - Qx_font_name_encoding); + result = eimake_string(ei_single_result); + DEBUG_OBJECTS ("in xlistfonts_checking_charset, returning %s\n", + eidata(ei_single_result)); break; } } if (names) - XFreeFontNames (names); + { + XFreeFontNames (names); + } + + return result; +} + +/* find a font spec that matches font spec FONT and also matches + (the registry of) CHARSET. */ +static Lisp_Object +x_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset, + int stage) +{ + Lisp_Object result = Qnil; + int j, hyphen_count, registries_len = 0; + Ibyte *hyphening, *new_hyphening; + Bytecount xlfd_length; + + DECLARE_EISTRING(ei_xlfd_without_registry); + DECLARE_EISTRING(ei_xlfd); + +#ifdef USE_XFT + return xft_find_charset_font(font, charset, stage); +#endif + + if (stage) + { + return Qnil; + } + + if (!(NILP(XCHARSET_REGISTRIES(charset))) + && VECTORP(XCHARSET_REGISTRIES(charset))) + { + registries_len = XVECTOR_LENGTH(XCHARSET_REGISTRIES(charset)); + } + + eicpy_lstr(ei_xlfd, font); + hyphening = eidata(ei_xlfd); + xlfd_length = eilen(ei_xlfd); + + /* Count the hyphens in the string, moving new_hyphen to just after the + last one. */ + hyphen_count = count_hyphens(hyphening, xlfd_length, &new_hyphening); + + if (0 == registries_len || (5 > hyphen_count && + !(1 == xlfd_length && '*' == *hyphening))) + { + /* No proper XLFD specified, or we can't modify the pattern to change + the registry and encoding to match what we want, or we have no + information on the registry needed. */ + eito_external(ei_xlfd, Qx_font_name_encoding); + DEBUG_OBJECTS ("about to xlistfonts_checking_charset, XLFD %s\n", + eidata(ei_xlfd)); + result = xlistfonts_checking_charset (device, eiextdata(ei_xlfd), + charset); + /* No need to loop through the available registries; return + immediately. */ + return result; + } + else if (1 == xlfd_length && '*' == *hyphening) + { + /* It's a single asterisk. We can add the registry directly to the + end. */ + eicpy_ch(ei_xlfd_without_registry, '*'); + } + else + { + /* It's a fully-specified XLFD. Work out where the registry and + encoding are, and initialise ei_xlfd_without_registry to the string + without them. */ + + /* count_hyphens has set new_hyphening to just after the last + hyphen. Move back to just after the hyphen before it. */ + + for (new_hyphening -= 2; new_hyphening > hyphening + && '-' != *new_hyphening; --new_hyphening) + ; + ++new_hyphening; - /* Check for a short font name. */ - if (NILP (result) - && x_font_spec_matches_charset (XDEVICE (device), charset, 0, - font, 0, -1, 0)) - return font; + eicpy_ei(ei_xlfd_without_registry, ei_xlfd); + /* Manipulate ei_xlfd_without_registry, using the information about + ei_xlfd, to which it's identical. */ + eidel(ei_xlfd_without_registry, new_hyphening - hyphening, -1, + eilen(ei_xlfd) - (new_hyphening - hyphening), -1); + + } + + /* Now, loop through the registries and encodings defined for this + charset, doing an XListFonts each time with the pattern modified to + specify the regisry and encoding. This avoids huge amounts of IPC and + duplicated searching; now we use the searching the X server was doing + anyway, where before the X server did its search, transferred huge + amounts of data, and then we proceeded to do a regexp search on that + data. */ + for (j = 0; j < registries_len && NILP(result); ++j) + { + eireset(ei_xlfd); + eicpy_ei(ei_xlfd, ei_xlfd_without_registry); + + eicat_lstr(ei_xlfd, XVECTOR_DATA(XCHARSET_REGISTRIES(charset))[j]); + + eito_external(ei_xlfd, Qx_font_name_encoding); + + DEBUG_OBJECTS ("about to xlistfonts_checking_charset, XLFD %s\n", + eidata(ei_xlfd)); + result = xlistfonts_checking_charset (device, eiextdata(ei_xlfd), + charset); + } + + /* This function used to return the font spec, in the case where a font + didn't exist on the X server but it did match the charset. We're not + doing that any more, because none of the other platform code does, and + the old behaviour was badly-judged in other respects, so I don't trust + the original author to have had a good reason for it. */ + return result; } ＠＠ -1512,6 +1600,13 ＠＠ void vars_of_objects_x (void) { +#ifdef DEBUG_XEMACS + DEFVAR_INT ("debug-x-objects", &debug_x_objects /* +If non-zero, display debug information about X objects +*/ ); + debug_x_objects = 0; +#endif + DEFVAR_BOOL ("x-handle-non-fully-specified-fonts", &x_handle_non_fully_specified_fonts /* If this is true then fonts which do not have all characters specified Index: src/specifier.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v retrieving revision 1.44 diff -u -u -r1.44 specifier.c --- src/specifier.c 2006/02/27 16:29:28 1.44 +++ src/specifier.c 2006/08/06 16:42:10 ＠＠ -47,6 +47,7 ＠＠ Lisp_Object Qconsole_type, Qdevice_class; static Lisp_Object Vuser_defined_tags; +static Lisp_Object Vcharset_tag_lists; typedef struct specifier_type_entry specifier_type_entry; struct specifier_type_entry ＠＠ -973,6 +974,38 ＠＠ return 1; } +static int +charset_matches_specifier_tag_set_p (Lisp_Object charset, + Lisp_Object tag_set) +{ + Lisp_Object rest; + + LIST_LOOP (rest, tag_set) + { + Lisp_Object tag = XCAR (rest); + Lisp_Object assoc; + + if (NILP(XVECTOR_DATA + (Vcharset_tag_lists)[XCHARSET_LEADING_BYTE(charset) + - MIN_LEADING_BYTE])) + { + continue; + } + + assoc = assq_no_quit(tag, XVECTOR_DATA + (Vcharset_tag_lists) + [XCHARSET_LEADING_BYTE(charset) + - MIN_LEADING_BYTE]); + if (!(NILP(assoc)) && !(NILP(XCDR(assoc)))) + { + return 1; + } + } + + return 0; +} + + DEFUN ("device-matches-specifier-tag-set-p", Fdevice_matches_specifier_tag_set_p, 2, 2, 0, /* Return non-nil if DEVICE matches specifier tag set TAG-SET. ＠＠ -990,20 +1023,28 ＠＠ return device_matches_specifier_tag_set_p (device, tag_set) ? Qt : Qnil; } -DEFUN ("define-specifier-tag", Fdefine_specifier_tag, 1, 2, 0, /* +DEFUN ("define-specifier-tag", Fdefine_specifier_tag, 1, 3, 0, /* Define a new specifier tag. -If PREDICATE is specified, it should be a function of one argument -$a device) that specifies whether the tag matches that particular -device. If PREDICATE is omitted, the tag matches all devices. + +If DEVICE-PREDICATE is specified, it should be a function of one argument +\(a device) that specifies whether the tag matches that particular device. +If DEVICE-PREDICATE is omitted, the tag matches all devices. + +If CHARSET-PREDICATE is supplied, it should be a function taking one +argument \(a Lisp character set$ that retuns whether the tag matches that +character set--used when instantiating faces, chiefly. If omitted, the tag +matches no character set; the two-stage match process will ignore the tag on +its first pass, but if no match is found, it will respect it on the second +pass, where character set information is ignored. You can redefine an existing user-defined specifier tag. However, you cannot redefine the built-in specifier tags (the device types and classes) or the symbols nil, t, `all', or `global'. */ - (tag, predicate)) + (tag, device_predicate, charset_predicate)) { - Lisp_Object assoc, devcons, concons; - int recompute = 0; + Lisp_Object assoc, devcons, concons, charpres; + int recompute_devices = 0, recompute_charsets = 0, i; CHECK_SYMBOL (tag); if (valid_device_class_p (tag) || ＠＠ -1016,30 +1057,42 ＠＠ assoc = assq_no_quit (tag, Vuser_defined_tags); if (NILP (assoc)) { - recompute = 1; - Vuser_defined_tags = Fcons (Fcons (tag, predicate), Vuser_defined_tags); + recompute_devices = recompute_charsets = 1; + Vuser_defined_tags = Fcons (list3 (tag, device_predicate, + charset_predicate), + Vuser_defined_tags); DEVICE_LOOP_NO_BREAK (devcons, concons) { struct device *d = XDEVICE (XCAR (devcons)); /* Initially set the value to t in case of error - in predicate */ + in device_predicate */ DEVICE_USER_DEFINED_TAGS (d) = Fcons (Fcons (tag, Qt), DEVICE_USER_DEFINED_TAGS (d)); } + } + else if (!NILP (device_predicate) && !NILP (XCADR (assoc))) + { + recompute_devices = 1; + XCDR (assoc) = list2(device_predicate, charset_predicate); } - else if (!NILP (predicate) && !NILP (XCDR (assoc))) + else if (!NILP (charset_predicate) || !NILP(XCADDR (assoc))) { - recompute = 1; - XCDR (assoc) = predicate; + /* If there exists a charset_predicate for the tag currently (even if + the new charset_predicate is nil), or if we're adding one, we need + to recompute. This contrast with the device predicates, where we + don't need to recompute if the old and new device predicates are + both nil. */ + recompute_charsets = 1; + XCDR (assoc) = list2(device_predicate, charset_predicate); } - /* recompute the tag values for all devices. However, in the special - case where both the old and new predicates are nil, we know that - we don't have to do this. (It's probably common for people to - call (define-specifier-tag) more than once on the same tag, - and the most common case is where PREDICATE is not specified.) */ + /* recompute the tag values for all devices and charsets. However, in the + special case where both the old and new device_predicates are nil, we + know that we don't have to do this. (It's probably common for people to + call (define-specifier-tag) more than once on the same tag, and the + most common case is where DEVICE_PREDICATE is not specified.) */ - if (recompute) + if (recompute_devices) { DEVICE_LOOP_NO_BREAK (devcons, concons) { ＠＠ -1047,10 +1100,60 ＠＠ assoc = assq_no_quit (tag, DEVICE_USER_DEFINED_TAGS (XDEVICE (device))); assert (CONSP (assoc)); - if (NILP (predicate)) + if (NILP (device_predicate)) XCDR (assoc) = Qt; + else + XCDR (assoc) = !NILP (call1 (device_predicate, device)) ? Qt + : Qnil; + } + } + + if (recompute_charsets) + { + if (NILP(charset_predicate)) + { + charpres = Qnil; + } + + for (i = 0; i < NUM_LEADING_BYTES; ++i) + { + if (NILP(charset_by_leading_byte(MIN_LEADING_BYTE + i))) + { + continue; + } + + assoc = assq_no_quit (tag, + XVECTOR_DATA(Vcharset_tag_lists)[i]); + + if (!NILP(charset_predicate)) + { + charpres = call1_trapping_problems + ("Error during specifier tag charset predicate", + charset_predicate, + charset_by_leading_byte(MIN_LEADING_BYTE + i), 0); + + if (UNBOUNDP(charpres)) + { + charpres = Qnil; + } + else if (!NILP(charpres)) + { + /* Don't want to keep random other objects hanging around. */ + charpres = Qt; + } + } + + if (!NILP(assoc)) + { + assert(CONSP(assoc)); + XCDR (assoc) = charpres; + } else - XCDR (assoc) = !NILP (call1 (predicate, device)) ? Qt : Qnil; + { + XVECTOR_DATA(Vcharset_tag_lists)[i] + = Fcons(Fcons(tag, charpres), + XVECTOR_DATA (Vcharset_tag_lists)[i]); + } } } ＠＠ -1065,6 +1168,8 ＠＠ { Lisp_Object rest, rest2; Lisp_Object device = wrap_device (d); + Lisp_Object device_predicate, charset_predicate; + int list_len; DEVICE_USER_DEFINED_TAGS (d) = Fcopy_alist (Vuser_defined_tags); ＠＠ -1075,13 +1180,64 ＠＠ for (rest = Vuser_defined_tags, rest2 = DEVICE_USER_DEFINED_TAGS (d); !NILP (rest); rest = XCDR (rest), rest2 = XCDR (rest2)) { - Lisp_Object predicate = XCDR (XCAR (rest)); - if (NILP (predicate)) - XCDR (XCAR (rest2)) = Qt; + GET_LIST_LENGTH(XCAR(rest), list_len); + + assert(3 == list_len); + + device_predicate = XCADR(XCAR (rest)); + charset_predicate = XCADDR(XCAR (rest)); + + if (NILP (device_predicate)) + { + XCDR (XCAR (rest2)) = list2(Qt, charset_predicate); + } else - XCDR (XCAR (rest2)) = - !NILP (call_critical_lisp_code (d, predicate, device)) ? Qt : Qnil; + { + device_predicate = !NILP (call_critical_lisp_code + (d, device_predicate, device)) + ? Qt : Qnil; + XCDR (XCAR (rest2)) = list2(device_predicate, charset_predicate); + } + } +} + +void +setup_charset_initial_specifier_tags (Lisp_Object charset) +{ + Lisp_Object rest, charset_predicate, tag; + Lisp_Object charset_tag_list = Qnil; + + LIST_LOOP (rest, Vuser_defined_tags) + { + tag = XCAR(XCAR(rest)); + charset_predicate = XCADDR(XCAR (rest)); + + if (NILP(charset_predicate)) + { + continue; + } + + charset_predicate = call1_trapping_problems + ("Error during specifier tag charset predicate", charset_predicate, + charset, 0); + + if (UNBOUNDP(charset_predicate)) + { + charset_predicate = Qnil; + } + else if (!NILP(charset_predicate)) + { + /* Don't want to keep random other objects hanging around. */ + charset_predicate = Qt; + } + + charset_tag_list = Fcons(Fcons(tag, charset_predicate), + charset_tag_list); } + + XVECTOR_DATA + (Vcharset_tag_lists)[XCHARSET_LEADING_BYTE(charset) - MIN_LEADING_BYTE] + = charset_tag_list; } DEFUN ("device-matching-specifier-tag-list", ＠＠ -1100,7 +1256,7 ＠＠ LIST_LOOP (rest, DEVICE_USER_DEFINED_TAGS (d)) { - if (!NILP (XCDR (XCAR (rest)))) + if (!NILP (XCADR (XCAR (rest)))) list = Fcons (XCAR (XCAR (rest)), list); } ＠＠ -1132,8 +1288,9 ＠＠ RETURN_UNGCPRO (list); } -DEFUN ("specifier-tag-predicate", Fspecifier_tag_predicate, 1, 1, 0, /* -Return the predicate for the given specifier tag. +DEFUN ("specifier-tag-device-predicate", Fspecifier_tag_device_predicate, + 1, 1, 0, /* +Return the device predicate for the given specifier tag. */ (tag)) { ＠＠ -1156,9 +1313,25 ＠＠ list3 (Qeq, list2 (Qquote, tag), list2 (Qdevice_class, Qdevice))); - return XCDR (assq_no_quit (tag, Vuser_defined_tags)); + return XCADR (assq_no_quit (tag, Vuser_defined_tags)); } +DEFUN ("specifier-tag-charset-predicate", Fspecifier_tag_charset_predicate, + 1, 1, 0, /* +Return the charset predicate for the given specifier tag. +*/ + (tag)) +{ + /* The return value of this function must be GCPRO'd. */ + CHECK_SYMBOL (tag); + + if (NILP (Fvalid_specifier_tag_p (tag))) + invalid_argument ("Invalid specifier tag", + tag); + + return XCADDR (assq_no_quit (tag, Vuser_defined_tags)); +} + /* Return true if A "matches" B. If EXACT_P is 0, A must be a subset of B. Otherwise, A must be `equal' to B. The sets must be canonicalized. */ static int ＠＠ -2496,9 +2669,8 ＠＠ { /* This function can GC */ Lisp_Specifier *sp; - Lisp_Object device; - Lisp_Object rest; - int count = specpdl_depth (); + Lisp_Object device, charset = Qnil, rest; + int count = specpdl_depth (), respected_charsets = 0; struct gcpro gcpro1, gcpro2; GCPRO2 (specifier, inst_list); ＠＠ -2513,31 +2685,94 ＠＠ Fsignal will abort. */ specbind (Qinhibit_quit, Qt); + if (CONSP(matchspec) && (CHARSETP(XCAR(matchspec)))) + { + charset = Ffind_charset(XCAR(matchspec)); + } + + LIST_LOOP(rest, inst_list) + { + Lisp_Object tagged_inst = XCAR (rest); + Lisp_Object tag_set = XCAR (tagged_inst); + Lisp_Object val, the_instantiator; + + if (!device_matches_specifier_tag_set_p (device, tag_set)) + { + continue; + } + + val = XCDR (tagged_inst); + the_instantiator = val; + + if (!NILP(charset) && + !(charset_matches_specifier_tag_set_p (charset, tag_set))) + { + ++respected_charsets; + continue; + } + + if (HAS_SPECMETH_P (sp, instantiate)) + val = call_with_suspended_errors + ((lisp_fn_t) RAW_SPECMETH (sp, instantiate), + Qunbound, Qspecifier, errb, 5, specifier, + matchspec, domain, val, depth); + + if (!UNBOUNDP (val)) + { + unbind_to (count); + UNGCPRO; + if (instantiator) + *instantiator = the_instantiator; + return val; + } + } + + /* We've checked all the tag sets, and checking the charset part of the + specifier never returned 0 (preventing the attempted instantiation), so + there's no need to loop for the second time to avoid checking the + charsets. */ + if (!respected_charsets) + { + unbind_to (count); + UNGCPRO; + return Qunbound; + } + + /* Right, didn't instantiate a specifier last time, perhaps because we + paid attention to the charset-specific aspects of the specifier. Try + again without checking the charset information. + + We can't emulate the approach for devices, defaulting to matching all + character sets for a given specifier, because $random font instantiator + cannot usefully show all character sets, and indeed having it try is a + failure on our part. */ LIST_LOOP (rest, inst_list) { Lisp_Object tagged_inst = XCAR (rest); Lisp_Object tag_set = XCAR (tagged_inst); + Lisp_Object val, the_instantiator; - if (device_matches_specifier_tag_set_p (device, tag_set)) + if (!device_matches_specifier_tag_set_p (device, tag_set)) { - Lisp_Object val = XCDR (tagged_inst); - Lisp_Object the_instantiator = val; + continue; + } + val = XCDR (tagged_inst); + the_instantiator = val; - if (HAS_SPECMETH_P (sp, instantiate)) - val = call_with_suspended_errors - ((lisp_fn_t) RAW_SPECMETH (sp, instantiate), - Qunbound, Qspecifier, errb, 5, specifier, - matchspec, domain, val, depth); + if (HAS_SPECMETH_P (sp, instantiate)) + val = call_with_suspended_errors + ((lisp_fn_t) RAW_SPECMETH (sp, instantiate), + Qunbound, Qspecifier, errb, 5, specifier, + matchspec, domain, val, depth); - if (!UNBOUNDP (val)) - { - unbind_to (count); - UNGCPRO; - if (instantiator) - *instantiator = the_instantiator; - return val; - } + if (!UNBOUNDP (val)) + { + unbind_to (count); + UNGCPRO; + if (instantiator) + *instantiator = the_instantiator; + return val; } } ＠＠ -3408,7 +3643,8 ＠＠ DEFSUBR (Fdefine_specifier_tag); DEFSUBR (Fdevice_matching_specifier_tag_list); DEFSUBR (Fspecifier_tag_list); - DEFSUBR (Fspecifier_tag_predicate); + DEFSUBR (Fspecifier_tag_device_predicate); + DEFSUBR (Fspecifier_tag_charset_predicate); DEFSUBR (Fcheck_valid_instantiator); DEFSUBR (Fvalid_instantiator_p); ＠＠ -3509,4 +3745,7 ＠＠ Vunlock_ghost_specifiers = Qnil; staticpro (&Vunlock_ghost_specifiers); + + Vcharset_tag_lists = make_vector(NUM_LEADING_BYTES, Qnil); + staticpro (&Vcharset_tag_lists); } Index: src/specifier.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.h,v retrieving revision 1.19 diff -u -u -r1.19 specifier.h --- src/specifier.h 2005/11/25 01:42:06 1.19 +++ src/specifier.h 2006/08/06 16:42:10 ＠＠ -535,6 +535,7 ＠＠ void cleanup_specifiers (void); void prune_specifiers (void); void setup_device_initial_specifier_tags (struct device *d); +void setup_charset_initial_specifier_tags (Lisp_Object charset); void kill_specifier_buffer_locals (Lisp_Object buffer); DECLARE_SPECIFIER_TYPE (generic); Index: src/unicode.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unicode.c,v retrieving revision 1.34 diff -u -u -r1.34 unicode.c --- src/unicode.c 2006/06/14 06:10:10 1.34 +++ src/unicode.c 2006/08/06 16:42:11 ＠＠ -1115,7 +1115,7 ＠＠ Ibyte setname[32]; Lisp_Object charset_descr = build_string ("Mule charset for otherwise unknown Unicode code points."); - Lisp_Object charset_regr = build_string("iso10646-1"); + Lisp_Object charset_regr = vector1(build_string("iso10646-1")); struct gcpro gcpro1, gcpro2; ＠＠ -1148,7 +1148,7 ＠＠ nconc2 (list2(Qencode_as_utf_8, Qt), nconc2 (list6(Qcolumns, make_int(1), Qchars, make_int(96), Qdimension, make_int(2)), - list6(Qregistry, charset_regr, + list6(Qregistries, charset_regr, Qfinal, make_char(last_jit_charset_final++), /* This CCL program is initialised in unicode.el. */ -- Santa Maradona, priez pour moi!

3 participants
7 comments

[PATCH (pkgs)] VHDL mode update 17 years, 8 months

Jerry James

PATCH packages The VHDL mode home page has moved, so this seems like a good time for an update. xemacs-packages/vhdl/ChangeLog addition: 2006-08-09 Jerry James <james(a)xemacs.org> * ChangeLog.upstream: Update from 3.33.12. * vhdl-mode.el: Sync with 3.33.12. * vhdl-mode.texi: Fix a minor typo. * Makefile (AUTHOR_VERSION): Change to 3.33.12. packages source patch: Diff command: cvs -q diff -uN Files affected: xemacs-packages/vhdl/Makefile =================================================================== RCS xemacs-packages/vhdl/vhdl-mode.texi =================================================================== RCS xemacs-packages/vhdl/vhdl-mode.el =================================================================== RCS xemacs-packages/vhdl/ChangeLog.upstream =================================================================== RCS Index: xemacs-packages/vhdl/ChangeLog.upstream =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/ChangeLog.upstream,v retrieving revision 1.1 diff -d -u -r1.1 ChangeLog.upstream --- xemacs-packages/vhdl/ChangeLog.upstream 2006/04/18 16:26:34 1.1 +++ xemacs-packages/vhdl/ChangeLog.upstream 2006/08/09 16:03:12 ＠＠ -1,3 +1,46 ＠＠ +2006-05-23 Reto Zimmermann <reto(a)gnu.org> + + * vhdl-mode.el: Version 3.33.12 released. + (vhdl-in-quote-p): Handle single quoted characters correctly. + (vhdl-begin-*-re): Fix indentation for "if/case ... use". + (vhdl-fixup-whitespace-region): Add "??" operator. + (vhdl-corresponding-end): Fix indentation for "if/case ... use". + +2006-05-16 Reto Zimmermann <reto(a)gnu.org> + + * vhdl-mode.el + (vhdl-align-region-2): Not align at end of line. + (vhdl-in-literal): Also check character quotes (single quote). + (vhdl-align-region-2): Fix in-literal checking. + (vhdl-fixup-whitespace-region): Add ?= ?/= ?> ?>= ?< ?<= operators. + +2006-05-15 Reto Zimmermann <reto(a)gnu.org> + + * vhdl-mode.el: Version 3.33.11 released. + (vhdl-fixup-whitespace-region): Correctly handle single '-'. + (vhdl-align-region-2, vhdl-fixup-whitespace-region): Handle at boi. + (vhdl-get-syntactic-context): Fix argument list indentation. + +2006-05-11 Reto Zimmermann <reto(a)gnu.org> + + * vhdl-mode.el: Version 3.33.10 released. + (vhdl-compile): Use relative path for compiled files by default. + (vhdl-compile-absolute-path): Use absolute path for compiled files. + (vhdl-begin-p): Fix indentation for "-- when". + +2006-04-12 Reto Zimmermann <reto(a)gnu.org> + + * vhdl-mode.el: Version 3.33.8 released. + (vhdl-compiler-alist): Add "Aldec" simulator. + (vhdl-get-visible-signals): Allow "port ..." in middle of line. + (vhdl-fixup-whitespace-region): Fix whitespace removal before comma. + (top): Update for VHDL'02 standard (add 'protected' keyword). + +2006-01-13 Reto Zimmermann <reto(a)gnu.org> + + * vhdl-mode.el: + (vhdl-mode): Remove 'fill-prefix' definition for XEmacs (breaks else). + 2005-12-09 Reto Zimmermann <reto(a)gnu.org> * vhdl-mode.el: Version 3.33.7 released. Index: xemacs-packages/vhdl/vhdl-mode.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/vhdl-mode.el,v retrieving revision 1.9 diff -d -u -r1.9 vhdl-mode.el --- xemacs-packages/vhdl/vhdl-mode.el 2006/04/18 16:26:34 1.9 +++ xemacs-packages/vhdl/vhdl-mode.el 2006/08/09 16:03:13 ＠＠ -1,18 +1,18 ＠＠ ;;; vhdl-mode.el --- major mode for editing VHDL code -;; Copyright (C) 1992-2005 Free Software Foundation, Inc. +;; Copyright (C) 1992-2006 Free Software Foundation, Inc. ;; Authors: Reto Zimmermann <reto(a)gnu.org> ;; Rodney J. Whitby <software.vhdl-mode(a)rwhitby.net> ;; Maintainer: Reto Zimmermann <reto(a)gnu.org> -;; RCS: $Id: vhdl-mode.el,v 1.9 2006/04/18 16:26:34 james Exp $ +;; RCS: $Id: vhdl-mode.el,v 33.24 2006/05/23 13:07:18 reto Exp reto $ ;; Keywords: languages vhdl -;; WWW: http://opensource.ethz.ch/emacs/vhdl-mode.html +;; WWW: http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html -(defconst vhdl-version "3.33.8" +(defconst vhdl-version "3.33.12" "VHDL Mode version number.") -(defconst vhdl-time-stamp "2005-12-09" +(defconst vhdl-time-stamp "2006-05-23" "VHDL Mode time stamp for last update.") ;; This file is part of GNU Emacs. ＠＠ -57,7 +57,7 ＠＠ ;; - Block commenting ;; - Code fixing/alignment/beautification ;; - Postscript printing -;; - VHDL'87/'93 and VHDL-AMS supported +;; - VHDL'87/'93/'02 and VHDL-AMS supported ;; - Comprehensive menu ;; - Fully customizable ;; - Works under GNU Emacs (recommended) and XEmacs ＠＠ -221,6 +221,12 ＠＠ (defcustom vhdl-compiler-alist '( + ;; Aldec + ;; COMP96 ERROR COMP96_0078: "Unknown identifier "Addr_Bits"." "<filename>" 40 30 + ("Aldec" "vcom" "-93 -work \\1" "make" "-f \\1" + nil "vlib \\1; vmap \\2 \\1" "./" "work/" "Makefile" "aldec" + (".+?[ \t]+\$?:ERROR\$[^:]+:.+?\$?:.+\"\\(.+?\$\"[ \t]+\$[0-9]+\$\\)" 1 2 0) ("" 0) + nil) ;; Cadence Leapfrog: cv -file test.vhd ;; duluth: *E,430 (test.vhd,13): identifier (POSITIV) is not declared ("Cadence Leapfrog" "cv" "-work \\1 -file" "make" "-f \\1" ＠＠ -668,7 +674,7 ＠＠ "*VHDL standards used. Basic standard: VHDL'87 : IEEE Std 1076-1987 - VHDL'93 : IEEE Std 1076-1993 + VHDL'93/02 : IEEE Std 1076-1993/2002 Additional standards: VHDL-AMS : IEEE Std 1076.1 (analog-mixed-signal) Math packages: IEEE Std 1076.2 (`math_real', `math_complex') ＠＠ -677,7 +683,7 ＠＠ \"Activate Options\"." :type '(list (choice :tag "Basic standard" (const :tag "VHDL'87" 87) - (const :tag "VHDL'93" 93)) + (const :tag "VHDL'93/02" 93)) (set :tag "Additional standards" :indent 2 (const :tag "VHDL-AMS" ams) (const :tag "Math packages" math))) ＠＠ -1792,7 +1798,7 ＠＠ (defcustom vhdl-intelligent-tab t "*Non-nil means `TAB' does indentation, word completion and tab insertion. -That is, if preceeding character is part of a word then complete word, +That is, if preceding character is part of a word then complete word, else if not at beginning of line then insert tab, else if last command was a `TAB' or `RET' then dedent one step, else indent current line (i.e. `TAB' is bound to `vhdl-electric-tab'). ＠＠ -2898,7 +2904,7 ＠＠ (define-abbrev-table 'vhdl-mode-abbrev-table (append (when (memq 'vhdl vhdl-electric-keywords) - ;; VHDL'93 keywords + ;; VHDL'02 keywords '( ("--" "" vhdl-template-display-comment-hook 0) ("abs" "" vhdl-template-default-hook 0) ＠＠ -2975,6 +2981,7 ＠＠ ("postponed" "" vhdl-template-default-hook 0) ("procedure" "" vhdl-template-procedure-hook 0) ("process" "" vhdl-template-process-hook 0) + ("protected" "" vhdl-template-default-hook 0) ("pure" "" vhdl-template-default-hook 0) ("range" "" vhdl-template-default-hook 0) ("record" "" vhdl-template-default-hook 0) ＠＠ -3569,7 +3576,7 ＠＠ (list '87 (cadr vhdl-standard))) (vhdl-activate-customizations)) :style radio :selected (eq '87 (car vhdl-standard))] - ["VHDL'93" + ["VHDL'93/02" (progn (customize-set-variable 'vhdl-standard (list '93 (cadr vhdl-standard))) (vhdl-activate-customizations)) ＠＠ -4522,7 +4529,7 ＠＠ VHDL STANDARDS: The VHDL standards to be used are specified in option `vhdl-standard'. - Available standards are: VHDL'87/'93, VHDL-AMS, and Math Packages. + Available standards are: VHDL'87/'93(02), VHDL-AMS, and Math Packages. KEYWORD CASE: ＠＠ -4671,14 +4678,13 ＠＠ to above mailing lists by sending an email to <reto(a)gnu.org>. VHDL Mode is officially distributed at -http://opensource.ethz.ch/emacs/vhdl-mode.html +http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html where the latest version can be found. Known problems: --------------- -- Indentation bug in simultaneous if- and case-statements (VHDL-AMS). - XEmacs: Incorrect start-up when automatically opening speedbar. - XEmacs: Indentation in XEmacs 21.4 (and higher). ＠＠ -4814,7 +4820,7 ＠＠ ;;; Keywords and standardized words ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defconst vhdl-93-keywords +(defconst vhdl-02-keywords '( "abs" "access" "after" "alias" "all" "and" "architecture" "array" "assert" "attribute" ＠＠ -4829,7 +4835,7 ＠＠ "map" "mod" "nand" "new" "next" "nor" "not" "null" "of" "on" "open" "or" "others" "out" - "package" "port" "postponed" "procedure" "process" "pure" + "package" "port" "postponed" "procedure" "process" "protected" "pure" "range" "record" "register" "reject" "rem" "report" "return" "rol" "ror" "select" "severity" "shared" "signal" "sla" "sll" "sra" "srl" "subtype" ＠＠ -4839,7 +4845,7 ＠＠ "wait" "when" "while" "with" "xnor" "xor" ) - "List of VHDL'93 keywords.") + "List of VHDL'02 keywords.") (defconst vhdl-ams-keywords '( ＠＠ -4872,7 +4878,7 ＠＠ ) "List of Verilog keywords as candidate for additional reserved words.") -(defconst vhdl-93-types +(defconst vhdl-02-types '( "boolean" "bit" "bit_vector" "character" "severity_level" "integer" "real" "time" "natural" "positive" "string" "line" "text" "side" ＠＠ -4880,7 +4886,7 ＠＠ "std_logic" "std_logic_vector" "std_ulogic" "std_ulogic_vector" ) - "List of VHDL'93 standardized types.") + "List of VHDL'02 standardized types.") (defconst vhdl-ams-types '( ＠＠ -4898,7 +4904,7 ＠＠ ) "List of Math Packages standardized types.") -(defconst vhdl-93-attributes +(defconst vhdl-02-attributes '( "base" "left" "right" "high" "low" "pos" "val" "succ" "pred" "leftof" "rightof" "range" "reverse_range" ＠＠ -4908,7 +4914,7 ＠＠ "simple_name" "instance_name" "path_name" "foreign" ) - "List of VHDL'93 standardized attributes.") + "List of VHDL'02 standardized attributes.") (defconst vhdl-ams-attributes '( ＠＠ -4919,7 +4925,7 ＠＠ ) "List of VHDL-AMS standardized attributes.") -(defconst vhdl-93-enum-values +(defconst vhdl-02-enum-values '( "true" "false" "note" "warning" "error" "failure" ＠＠ -4928,7 +4934,7 ＠＠ "fs" "ps" "ns" "us" "ms" "sec" "min" "hr" "right" "left" ) - "List of VHDL'93 standardized enumeration values.") + "List of VHDL'02 standardized enumeration values.") (defconst vhdl-ams-enum-values '( ＠＠ -4950,7 +4956,7 ＠＠ ) "List of Math Packages standardized constants.") -(defconst vhdl-93-functions +(defconst vhdl-02-functions '( "now" "resolved" "rising_edge" "falling_edge" "read" "readline" "write" "writeline" "endfile" ＠＠ -4963,7 +4969,7 ＠＠ "shl" "shr" "ext" "sxt" "deallocate" ) - "List of VHDL'93 standardized functions.") + "List of VHDL'02 standardized functions.") (defconst vhdl-ams-functions '( ＠＠ -4981,7 +4987,7 ＠＠ ) "List of Math Packages standardized functions.") -(defconst vhdl-93-packages +(defconst vhdl-02-packages '( "std_logic_1164" "numeric_std" "numeric_bit" "standard" "textio" ＠＠ -4989,7 +4995,7 ＠＠ "std_logic_misc" "std_logic_textio" "ieee" "std" "work" ) - "List of VHDL'93 standardized packages and libraries.") + "List of VHDL'02 standardized packages and libraries.") (defconst vhdl-ams-packages '( ＠＠ -5055,26 +5061,26 ＠＠ (defun vhdl-words-init () "Initialize reserved words." (setq vhdl-keywords - (append vhdl-93-keywords + (append vhdl-02-keywords (when (vhdl-standard-p 'ams) vhdl-ams-keywords))) (setq vhdl-types - (append vhdl-93-types + (append vhdl-02-types (when (vhdl-standard-p 'ams) vhdl-ams-types) (when (vhdl-standard-p 'math) vhdl-math-types))) (setq vhdl-attributes - (append vhdl-93-attributes + (append vhdl-02-attributes (when (vhdl-standard-p 'ams) vhdl-ams-attributes))) (setq vhdl-enum-values - (append vhdl-93-enum-values + (append vhdl-02-enum-values (when (vhdl-standard-p 'ams) vhdl-ams-enum-values))) (setq vhdl-constants (append (when (vhdl-standard-p 'math) vhdl-math-constants))) (setq vhdl-functions - (append vhdl-93-functions + (append vhdl-02-functions (when (vhdl-standard-p 'ams) vhdl-ams-functions) (when (vhdl-standard-p 'math) vhdl-math-functions))) (setq vhdl-packages - (append vhdl-93-packages + (append vhdl-02-packages (when (vhdl-standard-p 'ams) vhdl-ams-packages) (when (vhdl-standard-p 'math) vhdl-math-packages))) (setq vhdl-reserved-words ＠＠ -5369,6 +5375,17 ＠＠ "Check if point is in a string." (eq (vhdl-in-literal) 'string)) +(defun vhdl-in-quote-p () + "Check if point is in a quote ('x')." + (or (and (> (point) (point-min)) + (< (1+ (point)) (point-max)) + (= (char-before (point)) ?\') + (= (char-after (1+ (point))) ?\')) + (and (> (1- (point)) (point-min)) + (< (point) (point-max)) + (= (char-before (1- (point))) ?\') + (= (char-after (point)) ?\')))) + (defun vhdl-in-literal () "Determine if point is in a VHDL literal." (save-excursion ＠＠ -5604,12 +5621,12 ＠＠ "is")))) (defconst vhdl-begin-fwd-re - "\\b\$is\\|begin\\|block\\|component\\|generate\\|then\\|else\\|loop\\|process\\|procedural\\|units\\|record\\|for\$\\b\$[^_]\\|\\'\$" + "\\b\$is\\|begin\\|block\\|component\\|generate\\|then\\|else\\|loop\\|process\\|procedural\\(\\s-+body\$?\\|units\\|use\\|record\\|for\\)\\b\$[^_]\\|\\'\$" "A regular expression for searching forward that matches all known \"begin\" keywords.") (defconst vhdl-begin-bwd-re - "\\b\$is\\|begin\\|block\\|component\\|generate\\|then\\|else\\|loop\\|process\\|procedural\\|units\\|record\\|for\$\\b[^_]" + "\\b\$is\\|begin\\|block\\|component\\|generate\\|then\\|else\\|loop\\|process\\|procedural\\(\\s-+body\$?\\|units\\|use\\|record\\|for\\)\\b[^_]" "A regular expression for searching backward that matches all known \"begin\" keywords.") ＠＠ -5642,15 +5659,15 ＠＠ (and (/= (following-char) ?\;) (not (looking-at "is\\|begin\\|process\\|procedural\\|block"))))) t) - ;; "begin", "then": - ((looking-at "be\\|t") + ;; "begin", "then", "use": + ((looking-at "be\\|t\\|use") t) ;; "else": ((and (looking-at "e") ;; make sure that the "else" isn't inside a ;; conditional signal assignment. (save-excursion - (re-search-backward ";\\|\\bwhen\\b[^_]" lim 'move) + (vhdl-re-search-backward ";\\|\\bwhen\\b[^_]" lim 'move) (or (eq (following-char) ?\;) (eq (point) lim)))) t) ＠＠ -5684,7 +5701,7 ＠＠ (cond ((looking-at "is\\|block\\|generate\\|process\\|procedural") "begin") - ((looking-at "then") + ((looking-at "then\\|use") "<else>") (t "end"))) ＠＠ -5699,6 +5716,9 ＠＠ of an identifier that just happens to contain a \"begin\" keyword." (save-excursion (and (looking-at vhdl-begin-fwd-re) + (or (not (looking-at "\\<use\\>")) + (save-excursion (back-to-indentation) + (looking-at "\$\\w+\\s-*:\\s-*\$?\\<\$case\\|elsif\\|if\$\\>"))) (/= (preceding-char) ?_) (not (vhdl-in-literal)) (vhdl-begin-p lim) ＠＠ -5722,7 +5742,7 ＠＠ (vhdl-backward-skip-label lim) (vhdl-first-word (point))))))) ;; "component", "units", "record": - ((looking-at "[cur]") + ((looking-at "c\\|un\\|r") ;; The first end found will close the block (vector "end" nil)) ;; "block", "process", "procedural": ＠＠ -5734,8 +5754,8 ＠＠ (vhdl-backward-skip-label lim) (vhdl-first-word (point)))))) ;; "then": - ((looking-at "t") - (vector "elsif\\|else\\|end\\s-+if" + ((looking-at "t\\|use") + (vector "elsif\\|else\\|end\\s-+\$if\\|use\$" (and (vhdl-last-word (point)) (or (vhdl-first-word (point)) (save-excursion ＠＠ -5781,7 +5801,7 ＠＠ (vhdl-end-p lim)) (if (looking-at "el") ;; "else", "elsif": - (vector "if\\|elsif" (vhdl-first-word (point)) "then" nil) + (vector "if\\|elsif" (vhdl-first-word (point)) "then\\|use" nil) ;; "end ...": (setq pos (point)) (forward-sexp) ＠＠ -5791,7 +5811,7 ＠＠ ((looking-at "if\\b[^_]") (vector "else\\|elsif\\|if" (vhdl-first-word pos) - "else\\|then" nil)) + "else\\|then\\|use" nil)) ;; "end component": ((looking-at "component\\b[^_]") (vector (buffer-substring (match-beginning 1) ＠＠ -5879,7 +5899,7 ＠＠ ))) (defconst vhdl-trailer-re - "\\b\$is\\|then\\|generate\\|loop\\|record\$\\b[^_]") + "\\b\$is\\|then\\|generate\\|loop\\|record\\|use\$\\b[^_]") (defconst vhdl-statement-fwd-re "\\b\$if\\|for\\|while\$\\b\$[^_]\\|\\'\$" ＠＠ -5959,6 +5979,9 ＠＠ (cond ;; "begin" keyword: ((and (looking-at vhdl-begin-fwd-re) + (or (not (looking-at "\\<use\\>")) + (save-excursion (back-to-indentation) + (looking-at "\$\\w+\\s-*:\\s-*\$?\\<\$case\\|elsif\\|if\$\\>"))) (/= (preceding-char) ?_) (vhdl-begin-p lim)) (setq foundp 'begin)) ＠＠ -6058,6 +6081,10 ＠＠ nil (backward-sexp) (if (and (looking-at vhdl-begin-fwd-re) + (or (not (looking-at "\\<use\\>")) + (save-excursion + (back-to-indentation) + (looking-at "\$\\w+\\s-*:\\s-*\$?\\<\$case\\|elsif\\|if\$\\>"))) (/= (preceding-char) ?_) (not (vhdl-in-literal)) (vhdl-begin-p lim)) ＠＠ -6377,6 +6404,10 ＠＠ (setq donep t))) ;; If we are looking at a "begin", then stop ((and (looking-at vhdl-begin-fwd-re) + (or (not (looking-at "\\<use\\>")) + (save-excursion + (back-to-indentation) + (looking-at "\$\\w+\\s-*:\\s-*\$?\\<\$case\\|elsif\\|if\$\\>"))) (/= (preceding-char) ?_) (vhdl-begin-p nil)) ;; If it's a leader "begin", then find the ＠＠ -6627,6 +6658,10 ＠＠ (setq begin-after-ip (and (not literal) (looking-at vhdl-begin-fwd-re) + (or (not (looking-at "\\<use\\>")) + (save-excursion + (back-to-indentation) + (looking-at "\$\\w+\\s-*:\\s-*\$?\\<\$case\\|elsif\\|if\$\\>"))) (vhdl-begin-p))) (setq end-after-ip (and (not literal) ＠＠ -6713,6 +6748,9 ＠＠ (save-excursion (vhdl-beginning-of-statement-1 containing-sexp) (skip-chars-backward " \t(") + (while (= (preceding-char) ?\;) + (vhdl-beginning-of-statement-1 containing-sexp) + (skip-chars-backward " \t(")) (<= (point) containing-sexp))) (goto-char containing-sexp) (vhdl-add-syntax 'arglist-cont-nonempty (vhdl-point 'boi))) ＠＠ -6994,7 +7032,7 ＠＠ ;; Indentation commands (defun vhdl-electric-tab (&optional prefix-arg) - "If preceeding character is part of a word or a paren then hippie-expand, + "If preceding character is part of a word or a paren then hippie-expand, else if right of non whitespace on line then insert tab, else if last command was a tab or return then dedent one step or if a comment toggle between normal indent and inline comment indent, ＠＠ -7326,7 +7364,11 ＠＠ (while (< bol end) (save-excursion (when (and (re-search-forward match eol t) - (not (vhdl-in-literal))) + (save-excursion + (goto-char (match-beginning 0)) + (and (not (vhdl-in-literal)) + (not (vhdl-in-quote-p)))) + (not (looking-at "\\s-*$"))) (setq distance (- (match-beginning substr) bol)) (when (> distance max) (setq max distance)))) ＠＠ -7341,7 +7383,13 ＠＠ (setq eol (save-excursion (end-of-line) (point))) (while (> lines 0) (when (and (re-search-forward match eol t) - (not (vhdl-in-literal))) + (save-excursion + (goto-char (match-beginning 0)) + (and (not (vhdl-in-literal)) + (not (vhdl-in-quote-p)))) + (not (looking-at "\\s-*$")) + (> (match-beginning 0) ; not if at boi + (save-excursion (back-to-indentation) (point)))) (setq width (- (match-end substr) (match-beginning substr))) (setq distance (- (match-beginning substr) bol)) (goto-char (match-beginning substr)) ＠＠ -7630,7 +7678,7 ＠＠ (while (re-search-forward "\$--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\$\\|\$\\s-*\\([,;]\$\\)" end t) (if (match-string 1) (goto-char (match-end 1)) - (replace-match "\\3 " nil nil nil 3))) + (replace-match "\\3 " nil nil nil 2))) ;; have no space after `(' (goto-char beg) (while (re-search-forward "\$--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\$\\|\$(\$\\s-+" end t) ＠＠ -7645,9 +7693,11 ＠＠ (replace-match "\\2"))) ;; surround operator symbols by one space (goto-char beg) - (while (re-search-forward "\$--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\$\\|\$\\([^/:<>=]\$\$:\\|=\\|<\\|>\\|:=\\|<=\\|>=\\|=>\\|/=\$\$[^=>]\\|$\$\\)" end t) - (if (match-string 1) - (goto-char (match-end 1)) + (while (re-search-forward "\$--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\$\\|\$\\([^/:<>=]\$\$:\\|\\??=\\|\\??<\\|\\??>\\|:=\\|\\??<=\\|\\??>=\\|=>\\|\\??/=\\|\\?\\?\$\$[^=>]\\|$\$\\)" end t) + (if (or (match-string 1) + (<= (match-beginning 0) ; not if at boi + (save-excursion (back-to-indentation) (point)))) + (goto-char (match-end 0)) (replace-match "\\3 \\4 \\5") (goto-char (match-end 2)))) ;; eliminate multiple spaces and spaces at end of line ＠＠ -7663,6 +7713,7 ＠＠ (progn (replace-match " " nil nil) t)) (and (looking-at "\\s-+") (re-search-forward "\\s-+" end t) (progn (replace-match " " nil nil) t)) + (and (looking-at "-") (re-search-forward "-" end t)) ; (re-search-forward "[^ \t-]+" end t)))) (re-search-forward "[^ \t\"-]+" end t)))) (unless no-message (message "Fixing up whitespace...done"))) ＠＠ -7924,8 +7975,8 ＠＠ (goto-char (point-min)) (if (not (re-search-forward (concat "^entity\\s-+" entity-name "\\>") nil t)) (error "ERROR: Entity \"%s\" not found:\n --> see option `vhdl-entity-file-name'" entity-name) - (when (setq beg (re-search-forward - "^\\s-*port[ \t\n]*(" + (when (setq beg (vhdl-re-search-forward + "\\<port[ \t\n]*(" (save-excursion (re-search-forward "^end\\>" nil t)) t)) (setq end (save-excursion ＠＠ -9970,7 +10021,7 ＠＠ (while (search-forward "<standard>" end t) (replace-match (concat "VHDL" (cond ((vhdl-standard-p '87) "'87") - ((vhdl-standard-p '93) "'93")) + ((vhdl-standard-p '93) "'93/02")) (when (vhdl-standard-p 'ams) ", VHDL-AMS") (when (vhdl-standard-p 'math) ", Math Packages")) t t)) (goto-char beg) ＠＠ -10455,7 +10506,7 ＠＠ (if vhdl-upper-case-keywords (upcase-word num) (downcase-word num))) (defun vhdl-minibuffer-tab (&optional prefix-arg) - "If preceeding character is part of a word or a paren then hippie-expand, + "If preceding character is part of a word or a paren then hippie-expand, else insert tab (used for word completion in VHDL minibuffer)." (interactive "P") (cond ＠＠ -10513,7 +10564,7 ＠＠ (save-excursion (beginning-of-line) ;; search backward for block beginning or end - (while (or (while (and (setq pos (re-search-backward "^\\s-*\$\\(end\$\\|\$\\(impure\\|pure\$[ \t\n]+\\)?\$function\\|procedure\$\\|\$for\$\\|\$architecture\\|component\\|configuration\\|entity\\|package\\|record\\|units\$\\|\$\\w+[ \t\n]*:[ \t\n]*\$?\$postponed[ \t\n]+\$?\$block\\|case\\|for\\|if\\|procedural\\|process\\|while\$\\)\\>" nil t)) + (while (or (while (and (setq pos (re-search-backward "^\\s-*\$\\(end\$\\|\$\\(impure\\|pure\$[ \t\n]+\\)?\$function\\|procedure\$\\|\$for\$\\|\$architecture\\|component\\|configuration\\|entity\\|package\\(\\s-+body\$?\\|record\\|units\\)\\|\$\\w+[ \t\n]*:[ \t\n]*\$?\$postponed[ \t\n]+\$?\$block\\|case\\|for\\|if\\|procedural\\|process\\|while\$\\)\\>" nil t)) ;; not consider subprogram declarations (or (and (match-string 5) (save-match-data ＠＠ -10543,7 +10594,7 ＠＠ (save-excursion (end-of-line) ;; search forward for block beginning or end - (while (or (while (and (setq pos (re-search-forward "^\\s-*\$\\(end\$\\|\$\\(impure\\|pure\$[ \t\n]+\\)?\$function\\|procedure\$\\|\$for\$\\|\$architecture\\|component\\|configuration\\|entity\\|package\\|record\\|units\$\\|\$\\w+[ \t\n]*:[ \t\n]*\$?\$postponed[ \t\n]+\$?\$block\\|case\\|for\\|if\\|procedural\\|process\\|while\$\\)\\>" nil t)) + (while (or (while (and (setq pos (re-search-forward "^\\s-*\$\\(end\$\\|\$\\(impure\\|pure\$[ \t\n]+\\)?\$function\\|procedure\$\\|\$for\$\\|\$architecture\\|component\\|configuration\\|entity\\|package\\(\\s-+body\$?\\|record\\|units\\)\\|\$\\w+[ \t\n]*:[ \t\n]*\$?\$postponed[ \t\n]+\$?\$block\\|case\\|for\\|if\\|procedural\\|process\\|while\$\\)\\>" nil t)) ;; not consider subprogram declarations (or (and (match-string 5) (save-match-data ＠＠ -13133,7 +13184,7 ＠＠ ;; Scan functions (defun vhdl-scan-context-clause () - "Scan the context clause that preceeds a design unit." + "Scan the context clause that precedes a design unit." (let (lib-alist) (save-excursion (when (re-search-backward "^[ \t]*\$architecture\\|configuration\\|entity\\|package\$\\>" nil t) ＠＠ -16183,6 +16234,9 ＠＠ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Compilation +(defvar vhdl-compile-absolute-path nil + "If non-nil, use absolute instead of relative path for compiled files.") + (defun vhdl-compile-init () "Initialize for compilation." (when (or (null compilation-error-regexp-alist) ＠＠ -16292,9 +16346,11 ＠＠ (compiler (or (aget vhdl-compiler-alist vhdl-compiler nil) (error "ERROR: No such compiler: \"%s\"" vhdl-compiler))) (command (nth 0 compiler)) - (file-name (buffer-file-name)) - (options (vhdl-get-compile-options project compiler file-name)) (default-directory (vhdl-compile-directory)) + (file-name (if vhdl-compile-absolute-path + (buffer-file-name) + (file-relative-name (buffer-file-name)))) + (options (vhdl-get-compile-options project compiler file-name)) compilation-process-setup-function) (unless (file-directory-p default-directory) (error "ERROR: Compile directory does not exist: \"%s\"" default-directory)) ＠＠ -16302,7 +16358,9 ＠＠ (when (string-match " " file-name) (setq file-name (concat "\"" file-name "\""))) ;; print out file name if compiler does not - (setq vhdl-compile-file-name (buffer-file-name)) + (setq vhdl-compile-file-name (if vhdl-compile-absolute-path + (buffer-file-name) + (file-relative-name (buffer-file-name)))) (when (and (= 0 (nth 1 (nth 10 compiler))) (= 0 (nth 1 (nth 11 compiler)))) (setq compilation-process-setup-function 'vhdl-compile-print-file-name)) ＠＠ -16939,13 +16997,13 ＠＠ Reserved words in VHDL ---------------------- -VHDL'93 (IEEE Std 1076-1993): - `vhdl-93-keywords' : keywords - `vhdl-93-types' : standardized types - `vhdl-93-attributes' : standardized attributes - `vhdl-93-enum-values' : standardized enumeration values - `vhdl-93-functions' : standardized functions - `vhdl-93-packages' : standardized packages and libraries +VHDL'93/02 (IEEE Std 1076-1993/2002): + `vhdl-02-keywords' : keywords + `vhdl-02-types' : standardized types + `vhdl-02-attributes' : standardized attributes + `vhdl-02-enum-values' : standardized enumeration values + `vhdl-02-functions' : standardized functions + `vhdl-02-packages' : standardized packages and libraries VHDL-AMS (IEEE Std 1076.1): `vhdl-ams-keywords' : keywords Index: xemacs-packages/vhdl/vhdl-mode.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/vhdl-mode.texi,v retrieving revision 1.6 diff -d -u -r1.6 vhdl-mode.texi --- xemacs-packages/vhdl/vhdl-mode.texi 2002/01/14 07:59:57 1.6 +++ xemacs-packages/vhdl/vhdl-mode.texi 2006/08/09 16:03:13 ＠＠ -147,7 +147,7 ＠＠ This manual is not very up-to-date. It basically contains the indentation machine documentation by Rod Whitby with only minor adaptions. A short documentation of the entire VHDL Mode is available -within the mode itself by typing ＠kbd{C-c C-h}. Also, all commands and +within the mode itself by typing ＠kbd{C-c C-h}. Also, all commands and the customization of most variables is available through the menu, which makes everything highly self-explaining. Index: xemacs-packages/vhdl/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/Makefile,v retrieving revision 1.32 diff -d -u -r1.32 Makefile --- xemacs-packages/vhdl/Makefile 2006/04/19 06:15:04 1.32 +++ xemacs-packages/vhdl/Makefile 2006/08/09 16:03:13 ＠＠ -18,7 +18,7 ＠＠ # Boston, MA 02111-1307, USA. VERSION = 1.21 -AUTHOR_VERSION = 3.33.8 +AUTHOR_VERSION = 3.33.12 MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org> PACKAGE = vhdl PKG_TYPE = regular -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

1 participants
1 comments

[PATCH] 21.5 Build Failure 17 years, 8 months

Vin Shelton

Without this patch I get a dump failure. lisp/ChangeLog addition: 2006-08-10 Vin Shelton <acs(a)xemacs.org> * subr.el: Move string-to-char-list to obsolete.el. * obsolete.el (string-to-char-list): Move obsolete definition here, so dumping can succeed. 21.5 source patch: Diff command: cvs -q diff -u Files affected: lisp/obsolete.el lisp/subr.el Index: lisp/subr.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/subr.el,v retrieving revision 1.38 diff -a -u -u -r1.38 subr.el --- lisp/subr.el 2006/08/10 12:28:42 1.38 +++ lisp/subr.el 2006/08/11 01:25:48 ＠＠ -928,9 +928,6 ＠＠ "Return a list of characters in STRING." (mapcar #'identity string)) -;; < 21.5 compatibility, eg. https://bugzilla.redhat.com/201524#c2 -(define-obsolete-function-alias 'string-to-char-list 'string-to-list) - (defun string-to-vector (string) "Return a vector of characters in STRING." (mapvector #'identity string)) Index: lisp/obsolete.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/obsolete.el,v retrieving revision 1.18 diff -a -u -u -r1.18 obsolete.el --- lisp/obsolete.el 2005/01/28 02:58:41 1.18 +++ lisp/obsolete.el 2006/08/11 01:25:48 ＠＠ -357,6 +357,9 ＠＠ (make-obsolete 'find-non-ascii-charset-region "use (delq 'ascii (charsets-in-region START END)) instead.") +;; < 21.5 compatibility, eg. https://bugzilla.redhat.com/201524#c2 +(define-obsolete-function-alias 'string-to-char-list 'string-to-list) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;; window-system objects ;; the functionality of column.el has been moved into C

1 participants
1 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches August 2006