Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/ChangeLog

7 files changed, 77 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 7603af2d138..b5483840f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,50 @@ etc/refcards/*.log
 info/dir
 info/*.info
 test/biditest.txt
+
+Makefile
+config.log
+config.status
+lib-src/ctags
+lib-src/ebrowse
+lib-src/emacsclient
+lib-src/etags
+lib-src/hexl
+lib-src/make-docfile
+lib-src/movemail
+lib-src/profile
+lib-src/update-game-score
+*.o
+lib/alloca.h
+lib/arg-nonnull.h
+lib/c++defs.h
+lib/dirent.h
+lib/fcntl.h
+lib/getopt.h
+lib/inttypes.h
+lib/libgnu.a
+lib/signal.h
+lib/stdio.h
+lib/stdlib.h
+lib/string.h
+lib/sys/
+lib/time.h
+lib/unistd.h
+lib/warn-on-use.h
+src/bootstrap-emacs
+src/deps/
+src/emacs
+src/emacs-25.0.50.1
+src/emacs-25.0.50.2
+src/gl-stamp
+src/globals.h
+src/stamp-h1
+src/temacs
+doc/emacs/emacsver.texi
+doc/man/emacs.1
+etc/refcards/emacsver.tex
+lib/.deps/
+lisp/international/uni-brackets.el
+lwlib/deps/
+lwlib/liblw.a
+
diff --git a/ChangeLog b/ChangeLog
index 9aa2a02cbf0..174fe6a3d41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * .gitignore: Copy over sufficient ignorable files from the old
+        .bzrignore that a simple build doesn't list lots of unregistered
+        files.
+
 2014-11-11  Eric S. Raymond  <esr@thyrsus.com>
 
         * Makefile.in: git transition - set VCWITNESS appropriately for git.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6db9f206d15..e3baa30ce6a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,14 @@
 
         * vc/vc-hg.el (vc-hg-state): Disable pager.  (Bug#18940)
 
+2014-11-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-form-file): Fix version number.
+
+2014-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-form-file): :type isn't a valid `defface' keyword.
+
 2014-11-10  Kenjiro NAKAYAMA  <nakayamakenjiro@gmail.com>
 
         * net/eww.el(eww-form-file(defface)): New defface of file upload form.
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 941b5ecf7c3..74290f45469 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -149,7 +149,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 
 (defcustom mml2015-display-key-image t
   "If t, try to display key images."
-  :version "25.1"
+  :version "24.5"
   :group 'mime-security
   :type 'boolean)
 
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 306d5dca507..f16ecb8c172 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -105,9 +105,8 @@ See also `eww-form-checkbox-selected-symbol'."
      :box (:line-width 2 :style released-button)
      :background "#808080" :foreground "black"))
   "Face for eww buffer buttons."
-  :version "24.4"
-  :group 'eww
-  :type "Browse")
+  :version "25.1"
+  :group 'eww)
 
 (defface eww-form-checkbox
   '((((type x w32 ns) (class color))    ; Like default mode line
diff --git a/src/ChangeLog b/src/ChangeLog
index d44de652dde..2be24fa851b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Avoid undefined behavior in color table hashing.
+        * image.c (CT_HASH_RGB) [COLOR_TABLE_SUPPORT]: Remove, replacing with ...
+        (ct_hash_rgb) [COLOR_TABLE_SUPPORT]: New function.  All uses changed.
+        This function avoids undefined behavior with signed shift overflow.
+
 2014-11-10  Eli Zaretskii  <eliz@gnu.org>
 
         * fileio.c (Finsert_file_contents): Invalidate buffer caches also
diff --git a/src/image.c b/src/image.c
index 4b73a5fe80c..1a2c0e29dde 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4294,7 +4294,11 @@ struct ct_color
 
 /* Value is a hash of the RGB color given by R, G, and B.  */
 
-#define CT_HASH_RGB(R, G, B) (((R) << 16) ^ ((G) << 8) ^ (B))
+static unsigned
+ct_hash_rgb (unsigned r, unsigned g, unsigned b)
+{
+  return (r << 16) ^ (g << 8) ^ b;
+}
 
 /* The color hash table.  */
 
@@ -4349,7 +4353,7 @@ free_color_table (void)
 static unsigned long
 lookup_rgb_color (struct frame *f, int r, int g, int b)
 {
-  unsigned hash = CT_HASH_RGB (r, g, b);
+  unsigned hash = ct_hash_rgb (r, g, b);
   int i = hash % CT_SIZE;
   struct ct_color *p;
   Display_Info *dpyinfo;