From: tomo Date: Wed, 15 Jul 2009 09:11:44 +0000 (+0000) Subject: Sync up with r21-4-22. X-Git-Tag: r21-4-22-chise-0_24-cns7-r140^20 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c72d271c3325b14b8f28639e8108836675ee80ff;p=chise%2Fxemacs-chise.git.1 Sync up with r21-4-22. --- diff --git a/ChangeLog b/ChangeLog index 94a38b8..ed58ec5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,15 @@ * configure.in: Add new option `--with-utf-2000'; define `UTF2000' if it is specified. +2008-12-28 Vin Shelton + + * XEmacs 21.4.22 is released + +2007-11-22 Vin Shelton + + * etc/photos/vin.png: + * etc/photos/vinm.png: Updated. + 2007-10-07 Vin Shelton * XEmacs 21.4.21 is released @@ -169,7 +178,7 @@ * etc/NEWS: document motif deprecation and defaulting --with-widgets to off. -2005-12-04 Ville Skyttä +2005-12-04 Ville Skyttä * etc/PACKAGES: Fix description of xetla. 2005-12-03 Vin Shelton @@ -689,7 +698,7 @@ * Emacs.ad: Add charsets to *menubar*FontSet and *popup*FontSet. -2002-08-29 Ville Skyttä +2002-08-29 Ville Skyttä * Emacs.ad: Add *menubar*FontSet and *popup*FontSet entries, (self-)obtained from Red Hat. @@ -1332,7 +1341,7 @@ * XEmacs 21.2.38 is released. -2000-11-26 Björn Torkelsson +2000-11-26 Björn Torkelsson * configure.in: Only show message about DnD API if compiling with DnD @@ -2677,7 +2686,7 @@ * config.guess: Synched with latest FSF version. -1998-07-12 Björn Torkelsson +1998-07-12 Björn Torkelsson * Makefile.in: added LDFLAGS. diff --git a/lib-src/winclient.c b/lib-src/winclient.c index 7715882..086c382 100644 --- a/lib-src/winclient.c +++ b/lib-src/winclient.c @@ -43,6 +43,7 @@ static char * getNextArg (const char **ptr, unsigned *len); /* -- Post-Include Defines -------------------------------------------------- */ /* Timeouts & delays */ +#define CONNECT_RETRIES 10 #define CONNECT_DELAY 500 /* ms */ #define TRANSACTION_TIMEOUT 5000 /* ms */ #define MAX_INPUT_IDLE_WAIT INFINITE /* ms */ @@ -209,7 +210,7 @@ openConversation (void) CloseHandle (pi.hProcess); /* Try to connect */ - for (n = 0; n < 5; n++) + for (n = 0; n < CONNECT_RETRIES; n++) { Sleep (CONNECT_DELAY); diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19eecfb..e107e40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1475,6 +1475,36 @@ * files.el (insert-file-contents-literally): Treat file as binary; call file-name-handlers. [sync with Emacs 20.3.10] +2008-12-28 Vin Shelton + + * XEmacs 21.4.22 is released + +2008-12-30 Vin Shelton + + * easy-mmode.el: Added easy-mmode.el so autoload.el will work + during building even if no packages are found. + +2008-05-13 Aidan Kehoe + + * printer.el (generic-print-region): + (generic-print-buffer): + Use #'valid-device-type-p instead of #'valid-specifier-tag-p to + check if the msprinter device is available, now that msprinter is + always available as a specifier tag. + +2008-12-24 Vin Shelton + + * about.el: Add Francisco to my bio! + +2008-12-23 Vin Shelton + + * autoload.el: Move operator definitions to autoload-operators.el + in the xemacs-base package. + +2007-11-22 Vin Shelton + + * about.el (about-hacker-contribution): Updated my bio. + 2007-10-07 Vin Shelton * XEmacs 21.4.21 is released diff --git a/lisp/printer.el b/lisp/printer.el index 9f0b6d7..9b996f9 100644 --- a/lisp/printer.el +++ b/lisp/printer.el @@ -260,7 +260,7 @@ If BUFFER is nil or omitted, the current buffer is used." (let* ((print-region (and (interactive-p) (region-active-p))) (start (if print-region (region-beginning) (point-min buffer))) (end (if print-region (region-end) (point-max buffer)))) - (if (or (not (valid-specifier-tag-p 'msprinter)) + (if (or (not (valid-device-type-p 'msprinter)) (not display-print-dialog)) (generic-print-region start end buffer) (let* ((d (Printer-get-device)) @@ -309,7 +309,7 @@ Recognized properties are the same as those in `make-dialog-box': to-page Last page to print, inclusive, If omitted, printing ends at the end. copies Number of copies to print. If omitted, one copy is printed." - (cond ((valid-specifier-tag-p 'msprinter) + (cond ((valid-device-type-p 'msprinter) ;; loop, printing one copy of document per loop. kill and ;; re-create the frame each time so that we eject the piece ;; of paper at the end even if we're printing more than one diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog index 33afe7b..4800223 100644 --- a/netinstall/ChangeLog +++ b/netinstall/ChangeLog @@ -1,3 +1,7 @@ +2008-12-28 Vin Shelton + + * XEmacs 21.4.22 is released + 2007-10-07 Vin Shelton * XEmacs 21.4.21 is released diff --git a/nt/config.inc.samp b/nt/config.inc.samp index 397dac7..e089c19 100644 --- a/nt/config.inc.samp +++ b/nt/config.inc.samp @@ -98,3 +98,5 @@ DEPEND=0 # routines, instead of the older "unexec" routines in unexnt.c. USE_PORTABLE_DUMPER=1 +# Set this to build XEmacs with the Intel C Compiler. +USE_INTEL_COMPILER=0 diff --git a/src/ChangeLog b/src/ChangeLog index ce4a54a..18a5a04 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5978,6 +5978,32 @@ (Vcharset_thai_tis620): Likewise. (Vcharset_katakana_jisx0201): Likewise. +2008-12-28 Vin Shelton + + * XEmacs 21.4.22 is released + +2008-12-27 Vin Shelton + + * syswindows.h: Don't define wide character interfaces for Cygwin + 1.7 and up. + +2008-03-05 Dominique Quatravaux + + * glyphs-gtk.c: Fixed compilation under gcc 4.x. + +2008-11-01 Stephen J. Turnbull + + * regex.c (re_search_2): Fix at_dot by changing charpos to bytepos. + From Julian Bradfield <18654.1143.304851.782755@krk.inf.ed.ac.uk>. + +2008-12-25 Vin Shelton + + * mule-ccl.c (ccl_driver): Fix off-by-one error. + By Julian Bradfield in + <18691.16568.526264.972026@krk.inf.ed.ac.uk>. + + * mule-ccl.c (ccl_driver): + 2007-10-07 Vin Shelton * XEmacs 21.4.21 is released diff --git a/src/glyphs-gtk.c b/src/glyphs-gtk.c index 83fe167..836edbc 100644 --- a/src/glyphs-gtk.c +++ b/src/glyphs-gtk.c @@ -768,7 +768,7 @@ init_image_instance_from_gdk_image (struct Lisp_Image_Instance *ii, find_keyword_in_vector (instantiator, Q_file); IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap; - IMAGE_INSTANCE_GTK_MASK (ii) = 0; + IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0; IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width; IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height; IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth; @@ -3223,7 +3223,7 @@ gtk_colorize_image_instance (Lisp_Object image_instance, IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP; /* Make sure there aren't two pointers to the same mask, causing it to get freed twice. */ - IMAGE_INSTANCE_GTK_MASK (p) = 0; + IMAGE_INSTANCE_PIXMAP_MASK (p) = 0; break; default: diff --git a/src/mule-ccl.c b/src/mule-ccl.c index fccab69..1907762 100644 --- a/src/mule-ccl.c +++ b/src/mule-ccl.c @@ -1383,7 +1383,7 @@ ccl_driver (struct ccl_program *ccl, if (XCHARSET_DIMENSION (CHARSET_BY_LEADING_BYTE (i)) == 1) i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) | (reg[rrr] & 0x7F)); - else if (i < MAX_LEADING_BYTE_OFFICIAL_2) + else if (i <= MAX_LEADING_BYTE_OFFICIAL_2) i = ((i - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | reg[rrr]; else diff --git a/src/syswindows.h b/src/syswindows.h index 14d7a6f..131c155 100644 --- a/src/syswindows.h +++ b/src/syswindows.h @@ -190,7 +190,7 @@ typedef NMHDR *LPNMHDR; #include -#ifdef CYGWIN +#if defined (CYGWIN) && (CYGWIN_VERSION_DLL_COMBINED < 190) /* All but wcscmp and wcslen left out of Cygwin headers -- but present in /usr/include/mingw32/string.h! */ diff --git a/tests/automated/regexp-tests.el b/tests/automated/regexp-tests.el index 816868f..213f8c8 100644 --- a/tests/automated/regexp-tests.el +++ b/tests/automated/regexp-tests.el @@ -449,3 +449,20 @@ baaaa (not (match-beginning 1)))) ) + +;; empty string at point +;; Thanks Julian Bradford on XEmacs Beta +;; <18652.54975.894512.880956@krk.inf.ed.ac.uk> +(with-string-as-buffer-contents "aáa" + (goto-char (point-min)) + (Assert (looking-at "\\=")) + (Assert (= (re-search-forward "\\=") 1)) + (forward-char 1) + (Assert (looking-at "\\=")) + (Assert (= (re-search-forward "\\=") 2)) + (forward-char 1) + (Assert (looking-at "\\=")) + (Assert (= (re-search-forward "\\=") 3)) + (forward-char 1) + (Assert (looking-at "\\=")) + (Assert (= (re-search-forward "\\=") 4)))