From 625cee531623feddbe3174fad52c7db96ec60bb3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Sep 2017 15:34:15 +0300 Subject: [PATCH 1/6] Start emacs-26 release branch * configure.ac: * nt/README.W32: * README: * msdos/sed2v2.inp: Increment Emacs version to 26.0.60. * lisp/cus-edit.el (customize-changed-options-previous-release): Update value to "25.3". --- README | 2 +- configure.ac | 2 +- lisp/cus-edit.el | 2 +- msdos/sed2v2.inp | 2 +- nt/README.W32 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index c3cf78f04ca..46cff5876ff 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2017 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 26.0.50 of GNU Emacs, the extensible, +This directory tree holds version 26.0.60 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.ac b/configure.ac index c88471657f6..6452038d1b9 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT(GNU Emacs, 26.0.50, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 26.0.60, bug-gnu-emacs@gnu.org) dnl Set emacs_config_options to the options of 'configure', quoted for the shell, dnl and then quoted again for a C string. Separate options with spaces. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 1e13e950476..6b67555770f 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1159,7 +1159,7 @@ Show the buffer in another window, but don't select it." (unless (eq symbol basevar) (message "`%s' is an alias for `%s'" symbol basevar)))) -(defvar customize-changed-options-previous-release "24.5" +(defvar customize-changed-options-previous-release "25.3" "Version for `customize-changed-options' to refer back to by default.") ;; Packages will update this variable, so make it available. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index ba1bb4eecda..be685710fd8 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -66,7 +66,7 @@ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ -/^#undef VERSION/s/^.*$/#define VERSION "26.0.50"/ +/^#undef VERSION/s/^.*$/#define VERSION "26.0.60"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --git a/nt/README.W32 b/nt/README.W32 index a670687ef21..bec0b66ac5d 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2017 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 25.1.50 for MS-Windows + Emacs version 26.0.60 for MS-Windows This README file describes how to set up and run a precompiled distribution of the latest version of GNU Emacs for MS-Windows. You From 12e864eb30df410906b5fb5d47f0342be7073527 Mon Sep 17 00:00:00 2001 From: Andy Moreton Date: Sat, 16 Sep 2017 16:44:39 +0300 Subject: [PATCH 2/6] Avoid MinGW64 compiler warnings in unexw32.c * src/unexw32.c (pDWP) [MINGW_W64]: Define to "16llx" only for the 64-bit build. --- src/unexw32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unexw32.c b/src/unexw32.c index 0c6b48342e5..e97a52ba07a 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -471,7 +471,7 @@ get_section_info (file_data *p_infile) } /* Format to print a DWORD_PTR value. */ -#ifdef MINGW_W64 +#if defined MINGW_W64 && defined _WIN64 # define pDWP "16llx" #else # define pDWP "08lx" From dee96f4a170be134fafd2d11f264952b7e030303 Mon Sep 17 00:00:00 2001 From: Gemini Lasswell Date: Tue, 25 Apr 2017 07:42:01 -0700 Subject: [PATCH 3/6] * lisp/emacs-lisp/cl-macs.el (cl-letf): Fix Edebug spec (bug#24765) --- lisp/emacs-lisp/cl-macs.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index d90e70d3d8b..32ba0ac3091 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2438,7 +2438,9 @@ As a special case, if `(PLACE)' is used instead of `(PLACE VALUE)', the PLACE is not modified before executing BODY. \(fn ((PLACE VALUE) ...) BODY...)" - (declare (indent 1) (debug ((&rest (gate gv-place &optional form)) body))) + (declare (indent 1) (debug ((&rest [&or (symbolp form) + (gate gv-place &optional form)]) + body))) (if (and (not (cdr bindings)) (cdar bindings) (symbolp (caar bindings))) `(let ,bindings ,@body) (cl--letf bindings () () body))) From 5490ccc5ebf39759dfd084bbd31f464701a3e775 Mon Sep 17 00:00:00 2001 From: Mark Oteiza Date: Sat, 16 Sep 2017 12:49:28 -0400 Subject: [PATCH 4/6] Add lisp variable lcms-d65-xyz This serves as the default optional argument for functions in this library. * src/lcms.c (lcms-d65-xyz): New variable. (lcms-cam02-ucs): Use it. Use better word in docstring. Fix bug color1 -> color2. * test/src/lcms-tests.el: Add some tests for lcms-cri-cam02-ucs. (lcms-colorspacious-d65): New variable. --- src/lcms.c | 18 ++++++++++-------- test/src/lcms-tests.el | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/lcms.c b/src/lcms.c index 1f3ace3baac..cdfbc0ecf99 100644 --- a/src/lcms.c +++ b/src/lcms.c @@ -162,7 +162,7 @@ parse_xyz_list (Lisp_Object xyz_list, cmsCIEXYZ *color) DEFUN ("lcms-cam02-ucs", Flcms_cam02_ucs, Slcms_cam02_ucs, 2, 3, 0, doc: /* Compute CAM02-UCS metric distance between COLOR1 and COLOR2. -Each color is a list of XYZ coordinates, with Y scaled to unity. +Each color is a list of XYZ coordinates, with Y scaled about unity. Optional argument is the XYZ white point, which defaults to illuminant D65. */) (Lisp_Object color1, Lisp_Object color2, Lisp_Object whitepoint) { @@ -186,15 +186,11 @@ Optional argument is the XYZ white point, which defaults to illuminant D65. */) if (!(CONSP (color1) && parse_xyz_list (color1, &xyz1))) signal_error ("Invalid color", color1); if (!(CONSP (color2) && parse_xyz_list (color2, &xyz2))) - signal_error ("Invalid color", color1); + signal_error ("Invalid color", color2); if (NILP (whitepoint)) - { - xyzw.X = 95.047; - xyzw.Y = 100.0; - xyzw.Z = 108.883; - } + parse_xyz_list (Vlcms_d65_xyz, &xyzw); else if (!(CONSP (whitepoint) && parse_xyz_list (whitepoint, &xyzw))) - signal_error("Invalid white point", whitepoint); + signal_error ("Invalid white point", whitepoint); vc.whitePoint.X = xyzw.X; vc.whitePoint.Y = xyzw.Y; @@ -295,6 +291,12 @@ DEFUN ("lcms2-available-p", Flcms2_available_p, Slcms2_available_p, 0, 0, 0, void syms_of_lcms2 (void) { + DEFVAR_LISP ("lcms-d65-xyz", Vlcms_d65_xyz, + doc: /* D65 illuminant as a CIE XYZ triple. */); + Vlcms_d65_xyz = list3 (make_float (0.950455), + make_float (1.0), + make_float (1.088753)); + defsubr (&Slcms_cie_de2000); defsubr (&Slcms_cam02_ucs); defsubr (&Slcms2_available_p); diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el index 0d6b8db3d4b..e176cff2dc6 100644 --- a/test/src/lcms-tests.el +++ b/test/src/lcms-tests.el @@ -33,6 +33,9 @@ (require 'ert) (require 'color) +(defconst lcms-colorspacious-d65 '(0.95047 1.0 1.08883) + "D65 white point from colorspacious.") + (defun lcms-approx-p (a b &optional delta) "Check if A and B are within relative error DELTA of one another. B is considered the exact value." @@ -46,6 +49,22 @@ B is considered the exact value." (lcms-approx-p a2 b2 delta) (lcms-approx-p a3 b3 delta)))) +(ert-deftest lcms-cri-cam02-ucs () + "Test use of `lcms-cam02-ucs'." + (should-error (lcms-cam02-ucs '(0 0 0) '(0 0 0) "error")) + (should-error (lcms-cam02-ucs '(0 0 0) 'error)) + (should-not + (lcms-approx-p + (let ((lcms-d65-xyz '(0.44757 1.0 0.40745))) + (lcms-cam02-ucs '(0.5 0.5 0.5) '(0 0 0))) + (lcms-cam02-ucs '(0.5 0.5 0.5) '(0 0 0)))) + (should (eql 0.0 (lcms-cam02-ucs '(0.5 0.5 0.5) '(0.5 0.5 0.5)))) + (should + (lcms-approx-p (lcms-cam02-ucs lcms-colorspacious-d65 + '(0 0 0) + lcms-colorspacious-d65) + 100.0))) + (ert-deftest lcms-whitepoint () "Test use of `lcms-temp->white-point'." (should-error (lcms-temp->white-point 3999)) From c3df816585c6b8953fd4075cff894ec2d9ce0596 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Sep 2017 22:17:55 +0300 Subject: [PATCH 5/6] Fix compilation warning in etags.c * lib-src/etags.c (etags_mktmp) [DOS_NT]: Don't dereference a NULL pointer. Reported by Richard Copley . --- lib-src/etags.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib-src/etags.c b/lib-src/etags.c index 4000f47a414..009cba528d7 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -7068,14 +7068,16 @@ etags_mktmp (void) errno = temp_errno; templt = NULL; } - #if defined (DOS_NT) - /* The file name will be used in shell redirection, so it needs to have - DOS-style backslashes, or else the Windows shell will barf. */ - char *p; - for (p = templt; *p; p++) - if (*p == '/') - *p = '\\'; + else + { + /* The file name will be used in shell redirection, so it needs to have + DOS-style backslashes, or else the Windows shell will barf. */ + char *p; + for (p = templt; *p; p++) + if (*p == '/') + *p = '\\'; + } #endif return templt; From 96aaeaaffac8a93d9c8126ba77ad217a3f323fce Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Sep 2017 22:25:13 +0300 Subject: [PATCH 6/6] ; * src/lcms.c: Minor stylistic changes in comments. --- src/lcms.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lcms.c b/src/lcms.c index cdfbc0ecf99..f543a030399 100644 --- a/src/lcms.c +++ b/src/lcms.c @@ -102,7 +102,7 @@ DEFUN ("lcms-cie-de2000", Flcms_cie_de2000, Slcms_cie_de2000, 2, 5, 0, Each color is a list of L*a*b* coordinates, where the L* channel ranges from 0 to 100, and the a* and b* channels range from -128 to 128. Optional arguments KL, KC, KH are weighting parameters for lightness, -chroma, and hue, respectively. The parameters each default to 1. */) +chroma, and hue, respectively. The parameters each default to 1. */) (Lisp_Object color1, Lisp_Object color2, Lisp_Object kL, Lisp_Object kC, Lisp_Object kH) { @@ -163,7 +163,7 @@ parse_xyz_list (Lisp_Object xyz_list, cmsCIEXYZ *color) DEFUN ("lcms-cam02-ucs", Flcms_cam02_ucs, Slcms_cam02_ucs, 2, 3, 0, doc: /* Compute CAM02-UCS metric distance between COLOR1 and COLOR2. Each color is a list of XYZ coordinates, with Y scaled about unity. -Optional argument is the XYZ white point, which defaults to illuminant D65. */) +Optional argument is the XYZ white point, which defaults to illuminant D65. */) (Lisp_Object color1, Lisp_Object color2, Lisp_Object whitepoint) { cmsViewingConditions vc; @@ -239,7 +239,7 @@ Optional argument is the XYZ white point, which defaults to illuminant D65. */) DEFUN ("lcms-temp->white-point", Flcms_temp_to_white_point, Slcms_temp_to_white_point, 1, 1, 0, doc: /* Return XYZ black body chromaticity from TEMPERATURE given in K. -Valid range of TEMPERATURE is from 4000K to 25000K. */) +Valid range of TEMPERATURE is from 4000K to 25000K. */) (Lisp_Object temperature) { cmsFloat64Number tempK; @@ -292,7 +292,7 @@ void syms_of_lcms2 (void) { DEFVAR_LISP ("lcms-d65-xyz", Vlcms_d65_xyz, - doc: /* D65 illuminant as a CIE XYZ triple. */); + doc: /* D65 illuminant as a CIE XYZ triple. */); Vlcms_d65_xyz = list3 (make_float (0.950455), make_float (1.0), make_float (1.088753));