From 41e856b539eab6080eeacd313c7f201dc3955d8c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 Oct 2014 22:36:22 -0400 Subject: * lisp/emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg case. Fixes: debbugs:18767 --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/bytecomp.el | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b0c8a67b79..1a458522079 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-20 Stefan Monnier + + * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg + case (bug#18767). + 2014-10-15 Alan Mackenzie * cus-edit.el (custom-command-apply): Specify the return value in diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e5f8a8cc22a..69c4e0f1628 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3261,11 +3261,11 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (byte-defop-compiler cons 2) (byte-defop-compiler aref 2) (byte-defop-compiler set 2) -(byte-defop-compiler (= byte-eqlsign) 2-and) -(byte-defop-compiler (< byte-lss) 2-and) -(byte-defop-compiler (> byte-gtr) 2-and) -(byte-defop-compiler (<= byte-leq) 2-and) -(byte-defop-compiler (>= byte-geq) 2-and) +(byte-defop-compiler (= byte-eqlsign) 2) ;; -and bug#18767 +(byte-defop-compiler (< byte-lss) 2) ;; -and bug#18767 +(byte-defop-compiler (> byte-gtr) 2) ;; -and bug#18767 +(byte-defop-compiler (<= byte-leq) 2) ;; -and bug#18767 +(byte-defop-compiler (>= byte-geq) 2) ;; -and bug#18767 (byte-defop-compiler get 2) (byte-defop-compiler nth 2) (byte-defop-compiler substring 2-3) @@ -3332,6 +3332,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (defun byte-compile-and-folded (form) "Compile calls to functions like `<='. These implicitly `and' together a bunch of two-arg bytecodes." + ;; FIXME: bug#18767 means we can't do it this way! (let ((l (length form))) (cond ((< l 3) (byte-compile-form `(progn ,(nth 1 form) t))) -- cgit v1.2.1 From dfccf2f60da8a69a7371c3731c0c1af4f5745426 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 20 Oct 2014 20:19:15 +0100 Subject: Temporarily revert previous bytecomp change --- lisp/ChangeLog | 5 ----- lisp/emacs-lisp/bytecomp.el | 11 +++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1a458522079..6b0c8a67b79 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,3 @@ -2014-10-20 Stefan Monnier - - * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg - case (bug#18767). - 2014-10-15 Alan Mackenzie * cus-edit.el (custom-command-apply): Specify the return value in diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 69c4e0f1628..e5f8a8cc22a 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3261,11 +3261,11 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (byte-defop-compiler cons 2) (byte-defop-compiler aref 2) (byte-defop-compiler set 2) -(byte-defop-compiler (= byte-eqlsign) 2) ;; -and bug#18767 -(byte-defop-compiler (< byte-lss) 2) ;; -and bug#18767 -(byte-defop-compiler (> byte-gtr) 2) ;; -and bug#18767 -(byte-defop-compiler (<= byte-leq) 2) ;; -and bug#18767 -(byte-defop-compiler (>= byte-geq) 2) ;; -and bug#18767 +(byte-defop-compiler (= byte-eqlsign) 2-and) +(byte-defop-compiler (< byte-lss) 2-and) +(byte-defop-compiler (> byte-gtr) 2-and) +(byte-defop-compiler (<= byte-leq) 2-and) +(byte-defop-compiler (>= byte-geq) 2-and) (byte-defop-compiler get 2) (byte-defop-compiler nth 2) (byte-defop-compiler substring 2-3) @@ -3332,7 +3332,6 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (defun byte-compile-and-folded (form) "Compile calls to functions like `<='. These implicitly `and' together a bunch of two-arg bytecodes." - ;; FIXME: bug#18767 means we can't do it this way! (let ((l (length form))) (cond ((< l 3) (byte-compile-form `(progn ,(nth 1 form) t))) -- cgit v1.2.1 From 83bad90efe943e7c88431b7a71bc1d5cf1304c92 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 20 Oct 2014 20:21:15 +0100 Subject: Add 24.4 release ChangeLog entries --- ChangeLog | 4 ++++ admin/ChangeLog | 4 ++++ doc/emacs/ChangeLog | 4 ++++ doc/lispintro/ChangeLog | 4 ++++ doc/lispref/ChangeLog | 4 ++++ doc/man/ChangeLog | 4 ++++ doc/misc/ChangeLog | 4 ++++ etc/ChangeLog | 4 ++++ leim/ChangeLog | 4 ++++ lib-src/ChangeLog | 4 ++++ lisp/ChangeLog | 4 ++++ lisp/cedet/ChangeLog | 4 ++++ lisp/erc/ChangeLog | 4 ++++ lisp/gnus/ChangeLog | 4 ++++ lisp/mh-e/ChangeLog | 4 ++++ lisp/org/ChangeLog | 4 ++++ lisp/url/ChangeLog | 4 ++++ lwlib/ChangeLog | 4 ++++ msdos/ChangeLog | 4 ++++ nextstep/ChangeLog | 4 ++++ nt/ChangeLog | 4 ++++ oldXMenu/ChangeLog | 4 ++++ src/ChangeLog | 4 ++++ test/ChangeLog | 4 ++++ 24 files changed, 96 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3567ce607df..a759f5a54ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-11 Ken Brown * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [CYGWIN]: Set stack size diff --git a/admin/ChangeLog b/admin/ChangeLog index 48d7a211a76..7f91c78be99 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-09-03 Eli Zaretskii * unidata/unidata-gen.el (unidata-check): Bring this function up diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 1626a156ea1..1dfda079bf2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-13 Glenn Morris * Makefile.in (dist): Update for new output variables. diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 72c6023bba7..d70345983f7 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-13 Glenn Morris * Makefile.in (dist): Update for new output variables. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 272f21f4570..f72e1054c5f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-13 Glenn Morris * Makefile.in (dist): Update for new output variables. diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 34ecda837ef..077d23d0916 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-01-12 Glenn Morris * emacs.1: Replace reference to etc/MAILINGLISTS. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index f4291479ce1..416d44d779c 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-13 Glenn Morris * Makefile.in (dist): Update for new output variables. diff --git a/etc/ChangeLog b/etc/ChangeLog index a1a8e258b11..f2de0f9ba97 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-09-30 Bill Wohler Release MH-E version 8.6 diff --git a/leim/ChangeLog b/leim/ChangeLog index 73dee396618..ca5d2a1e85b 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-01-20 Paul Eggert Revert some of the CANNOT_DUMP fix (Bug#16494). diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f204ab517e2..53a69b44378 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-07-12 Paul Eggert * etags.c (Lisp_functions): Also record cl-defun etc. (Bug#17965) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b0c8a67b79..4c9b60ea4cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-15 Alan Mackenzie * cus-edit.el (custom-command-apply): Specify the return value in diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 05bd95a50cc..f26ac43e03e 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-09-18 David Engster * ede/emacs.el (ede-emacs-version): Do not call 'egrep' to diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b3cdb067d13..ca018c47db8 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-09-24 Stefan Monnier * erc-track.el (erc-modified-channels-display): Update all mode lines diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 228cd104783..3c9c96051e3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-09-29 Daiki Ueno * mml.el (mml-parse-1): Error out if unknown mode is specified in diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index e0beeef46de..bc5f8e48a34 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-09-30 Bill Wohler Release MH-E version 8.6. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 439bed3706a..261fcd1cb11 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-12 Marco Wahl * org-agenda.el (org-get-entries-from-diary): Use diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 8b0765291c1..36f76fded69 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-09-19 Dmitry Gutov * url.el (url-retrieve-internal): Clarify the docstring. diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 2a865f7165c..9179cd56ccd 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2013-12-14 Paul Eggert Use bool for boolean, focusing on headers. diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 3dd5476910e..cce63bc5a59 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-08-25 Eli Zaretskii * sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index ad869f1a19a..04d24bff390 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-03-13 Glenn Morris * templates/Info.plist.in: Make it strictly valid xml. (Bug#17002) diff --git a/nt/ChangeLog b/nt/ChangeLog index 299879ccba8..dc73347e3b3 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-04-26 Eli Zaretskii * cmdproxy.c (make_absolute): Don't copy more characters from PATH diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 906fe229a00..e66253a1e74 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2013-10-24 Glenn Morris * Makefile.in (abs_top_srcdir): New, set by configure. diff --git a/src/ChangeLog b/src/ChangeLog index 1572c6a2132..e0e46a63b0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-17 Eli Zaretskii * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on diff --git a/test/ChangeLog b/test/ChangeLog index 264173fa557..c1c2f5c870b 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2014-10-20 Glenn Morris + + * Version 24.4 released. + 2014-10-01 Glenn Morris * automated/package-test.el (with-package-test, package-test-signed): -- cgit v1.2.1 From d20b72d9fa987ea9a511c6bed909c09929dc78f8 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 20 Oct 2014 20:23:50 +0100 Subject: Restore temporarily reverted bytecomp change * lisp/emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg case. Fixes: debbugs:18767 --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/bytecomp.el | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4c9b60ea4cd..c1a57cf373e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-20 Stefan Monnier + + * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg + case (bug#18767). + 2014-10-20 Glenn Morris * Version 24.4 released. diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e5f8a8cc22a..69c4e0f1628 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3261,11 +3261,11 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (byte-defop-compiler cons 2) (byte-defop-compiler aref 2) (byte-defop-compiler set 2) -(byte-defop-compiler (= byte-eqlsign) 2-and) -(byte-defop-compiler (< byte-lss) 2-and) -(byte-defop-compiler (> byte-gtr) 2-and) -(byte-defop-compiler (<= byte-leq) 2-and) -(byte-defop-compiler (>= byte-geq) 2-and) +(byte-defop-compiler (= byte-eqlsign) 2) ;; -and bug#18767 +(byte-defop-compiler (< byte-lss) 2) ;; -and bug#18767 +(byte-defop-compiler (> byte-gtr) 2) ;; -and bug#18767 +(byte-defop-compiler (<= byte-leq) 2) ;; -and bug#18767 +(byte-defop-compiler (>= byte-geq) 2) ;; -and bug#18767 (byte-defop-compiler get 2) (byte-defop-compiler nth 2) (byte-defop-compiler substring 2-3) @@ -3332,6 +3332,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (defun byte-compile-and-folded (form) "Compile calls to functions like `<='. These implicitly `and' together a bunch of two-arg bytecodes." + ;; FIXME: bug#18767 means we can't do it this way! (let ((l (length form))) (cond ((< l 3) (byte-compile-form `(progn ,(nth 1 form) t))) -- cgit v1.2.1