Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru

8 files changed, 39 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2336366cd45..66164fbc7ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
+        case (bug#18767).
+
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
 2014-10-20  Ulf Jasper  <ulf.jasper@web.de>
 
         * net/newst-backend.el
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 2fdd1cefdcb..1c2311e2704 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
 2014-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * semantic/wisent/comp.el (wisent-defcontext): Move declarations
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 0e96ba93f44..264539e03a7 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3285,11 +3285,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)
@@ -3356,6 +3356,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)))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index c12f289ce0f..efa3219db07 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
 2014-10-15  Ivan Shmakov  <ivan@siamics.net>
 
         * erc-track.el (erc-modified-channels-display): Update mode line
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 00c96b7d963..5e37dff0eab 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
 2014-10-15  Jorge A. Alfaro-Murillo  <jorge.alfaro-murillo@yale.edu>  (tiny change)
 
         * message.el (message-insert-signature): Use `newline' instead of
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 8008f07c700..0e8665c6c0d 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
 2014-09-30  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.6.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 3910a71db3f..1d71497600e 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
 2014-10-12  Marco Wahl  <marcowahlsoft@gmail.com>
 
         * org-agenda.el (org-get-entries-from-diary): Use
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 21a779f85b3..f725ba66359 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
 2014-10-07  Eli Zaretskii  <eliz@gnu.org>
 
         * url-http.el (url-http-create-request): Recheck zlib availability