[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b57c174 1/9: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master b57c174 1/9: Merge from origin/emacs-25 |
Date: |
Mon, 02 May 2016 01:19:46 +0000 |
branch: master
commit b57c1741abfb95da1dc6c165339551daff2ca3e1
Merge: 309cefe 5a952eb
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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
---
etc/NEWS | 6 ++++++
lisp/bookmark.el | 8 ++++----
src/image.c | 3 ++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index bc63058..3c4cf66 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 c2f8cc3..f3c8b2a 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 2a7c2cc..22bbc35 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)
- [Emacs-diffs] master updated (309cefe -> 3354582), Paul Eggert, 2016/05/01
- [Emacs-diffs] master 07fafe1 4/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master a8da4d0 3/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master ce92397 2/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master b57c174 1/9: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master 198ce5b 8/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master d6ec146 6/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master 595195a 7/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master 3354582 9/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master c3ed7ce 5/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01