[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118168: Merge from emacs-24; up to r117596
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] trunk r118168: Merge from emacs-24; up to r117596 |
|
Date: |
Mon, 20 Oct 2014 20:00:14 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118168 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-10-20 20:59:41 +0100
message:
Merge from emacs-24; up to r117596
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/lispintro/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6128
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/man/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6126
doc/misc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6331
etc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1485
leim/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1629
lib-src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1608
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/cedet/ChangeLog changelog-20100919015713-3rbr456yray5m84f-1
lisp/emacs-lisp/bytecomp.el bytecomp.el-20091113204419-o5vbwnq5f7feedwu-492
lisp/erc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-4305
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/mh-e/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2547
lisp/org/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8688
lisp/url/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-3116
lwlib/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1447
msdos/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1535
nextstep/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8711
nt/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1545
oldXMenu/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1572
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-10-19 06:33:40 +0000
+++ b/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-19 Paul Eggert <address@hidden>
Merge from gnulib, incorporating:
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2014-10-15 14:11:25 +0000
+++ b/admin/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-15 Eli Zaretskii <address@hidden>
* unidata/unidata-gen.el (unidata-prop-alist): New properties
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2014-10-13 01:47:48 +0000
+++ b/doc/emacs/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-13 Glenn Morris <address@hidden>
* Makefile.in (dist): Update for new output variables.
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2014-10-13 01:47:48 +0000
+++ b/doc/lispintro/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-13 Glenn Morris <address@hidden>
* Makefile.in (dist): Update for new output variables.
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-10-20 19:20:29 +0000
+++ b/doc/lispref/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-20 Tom Tromey <address@hidden>
* objects.texi (Type Predicates): Don't mention display-table-p.
=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2014-09-29 19:49:44 +0000
+++ b/doc/man/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-29 Eli Zaretskii <address@hidden>
* emacs.1: Bump version to 25.0.50.
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2014-10-13 01:47:48 +0000
+++ b/doc/misc/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-13 Glenn Morris <address@hidden>
* Makefile.in (dist): Update for new output variables.
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2014-10-19 17:07:32 +0000
+++ b/etc/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-19 Jan Djärv <address@hidden>
* NEWS: Teroffs and detachable tool bar for Gtk+ is gone.
=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog 2014-06-10 01:44:11 +0000
+++ b/leim/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-06-10 Glenn Morris <address@hidden>
Use GNU Make features to simplify and parallelize.
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-09-23 19:21:54 +0000
+++ b/lib-src/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-23 Paul Eggert <address@hidden>
movemail: don't dump core if the current time is outlandish
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-20 19:47:51 +0000
+++ b/lisp/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,12 @@
+2014-10-20 Stefan Monnier <address@hidden>
+
+ * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
+ case (bug#18767).
+
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-20 Ulf Jasper <address@hidden>
* net/newst-backend.el
=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog 2014-10-15 21:46:47 +0000
+++ b/lisp/cedet/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-15 Stefan Monnier <address@hidden>
* semantic/wisent/comp.el (wisent-defcontext): Move declarations
=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el 2014-09-27 15:52:28 +0000
+++ b/lisp/emacs-lisp/bytecomp.el 2014-10-20 19:59:41 +0000
@@ -3285,11 +3285,11 @@
(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 @@
(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)))
=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog 2014-10-15 01:15:40 +0000
+++ b/lisp/erc/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-15 Ivan Shmakov <address@hidden>
* erc-track.el (erc-modified-channels-display): Update mode line
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2014-10-16 22:12:47 +0000
+++ b/lisp/gnus/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-15 Jorge A. Alfaro-Murillo <address@hidden> (tiny change)
* message.el (message-insert-signature): Use `newline' instead of
=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog 2014-09-30 23:19:31 +0000
+++ b/lisp/mh-e/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-30 Bill Wohler <address@hidden>
Release MH-E version 8.6.
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2014-10-13 20:55:41 +0000
+++ b/lisp/org/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-12 Marco Wahl <address@hidden>
* org-agenda.el (org-get-entries-from-diary): Use
=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog 2014-10-07 17:18:07 +0000
+++ b/lisp/url/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-07 Eli Zaretskii <address@hidden>
* url-http.el (url-http-create-request): Recheck zlib availability
=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog 2014-09-01 09:54:12 +0000
+++ b/lwlib/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-01 Paul Eggert <address@hidden>
--enable-silent-rules now suppresses more chatter.
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2014-09-29 19:49:44 +0000
+++ b/msdos/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-29 Eli Zaretskii <address@hidden>
* sed2v2.inp: Bump version to 25.0.50.
=== modified file 'nextstep/ChangeLog'
--- a/nextstep/ChangeLog 2014-10-12 14:56:58 +0000
+++ b/nextstep/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-12 Paul Eggert <address@hidden>
* README: Mac OS X 10.6 or later now required.
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2014-09-29 19:49:44 +0000
+++ b/nt/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-29 Eli Zaretskii <address@hidden>
* makefile.w32-in (VERSION): Bump version to 25.0.50.
=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog 2014-09-04 02:15:56 +0000
+++ b/oldXMenu/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-09-04 Paul Eggert <address@hidden>
Less chatter in 'make' output.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-19 19:13:29 +0000
+++ b/src/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-19 Jan Djärv <address@hidden>
* gtkutil.c (xg_update_menubar, xg_update_menu_item): Only call
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2014-10-20 16:36:34 +0000
+++ b/test/ChangeLog 2014-10-20 19:59:41 +0000
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-20 Stefan Monnier <address@hidden>
* indent/scss-mode.scss: New file.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118168: Merge from emacs-24; up to r117596,
Glenn Morris <=