summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-10-20 20:59:41 +0100
committerGlenn Morris <rgm@gnu.org>2014-10-20 20:59:41 +0100
commit8a85c254de2528be0f3ff154fa24df65e6557c1a (patch)
treedfc704abfcaf816f3be832097805523536347a43
parent9d9bcb5020987f07dd2b9ab994f8826c07182829 (diff)
parentd20b72d9fa987ea9a511c6bed909c09929dc78f8 (diff)
Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru
-rw-r--r--ChangeLog4
-rw-r--r--admin/ChangeLog4
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/lispintro/ChangeLog4
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/man/ChangeLog4
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--etc/ChangeLog4
-rw-r--r--leim/ChangeLog4
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/cedet/ChangeLog4
-rw-r--r--lisp/emacs-lisp/bytecomp.el11
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/mh-e/ChangeLog4
-rw-r--r--lisp/org/ChangeLog4
-rw-r--r--lisp/url/ChangeLog4
-rw-r--r--lwlib/ChangeLog4
-rw-r--r--msdos/ChangeLog4
-rw-r--r--nextstep/ChangeLog4
-rw-r--r--nt/ChangeLog4
-rw-r--r--oldXMenu/ChangeLog4
-rw-r--r--src/ChangeLog4
-rw-r--r--test/ChangeLog4
25 files changed, 107 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b7564e1db4..1772536c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-19 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
diff --git a/admin/ChangeLog b/admin/ChangeLog
index e9fc535454..8870f7cf4a 100644
--- a/admin/ChangeLog
+++ b/admin/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 Eli Zaretskii <eliz@gnu.org>
* unidata/unidata-gen.el (unidata-prop-alist): New properties
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 23e1d0dff7..ba712a1fb5 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (dist): Update for new output variables.
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 6ccac44713..c76d9534b2 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (dist): Update for new output variables.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3ba4bfdb0c..6b84026d2e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-20 Tom Tromey <tom@tromey.com>
* objects.texi (Type Predicates): Don't mention display-table-p.
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8723d9a9d6..b73bf74e2a 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* emacs.1: Bump version to 25.0.50.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 23c3e66b86..804e52dc27 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (dist): Update for new output variables.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3cbd1c90b5..bc8be3252f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-19 Jan Djärv <jan.h.d@swipnet.se>
* NEWS: Teroffs and detachable tool bar for Gtk+ is gone.
diff --git a/leim/ChangeLog b/leim/ChangeLog
index ac698f63e7..93c3386dd5 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-06-10 Glenn Morris <rgm@gnu.org>
Use GNU Make features to simplify and parallelize.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6c31841c13..d741ffdba7 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-23 Paul Eggert <eggert@cs.ucla.edu>
movemail: don't dump core if the current time is outlandish
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2336366cd4..66164fbc7e 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 2fdd1cefdc..1c2311e270 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 0e96ba93f4..264539e03a 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 c12f289ce0..efa3219db0 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 00c96b7d96..5e37dff0ea 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 8008f07c70..0e8665c6c0 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 3910a71db3..1d71497600 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 21a779f85b..f725ba6635 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
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index f6b29ca421..6687735003 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-01 Paul Eggert <eggert@cs.ucla.edu>
--enable-silent-rules now suppresses more chatter.
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 6fa40a1459..efebfc3bc0 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* sed2v2.inp: Bump version to 25.0.50.
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index e45326735f..110b21372d 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/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 Paul Eggert <eggert@cs.ucla.edu>
* README: Mac OS X 10.6 or later now required.
diff --git a/nt/ChangeLog b/nt/ChangeLog
index abd62d35a9..632c373949 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (VERSION): Bump version to 25.0.50.
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 6c0db12e78..085896409d 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-04 Paul Eggert <eggert@cs.ucla.edu>
Less chatter in 'make' output.
diff --git a/src/ChangeLog b/src/ChangeLog
index fdf246ea36..f00caa3073 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-19 Jan Djärv <jan.h.d@swipnet.se>
* gtkutil.c (xg_update_menubar, xg_update_menu_item): Only call
diff --git a/test/ChangeLog b/test/ChangeLog
index a5ac25a92a..bb4b2fbdc4 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-20 Stefan Monnier <monnier@iro.umontreal.ca>
* indent/scss-mode.scss: New file.