Merge from origin/emacs-25

5a952eb Don't mention ~/.emacs.bmk literally in doc strings
c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o...
c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings

3 files changed, 12 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index bc63058de2b..3c4cf66240a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2462,6 +2462,12 @@ non-native NS fullscreen.  The default is nil.  Set to t to enable
 animation when entering and leaving fullscreen.  For native OSX fullscreen
 this has no effect.
 
+** On the OS X Cocoa ("Nextstep") port, multicolor font (such as color
+emoji) display is disabled.  This feature was accidentally added when
+Emacs 24.4 included the new Core Text based font backend code that was
+originally implemented for a non-mainline port.  This will be enabled
+again once it is also implemented in Emacs on free operating systems.
+
 ---
 ** The new function 'w32-application-type' returns the type of an
 MS-Windows application given the name of its executable program file.
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index c2f8cc3fbc1..f3c8b2a755f 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -74,7 +74,7 @@ bookmark is to set this variable to 1 (or 0, which produces the same
 behavior.)
 
 To specify the file in which to save them, modify the variable
-`bookmark-default-file', which is `~/.emacs.bmk' by default."
+`bookmark-default-file'."
   :type '(choice (const nil) integer (other t))
   :group 'bookmark)
 
@@ -1481,9 +1481,9 @@ while loading.
 If you load a file that doesn't contain a proper bookmark alist, you
 will corrupt Emacs's bookmark list.  Generally, you should only load
 in files that were created with the bookmark functions in the first
-place.  Your own personal bookmark file, `~/.emacs.bmk', is
-maintained automatically by Emacs; you shouldn't need to load it
-explicitly.
+place.  Your own personal bookmark file, specified by the variable
+`bookmark-default-file', is maintained automatically by Emacs; you
+shouldn't need to load it explicitly.
 
 If you load a file containing bookmarks with the same names as
 bookmarks already present in your Emacs, the new bookmarks will get
diff --git a/src/image.c b/src/image.c
index 2a7c2ccc82d..22bbc35fcfb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7979,7 +7979,8 @@ gif_load (struct frame *f, struct image *img)
         {
           img->lisp_data
             = Fcons (make_number (ext->Function),
-                     Fcons (make_unibyte_string (ext->Bytes, ext->ByteCount),
+                     Fcons (make_unibyte_string ((char *) ext->Bytes,
+                                                 ext->ByteCount),
                             img->lisp_data));
           if (ext->Function == GIF_LOCAL_DESCRIPTOR_EXTENSION
               && ext->ByteCount == 4)