February 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[Q21.4] Improve glyph documentation 19 years, 10 months

Vin Shelton

"Stephen J. Turnbull" <stephen(a)xemacs.org> writes: > APPROVE COMMIT 21.5 > > Eventually should go into 21.4, but I suspect it doesn't apply. > > Index: man/ChangeLog > =================================================================== > RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v > retrieving revision 1.252 > diff -u -U0 -r1.252 ChangeLog > --- man/ChangeLog 21 May 2004 03:27:55 -0000 1.252 > +++ man/ChangeLog 14 Jun 2004 10:15:50 -0000 > ＠＠ -0,0 +1,10 ＠＠ > +2004-06-14 Stephen J. Turnbull <stephen(a)xemacs.org> > + > + * lispref/glyphs.texi (Creating Glyphs): Improve discussion, fix a > + couple of typos. > + > + * lispref/faces.texi (Face Properties): Background pixmaps > + can be used on GTK and MS Windows. > + (Face Convenience Functions): Cross-reference glyph interface. > + Background pixmap is an image specifier, not a glyph. > + QUERY Stephen, This mostly does apply, except for one hunk about background pixmap. I'm always on the lookout for improvements to the glyph documentaion. Stephen, can I just steal^H^H^H^Hleverage the 21.5 glyph doc, or are there differences in the code? Please advise. Thank you, Vin

2 participants
2 comments

[COMMIT] [C21.5, ?21.4] Pui, adapt package name length in display 19 years, 10 months

Norbert Koch

NOTE: This patch has been committed. Hi! latin-euro-standards doesn't fit in the %-15s scheme pui currently has. So, allow more characters. Vin, would you accept a patch against 21.4? In this case I would remove a byte-compiler warning as well (already done in 21.5.)? norbert. ChangeLog addition: 2005-02-19 Norbert Koch <viteno(a)xemacs.org> * package-ui.el (pui-list-packages): The longest package name now has 20 characters. Adapt the display. 21.5-lisp source patch: Diff command: cvs -f -z3 -q diff -u -N Files affected: package-ui.el Index: package-ui.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-ui.el,v retrieving revision 1.23 diff -u -r1.23 package-ui.el --- package-ui.el 4 Nov 2004 23:05:55 -0000 1.23 +++ package-ui.el 19 Feb 2005 22:19:04 -0000 ＠＠ -607,11 +607,11 ＠＠ ")) (if pui-list-verbose - (insert " Latest Installed - Package name Vers. Vers. Description + (insert " Latest Installed + Package name Vers. Vers. Description ") - (insert " Latest - Package name Vers. Description + (insert " Latest + Package name Vers. Description ")) (insert sep-string) (setq start (point)) ＠＠ -640,13 +640,13 ＠＠ ((numberp current-vers) (setq current-vers (format "%.2f" current-vers)))) (insert - (format "%s %-15s %-5.2f %-5s %s\n" + (format "%s %-20s %-5.2f %-5s %s\n" (car disp) pkg-sym (if (stringp version) (string-to-number version) version) current-vers desc))) - (insert (format "%s %-15s %-5s %s\n" + (insert (format "%s %-20s %-5s %s\n" (car disp) pkg-sym version desc))) (save-excursion

2 participants
3 comments

[PATCH] XEmacs 21.4.17 fails on making of Gnus Info files 19 years, 10 months

Katsumi Yamaoka

Hi, I attached the patch[1] for fixing the following problem: % cd gnus % ./configure --with-emacs=xemacs-21.4.17 % make MAKEINFO=no info cd texi && make EMACS="xemacs-21.4.17" all make[1]: Entering directory `/Work/gnus/texi' if test "xno" != "xno" ; then \ LC_ALL=C no -I . --enable-encoding -o gnus gnus.texi; \ else \ rm -f gnus; \ xemacs-21.4.17 -batch -q -no-site-file -l ./infohack.el -f batch-makeinfo gnus.texi; \ fi ^GSymbol's function definition is void: line-end-position xemacs exiting . make[1]: *** [gnus] Error 255 make[1]: Leaving directory `/Work/gnus/texi' make: *** [info] Error 2 Although I have the makeinfo command, it cannot be used for Info files written in non-Latin text, for example, Japanese, so we often need to use texinfmt (they are irrelevant to Gnus, though). In addition to this, I also attached the patch[2] and the patch[3] for making XEmacs silent. It is to synch XEmacs with Emacs. The problem is that XEmacs issues a lot of noises while formatting Info files as follows: Formatting: The Gnus Newsreader ... /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean Formatting: Starting Gnus ... /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean /Work/gnus/texi/gnus clean Formatting: Finding the News ... [...] 2005-02-23 Katsumi Yamaoka <yamaoka(a)jpl.org> * texnfo-upd.el (texinfo-copy-node-name): Use point-at-eol instead of line-end-position. 2003-06-13 Katsumi Yamaoka <yamaoka(a)jpl.org> * texinfmt.el (texinfo-format-scan): Silence whitespace-cleanup. 2003-06-10 Rajesh Vaidheeswarran <rv(a)gnu.org> * whitespace.el (whitespace-cleanup): Respect user preference for silence. patch[1] --- texinfo/texnfo-upd.el~ 2004-11-08 22:02:45 +0000 +++ texinfo/texnfo-upd.el 2005-02-23 01:33:54 +0000 ＠＠ -498,7 +498,7 ＠＠ (progn (forward-word 1) ; skip over node command (skip-chars-forward " \t") ; and over spaces (point)) - (if (search-forward "," (line-end-position) t) ; bound search + (if (search-forward "," (point-at-eol) t) ; bound search (1- (point)) (end-of-line) (point))))) patch[2] --- texinfo/texinfmt.el~ 2004-12-08 22:05:20 +0000 +++ texinfo/texinfmt.el 2005-02-23 01:33:54 +0000 ＠＠ -985,7 +985,8 ＠＠ (error "Unterminated ＠%s" (car (car texinfo-stack))))) ;; Remove excess whitespace - (whitespace-cleanup)) + (let ((whitespace-silent t)) + (whitespace-cleanup))) (defvar texinfo-copying-text "" "Text of the copyright notice and copying permissions.") patch[3] --- text-modes/whitespace.el~ 2005-02-13 22:01:16 +0000 +++ text-modes/whitespace.el 2005-02-23 01:33:54 +0000 ＠＠ -572,7 +572,8 ＠＠ (if whitespace-any (whitespace-cleanup) (progn - (message "%s clean" buffer-file-name) + (if (not whitespace-silent) + (message "%s clean" buffer-file-name)) (whitespace-update-modeline))) (setq tab-width whitespace-tabwith-saved)))) Regards,

1 participants
0 comments

[C] xemacs-21.5-clean: Don't copy removed BUGS in install target of xemacs.mak 19 years, 10 months

Adrian Aichner

COMMIT Ben, this seems obvious. Adrian xemacs-21.5-clean ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: nt/ChangeLog Index: nt/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.182 diff -u -U0 -r1.182 ChangeLog --- nt/ChangeLog 18 Feb 2005 06:30:15 -0000 1.182 +++ nt/ChangeLog 22 Feb 2005 22:33:40 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-02-22 Adrian Aichner <adrian(a)xemacs.org> + + * xemacs.mak (install): Don't copy BUGS, which has been removed. + xemacs-21.5-clean source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: nt/xemacs.mak Index: nt/xemacs.mak =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v retrieving revision 1.112 diff -u -w -r1.112 xemacs.mak --- nt/xemacs.mak 31 Jan 2005 20:08:52 -0000 1.112 +++ nt/xemacs.mak 22 Feb 2005 22:32:39 -0000 ＠＠ -1457,7 +1457,6 ＠＠＠echo Installing in $(INSTALL_DIR) ... ＠echo PlaceHolder > PlaceHolder ＠$(COPY) $(SRCROOT)\PROBLEMS "$(INSTALL_DIR)\" - ＠$(COPY) $(SRCROOT)\BUGS "$(INSTALL_DIR)\" ＠$(COPY) $(SRCROOT)\README "$(INSTALL_DIR)\" ＠$(COPY) $(SRCROOT)\COPYING "$(INSTALL_DIR)\" ＠$(COPY) $(SRCROOT)\Installation "$(INSTALL_DIR)\" -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

2 participants
1 comments

[PATCH] xemacs-21.5: fix build on FreeBSD 19 years, 10 months

Andrey Slusar

Hi, On the FreeBSD 6 libxpg4 is obsolette. Patch is fixed this problem. Please, commit this patch to 21.4 branch too. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.763 diff -U0 -r1.763 ChangeLog --- src/ChangeLog 2005/01/06 03:45:28 1.763 +++ src/ChangeLog 2005/01/06 19:55:09 ＠＠ -0,0 +1,4 ＠＠ +2005-01-06 Andrey Slusar <anrays(a)gmail.com> + + * s/freebsd.h: fix build on the FreeBSD 6 + Index: src/s/freebsd.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/s/freebsd.h,v retrieving revision 1.22 diff -u -r1.22 freebsd.h --- src/s/freebsd.h 2002/03/13 08:53:22 1.22 +++ src/s/freebsd.h 2005/01/06 19:56:24 ＠＠ -29,7 +29,7 ＠＠ #ifndef __FreeBSD_version #include <osreldate.h> #endif -#if __FreeBSD_version >= 199701 +#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006 #define LIBS_SYSTEM "-lutil -lxpg4" #else #define LIBS_SYSTEM "-lutil" -- Regards, Andrey.

2 participants
2 comments

[PATCH] mail-lib: Allow new tab in browse url netscape 19 years, 10 months

Johann 'Myrkraverk' Oskarsson

Hi, Here is a patch to allow browse-url-netscape to open new tabs. Tested with Netscape 7.1 on Linux. PatchLog entry: 2005-02-21 Johann "Myrkraverk" Oskarsson <johann(a)myrkraverk.com> * browse-url.el: Add browse-url-netscape-new-window-is-tab. Johann -- This line is left blank intentionally

2 participants
2 comments

[AC 21.5] Provide release date as a variable, document version.sh 19 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 This nearly automates updating about.el to a sane value for release date. Note that the version.sh hunk won't apply after a couple of hours because of the CVS-date cron job. Norbert, could you add the script that updates CVS-date in xemacs_extra_name to your xemacs-builds directory? It also provides some internals.texi documentation about the version.sh file. I've also done configure.ac in sjt-xft, but that's not available to patch in the mainline yet. Commented out in the following patch: Index: ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.4 diff -u -r1.418.2.4 ChangeLog --- ChangeLog 2 Feb 2005 06:06:45 -0000 1.418.2.4 +++ ChangeLog 21 Feb 2005 11:31:31 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-02-21 Stephen J. Turnbull <stephen(a)xemacs.org> + + * version.sh (XEMACS_RELEASE_DATE): New version info variable. + + * configure.in (XEMACS_RELEASE_DATE): Use it. + #Index: ChangeLog #=================================================================== #RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/ChangeLog,v #retrieving revision 1.418.2.4 #diff -u -r1.418.2.4 ChangeLog #--- ChangeLog 2 Feb 2005 06:06:45 -0000 1.418.2.4 #+++ ChangeLog 21 Feb 2005 11:31:31 -0000 #＠＠ -0,0 +1,4 ＠＠ #+2005-02-21 Stephen J. Turnbull <stephen(a)xemacs.org> #+ #+ * configure.ac (XEMACS_RELEASE_DATE): Use it. #+ Index: src/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.5 diff -u -r1.758.2.5 ChangeLog --- src/ChangeLog 4 Feb 2005 16:05:30 -0000 1.758.2.5 +++ src/ChangeLog 21 Feb 2005 14:11:50 -0000 ＠＠ -0,0 +1,9 ＠＠ +2005-02-21 Stephen J. Turnbull <stephen(a)xemacs.org> + + * emacs.c (xemacs-release-date): New version info variable. + * config.h.in (XEMACS_RELEASE_DATE): New config.h macro. + + * emacs.c (inhibit-early-packages): + (inhibit-all-packages): + (xemacs-extra-name): Improve docstrings. + Index: lisp/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.599.2.2 diff -u -r1.599.2.2 ChangeLog --- lisp/ChangeLog 4 Feb 2005 16:05:54 -0000 1.599.2.2 +++ lisp/ChangeLog 21 Feb 2005 11:28:30 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-02-21 Stephen J. Turnbull <stephen(a)xemacs.org> + + * about.el (about-xemacs): + Compute release date from xemacs-release-date. + Index: man/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.288 diff -u -r1.288 ChangeLog --- man/ChangeLog 19 Feb 2005 16:18:52 -0000 1.288 +++ man/ChangeLog 21 Feb 2005 15:36:21 -0000 ＠＠ -0,0 +1,12 ＠＠ +2005-02-22 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (The version.sh Script): New node. + (XEmacs from the Perspective of Building): + (Low-Level Modules): + (The Build Configuration System): + (Adding Configurable Features): + Add or update references to the version.sh node and/or file. + + (XEmacs from the Perspective of Building): Improve text. + + #Index: configure.ac #=================================================================== #RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/configure.ac,v #retrieving revision 1.1.14.2 #diff -u -r1.1.14.2 configure.ac #--- configure.ac 2 Feb 2005 06:06:58 -0000 1.1.14.2 #+++ configure.ac 21 Feb 2005 11:30:40 -0000 #＠＠ -1128,6 +1128,9 ＠＠ # if test "$xemacs_extra_name" != ""; then # AC_DEFINE_UNQUOTED(XEMACS_EXTRA_NAME, "$xemacs_extra_name") # fi #+if test "$xemacs_release_date" != ""; then #+ AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date") #+fi # AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") # # if test "$with_infodock" = "yes"; then Index: configure.in =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/configure.in,v retrieving revision 1.233.2.3 diff -u -r1.233.2.3 configure.in --- configure.in 11 Dec 2004 05:12:28 -0000 1.233.2.3 +++ configure.in 21 Feb 2005 11:28:29 -0000 ＠＠ -1062,6 +1062,9 ＠＠ if test "$xemacs_extra_name" != ""; then AC_DEFINE_UNQUOTED(XEMACS_EXTRA_NAME, "$xemacs_extra_name") fi +if test "$xemacs_release_date" != ""; then + AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date") +fi AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") if test "$with_infodock" = "yes"; then Index: version.sh =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/version.sh,v retrieving revision 1.984.2.2 diff -u -r1.984.2.2 version.sh --- version.sh 1 Feb 2005 15:46:18 -0000 1.984.2.2 +++ version.sh 21 Feb 2005 13:09:38 -0000 ＠＠ -9,3 +9,4 ＠＠ infodock_minor_version=0 infodock_build_version=8 xemacs_extra_name="(CVS-20050221)" +xemacs_release_date="2005-02-18" Index: src/config.h.in =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.95.2.3 diff -u -r1.95.2.3 config.h.in --- src/config.h.in 1 Feb 2005 15:46:52 -0000 1.95.2.3 +++ src/config.h.in 21 Feb 2005 11:28:29 -0000 ＠＠ -110,6 +110,7 ＠＠ #undef EMACS_VERSION #undef XEMACS_CODENAME #undef XEMACS_EXTRA_NAME +#undef XEMACS_RELEASE_DATE /* InfoDock versions, not used with XEmacs */ #undef INFODOCK_MAJOR_VERSION #undef INFODOCK_MINOR_VERSION Index: src/emacs.c =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.150.2.2 diff -u -r1.150.2.2 emacs.c --- src/emacs.c 10 Dec 2004 06:43:48 -0000 1.150.2.2 +++ src/emacs.c 21 Feb 2005 14:10:39 -0000 ＠＠ -460,6 +460,7 ＠＠ Lisp_Object Vemacs_beta_version; Lisp_Object Vxemacs_codename; Lisp_Object Vxemacs_extra_name; +Lisp_Object Vxemacs_release_date; #ifdef INFODOCK Lisp_Object Vinfodock_major_version; Lisp_Object Vinfodock_minor_version; ＠＠ -4116,15 +4117,31 ＠＠ Vxemacs_codename = build_string (XEMACS_CODENAME); DEFVAR_LISP ("xemacs-extra-name", &Vxemacs_extra_name /* -Extra string to maybe put into the version string. +Arbitrary string to place in the version string after the codename. -Usually used to denote an XEmacs built from a CVS checkout between -releases. In that case its value would be \"(+CVS)\". +Appropriate surrounding whitespace will be added, but typically looks best +if enclosed in parentheses. + +A standard use is to indicate the date version.sh was last updated from +the CVS mainline, where it is automatically given a value similar to +\"(+CVS-20050221)\". Developers may also use it to indicate particular +branches, etc. */ ); #ifdef XEMACS_EXTRA_NAME Vxemacs_extra_name = build_string (XEMACS_EXTRA_NAME); #endif + DEFVAR_LISP ("xemacs-release-date", &Vxemacs_release_date /* +ISO 8601 format date string giving the date of latest release in series. + +The time may optionally be given. The time zone may not be given, and +is (implicitly) UTC. Currently not included in the version string. +*/ ); +#ifndef XEMACS_RELEASE_DATE +#define XEMACS_RELEASE_DATE "2005-02-18 (defaulted in emacs.c)" +#endif + Vxemacs_release_date = build_string (XEMACS_RELEASE_DATE); + /* Lisp variables which contain command line flags. The portable dumper stomps on these; they must be saved and restored ＠＠ -4139,12 +4156,14 ＠＠ */ ); DEFVAR_BOOL ("inhibit-early-packages", &inhibit_early_packages /* -Set to non-nil when the early packages should not be respected at startup. +Set to non-nil when the early packages should be ignored at startup. +Early package directories will not be added to `load-path', nor set up as +autoloads, nothing. */ ); DEFVAR_BOOL ("inhibit-all-packages", &inhibit_all_packages /* -Set to non-nil when the no packages should not be respected at startup. -XEmacs will utterly ignore the packages -- not in load-path, not set up as +Set to non-nil when all packages should be ignored at startup. +Package directories will not be added to `load-path', nor set up as autoloads, nothing. */ ); Index: lisp/about.el =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/lisp/about.el,v retrieving revision 1.63 diff -u -r1.63 about.el --- lisp/about.el 7 Nov 2004 12:03:58 -0000 1.63 +++ lisp/about.el 21 Feb 2005 13:50:14 -0000 ＠＠ -376,8 +376,28 ＠＠ (t (format "%d.%d" emacs-major-version emacs-minor-version)))) - (emacs-about-version (format "version %s of September 2004" - emacs-short-version))) + (emacs-release-date + (if (and (boundp 'xemacs-release-date) + (stringp xemacs-release-date) + (string-match "^\$[0-9]\\{4\\}\$-\$[0-9][0-9]\$-" + xemacs-release-date)) + (format "%s %s" + (aref [ "January" "February" "March" "April" + "May" "June" "July" "August" + "September" "October" "November" "December" ] + (1- (string-to-number + (match-string 2 xemacs-release-date)))) + (match-string 1 xemacs-release-date)) + "February 2005 (defaulted in about.el)")) + (emacs-variant-info (if (and xemacs-extra-name + (stringp xemacs-extra-name) + (< 0 (length xemacs-extra-name))) + (format " %s" xemacs-extra-name) + "")) + (emacs-about-version (format "version %s of %s%s" + emacs-short-version + emacs-release-date + emacs-variant-info))) (widget-insert (about-center emacs-about-version)) (widget-create 'link :help-echo "What's new in XEmacs" :action 'about-news Index: man/internals/internals.texi =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.60 diff -u -r1.60 internals.texi --- man/internals/internals.texi 19 Feb 2005 16:18:56 -0000 1.60 +++ man/internals/internals.texi 21 Feb 2005 15:46:46 -0000 ＠＠ -2415,8 +2427,8 ＠＠ This determines what the build environment is, chooses the appropriate ＠file{s/} and ＠file{m/} file, and runs a series of tests to determine many details about your environment, such as which library -functions are available and exactly how they work. The reason for -running these tests is that it allows XEmacs to be compiled on a much +functions are available and exactly how they work. +Running these tests allows XEmacs to be compiled on a much wider variety of platforms than those that the XEmacs developers happen to be familiar with, including various sorts of hybrid platforms. This is especially important now that many operating systems give you a great ＠＠ -2425,12 +2437,17 ＠＠ would be impossible to pre-determine and pre-specify the information for all possible configurations. -In fact, the ＠file{s/} and ＠file{m/} files are basically ＠emph{evil}, -since they contain unmaintainable platform-specific hard-coded -information. XEmacs has been moving in the direction of having all +Thus, the ＠file{s/} and ＠file{m/} files are basically ＠emph{evil}, +since they contain platform-specific hard-coded +information. XEmacs is moving in the direction of having all system-specific information be determined dynamically by ＠file{configure}. Perhaps someday we can ＠code{rm -rf src/s src/m}. +＠file{configure} also parses the version information from +(a)file{version.sh} and adds it to ＠file{config.h} as C preprocessor +macros. These macros in turn are used to initialize some Lisp +variables, such as ＠samp{emacs-version}. ＠xref{The version.sh Script}. + When configure is done running, it generates ＠file{Makefile}s and ＠file{GNUmakefile}s and the file ＠file{src/config.h} (which describes the features of your system) from template files. You then run ＠＠ -3054,6 +3071,7 ＠＠＠file{configure} ＠file{config.h.in} ＠file{Makefile.in.in} +(a)file{version.sh} ＠end example ＠example ＠＠ -3061,6 +3079,7 ＠＠＠file{configure.in} ＠end example +＠xref{The version.sh Script}. ＠xref{The configure Script}. ＠＠ -3096,6 +3115,15 ＠＠＠cindex modules, low-level ＠example +(a)file{version.sh} +＠end example + +This is a Bourne shell script which sets version-related variables. It +is updated in the release process by the maintainer of each series or +branch, and may also be automatically updated. +＠xref{The version.sh Script}. + +＠example ＠file{config.h} ＠end example ＠＠ -4138,6 +4166,7 ＠＠ macros in ＠file{configure.in} and ＠file{configure.ac}. ＠menu +* The version.sh Script:: * Adding Configurable Features:: * The configure Script:: * The Makefile Precursors:: ＠＠ -4145,7 +4174,98 ＠＠ -＠node Adding Configurable Features, The configure Script, The Build Configuration System, The Build Configuration System +＠node The version.sh Script, Adding Configurable Features, The Build Configuration System, The Build Configuration System +＠section The version.sh Script +＠cindex version.sh script +＠cindex scripts, version.sh + +The ＠file{version.sh} script is a snippet of Bourne shell script which +sets version variables. By convention, these variables are given +descriptive names, all in lower case ASCII letters, with words separated +by underscores (＠samp{_}, ASCII 0x5F). They are converted to C +preprocessor macro definitions and added to ＠file{src/config.h} by +＠file{configure}. Thus each must have a corresponding ＠samp{#undef} in +(a)file{src/config.h.in}. Each macro's name is the same as the shell +variable's, converted to all uppercase. Finally, the macros are used to +initialize Lisp variables defined in ＠file{src/emacs.c}. These Lisp +variables have the same name as the shell variables and preprocessor +macros, except that they obey the Lisp conventions that Lisp variable +names are all lowercase with words separated by hyphens (＠samp{-}, ASCII +0x2D), while the C implementations are the same as the shell variable +with the letter ＠samp{V} (ASCII 0x56) prepended. + +The file is updated by various release engineers and their scripts. +Other developers should have no need to edit this file. The main +exception would be to add a branch tag and possibly other information to +＠samp{xemacs_extra_name} to describe informal releases from a private +branch. In particular, ＠samp{xemacs_release_date} and the +＠samp{emacs_*_version} variables should refer to the most recent release +in the parent branch, so ``private branch'' maintainers should not +update them. If the branch is significant and long-lasting, you might +enjoy assigning your own codenames. (Of course, if you have no intent +of merging your changes to the mainline, you can do what you want with +any of the variables. But in that case you should change the name of +the program, as well, in version strings and the like.) + +Regarding the syntax of the file, it is simply a sequence of shell +variable assignments. So the only thing that you can rely on is that +the shebang (the shell's interpreter comment, ＠code{#!/bin/sh}) will +occupy the first line of the file. You should not count on order or +other comments being preserved. On the other hand, some maintainers' +tools do depend on the order, so as much as possible your tools should +preserve the order of assignments. + +Here is a table of the currently defined variables and their meanings (as +of February 2005): + +＠table ＠samp +＠item #!/bin/sh +The shebang, making this an executable script on Unix. + +＠item emacs_is_beta +Set to ＠samp{t} when the release is a beta test release, otherwise null. + +＠item emacs_major_version +＠itemx emacs_minor_version +＠itemx emacs_beta_version +Strings containing decimal numbers representing the components of the +version of the source tree. The name ＠samp{emacs_beta_version} is a +relic of the time when XEmacs had a two component version for public +releases. Since XEmacs 21.1, both the beta series and the stable series +have three-component version numbers, and ＠samp{emacs_beta_version} holds +the lowest-order component of the stable series as well as the beta series. + +＠item xemacs_codename +An optional string containing a codename for the release. Recent +maintainers have chosen humorous themes for their codenames, and +typically the names are used in alphabetical order. + +＠item emacs_kit_version +An optional string used for special branches. (This should be +deprecated in favor of xemacs_extra_name.) + +＠item infodock_major_version +＠itemx infodock_minor_version +＠itemx infodock_build_version +Strings containing decimal numbers representing the components of the +version of the Infodock applied to the source tree. (The Infodock +project has been in hibernation since XEmacs 21.1.9 or so; these +variables are unused in current XEmacsen.) + +＠item xemacs_extra_name +A string containing arbitrary additional information. If length is +positive, it is automatically added to the version string after the +codename. + +＠item xemacs_release_date +A string containing the date of the latest release in the series in ISO +8601 format. The time zone should not be present, it is defined to be +UTC. Time is optional. Not currently used in the version string. +＠end table + + + +＠node Adding Configurable Features, The configure Script, The version.sh Script, The Build Configuration System ＠section Adding Configurable Features ＠cindex adding configurable features ＠cindex configurable features, adding ＠＠ -4161,7 +4281,7 ＠＠＠node The configure Script, The Makefile Precursors, Adding Configurable Features, The Build Configuration System ＠section The configure Script ＠cindex configure script -＠cindex script, configure +＠cindex scripts, configure At the heart of the XEmacs build configuration system is the ＠file{configure} script. This beast is maintained using the Autoconf -- Institute of Policy and Planning Sciences 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.

3 participants
4 comments

[21.5] make-docfile needs to deal with UNUSED in DEFUN 19 years, 10 months

Stephen J. Turnbull

Not for 21.4. Yes, there are UNUSED in DEFUNs. Dunno why; GNU or backward compatibility, I guess. This results in a badly broken docstring: the "UNUSED" itself is interpreted as a formal argument, and the following close paren ends the argument list. This patch works for me so far, but the whole thing seems quite delicate: any mistakes in the parser here will cost you the docstrings of everything defined in C.... Tests and comments welcome. Eventually I'll commit if nobody complains. Index: lib-src/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.178.2.1 diff -u -r1.178.2.1 ChangeLog --- ChangeLog 2004/12/11 05:12:52 1.178.2.1 +++ ChangeLog 2005/01/22 04:53:31 ＠＠ -0,0 +1,5 ＠＠ +2004-12-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * make-docfile.c (write_c_args): Handle UNUSED, USED_IF macros. + (scan_c_file): Handle nested parens in DEFUN argument lists. + Index: lib-src/make-docfile.c =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/lib-src/make-docfile.c,v retrieving revision 1.15.2.1 diff -u -r1.15.2.1 make-docfile.c --- make-docfile.c 2004/12/11 05:12:54 1.15.2.1 +++ make-docfile.c 2005/01/23 11:07:27 ＠＠ -525,9 +525,16 ＠＠ char c = *p; int ident_start = 0; - /* XEmacs addition: add support for ANSI prototypes. Hop over - "Lisp_Object" string (the only C type allowed in DEFUNs) */ + /* XEmacs addition: add support for ANSI prototypes and the UNUSED + macros. Hop over them. "Lisp_Object" is the only C type allowed + in DEFUNs. For the UNUSED macros we need to eat parens, too. */ + static char uu [] = "UNUSED"; + static char ui [] = "USED_IF_"; static char lo[] = "Lisp_Object"; + + /* aren't these all vulnerable to buffer overrun? I guess that + means that the .c is busted, so we may as well just die ... */ + /* skip over "Lisp_Object" */ if ((C_IDENTIFIER_CHAR_P (c) != in_ident) && !in_ident && (strncmp (p, lo, sizeof (lo) - 1) == 0) && isspace ((unsigned char) p[sizeof (lo) - 1])) ＠＠ -538,6 +545,45 ＠＠ c = *p; } + /* skip over "UNUSED" invocation */ + if ((C_IDENTIFIER_CHAR_P (c) != in_ident) && !in_ident && + (strncmp (p, uu, sizeof (uu) - 1) == 0)) + { + char *here = p; + p += (sizeof (uu) - 1); + while (isspace ((unsigned char) (*p))) + p++; + if (*p == '(') + { + while (isspace ((unsigned char) (*++p))) + ; + c = *p; + } + else + p = here; + } + + /* skip over "USED_IF_*" invocation (only if USED failed) */ + else if ((C_IDENTIFIER_CHAR_P (c) != in_ident) && !in_ident && + (strncmp (p, ui, sizeof (ui) - 1) == 0)) + { + char *here = p; + p += (sizeof (ui) - 1); + /* There should be a law against parsing in C: + this allows a broken USED_IF call, skipping to next macro's + parens. *You* can fix that, I don't see how offhand. ;-) */ + while (*p && *p++ != '(') + ; + if (*p) + { + while (isspace ((unsigned char) (*p))) + p++; + c = *p; + } + else + p = here; + } + /* Notice when we start printing a new identifier. */ if (C_IDENTIFIER_CHAR_P (c) != in_ident) { ＠＠ -836,6 +882,7 ＠＠ if (defunflag && maxargs != -1) { char argbuf[1024], *p = argbuf; + int paren_level = 1; #if 0 /* For old DEFUN's only */ while (c != ')') { ＠＠ -858,8 +905,13 ＠＠ *p++ = c = getc (infile); if (c < 0) goto eof; + /* XEmacs change: handle macros with args (eg, UNUSED) */ + if (c == ')') + paren_level--; + if (c == '(') + paren_level++; } - while (c != ')'); + while (paren_level > 0); *p = '\0'; /* Output them. */ if (ellcc) -- 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

4 participants
5 comments

[PATCH] Re: replace-in-string infloops (was re: another math problem) 19 years, 10 months

Aidan Kehoe

The following message is a courtesy copy of an article that has been posted to comp.emacs.xemacs as well. Ar an fichiú lá de mí Feabhra, scríobh Dirk Joos: > > > (length (replace-in-string (replace-in-string (number-to-string number) > > > "[0-9]+\\." "") "0$" "")) > [...] > > Thanks for your quick answer. That explains why my function is working. > But I still don't understand why "0*$" leads to an infinite loop. Well, "0*$" means “zero or more 0 characters, anchored to the end of the string.” That will match any string, much like "$", "^" or ".*" So the loop on line 751 of subr.el never gets the chance to terminate, because the match never runs out of results. Perhaps we should check that the regexp never matches the empty string? replace-regexp-in-string jumps through hoops to advance the match data pointer by one char on each replace, but I believe it would be healthier to give an error on such a regexp. > It should work too. Why doesn't it? Hmm, that “it should work” is arguable, honestly ;-) . lisp/ChangeLog addition: 2005-02-20 Aidan Kehoe <kehoea(a)parhasard.net> * subr.el (replace-in-string): Throw an invalid-argument error if the pattern matches the empty string, preventing an infinite loop in that case. Index: subr.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/subr.el,v retrieving revision 1.35 diff -u -r1.35 subr.el --- subr.el 2004/06/17 11:29:39 1.35 +++ subr.el 2005/02/20 18:51:02 ＠＠ -738,6 +738,9 ＠＠ `\\E' means terminate the effect of any `\\U' or `\\L'." (check-argument-type 'stringp str) (check-argument-type 'stringp newtext) + (if (string-match regexp "") + (error 'invalid-argument + "Can't replace the empty string. Check caller's regexp.")) (if (> (length str) 50) (let ((cfs case-fold-search)) (with-temp-buffer -- “Ah come on now Ted, a Volkswagen with a mind of its own, driving all over the place and going mad, if that’s not scary I don’t know what is.”

2 participants
3 comments

Re: [Q] xemacs-21.5: Use region-exists-p in replace.el to fix ediff-regions-* and dired-ediff for zmacs-regions t 19 years, 10 months

Adrian Aichner

Scott Evans <gse(a)antisleep.com> writes: > On Fri, 22 Oct 2004, Steve Youngs wrote: > >> * Stephen J Turnbull <stephen(a)xemacs.org> writes: >> >> > Steve Youngs did the commit, patch was by Scott Evans. I can't >> > find either the patch itself >> >> <http://list-archive.xemacs.org/xemacs-patches/200209/msg00115.html> >> >> > or the approval on xemacs-patches, >> >> <http://list-archive.xemacs.org/xemacs-patches/200210/msg00181.html> >> >> You really don't expect me to remember anything about it do you? > > I remember writing the code... :) But I'm coming into this discussion > cold since I don't subscribe to xemacs-patches. What's up? Hi Scott, All! I finally found time looking at this again. replace.el<1.8> introduced support for regions to operate on. dired-ediff no longer worked since then, when using zmacs-regions t. I think I found the issue: While Emacs' mark-active is per-buffer, XEmacs' (region-active-p) is global. Therefor I think the fix for XEmacs is the following: I intend to commit after a few days of testing and waiting for feedback. Best regards, Adrian lisp/ChangeLog addtion: 2005-02-20 Adrian Aichner <adrian(a)xemacs.org> * replace.el (delete-non-matching-lines): Honor region only when active in current buffer. * replace.el (kill-non-matching-lines): Ditto. * replace.el (copy-non-matching-lines): Ditto. * replace.el (delete-matching-lines): Ditto. * replace.el (kill-matching-lines): Ditto. * replace.el (copy-matching-lines): Ditto. * replace.el (perform-replace): Ditto. Index: replace.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/replace.el,v retrieving revision 1.10 diff -u -u -r1.10 replace.el --- replace.el 12 May 2003 05:12:10 -0000 1.10 +++ replace.el 20 Feb 2005 16:16:52 -0000 ＠＠ -296,7 +296,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp t nil beg end)) ＠＠ -313,7 +314,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp t t beg end)) ＠＠ -330,7 +332,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-non-matching-lines regexp nil t beg end)) ＠＠ -392,7 +395,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp t nil beg end)) ＠＠ -409,7 +413,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp t t beg end)) ＠＠ -426,7 +431,8 ＠＠ (let ((beg nil) (end nil) (count nil)) - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) (setq beg (region-beginning)) (setq end (region-end))) (setq count (operate-on-matching-lines regexp nil t beg end)) ＠＠ -831,7 +837,8 ＠＠ (substitute-command-keys "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ")))) ;; If the region is active, operate on region. - (when (region-active-p) + (when (and (region-active-p) + (eq (current-buffer) (zmacs-region-buffer))) ;; Original Per Abrahamsen's code simply narrowed the region, ;; thus providing a visual indication of the search boundary. ;; Stallman, on the other hand, handles it like this. -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

3 participants
5 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 February 2005