[COMMIT] Make some small changes to placate the buildbot, src/
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1489324569 0
# Sun Mar 12 13:16:09 2017 +0000
# Node ID 7053230a0057848e0491c2be03ffa64ba38b89d0
# Parent 2e96482cc41086258d6b796414303d2a44932fee
Make some small changes to placate the buildbot, src/
src/ChangeLog addition:
2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net>
Make some small changes to placate the buildbot.
* charset.h (Vcharset_control_1):
Make this available on non-Mule.
* redisplay-xlike-inc.c:
Restore ALLOCATE_RUNS_TEXT() for nonmule.
* redisplay-xlike-inc.c (separate_textual_runs_xft_nomule):
* redisplay-xlike-inc.c (separate_textual_runs_xft_mule):
Declare TEXT_STORAGE as non-const, even for those functions where
it is not modified, it is not worth the book-keeping to fight
with the C++ compile for it.
* text.c (ibyte_string_displayed_columns):
Removed a compiler-placating USED() that's no longer necessary.
diff -r 2e96482cc410 -r 7053230a0057 src/ChangeLog
--- a/src/ChangeLog Sun Mar 12 11:39:25 2017 +0000
+++ b/src/ChangeLog Sun Mar 12 13:16:09 2017 +0000
＠＠ -1,3 +1,18 ＠＠
+2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ Make some small changes to placate the buildbot.
+ * charset.h (Vcharset_control_1):
+ Make this available on non-Mule.
+ * redisplay-xlike-inc.c:
+ Restore ALLOCATE_RUNS_TEXT() for nonmule.
+ * redisplay-xlike-inc.c (separate_textual_runs_xft_nomule):
+ * redisplay-xlike-inc.c (separate_textual_runs_xft_mule):
+ Declare TEXT_STORAGE as non-const, even for those functions where
+ it is not modified, it is not worth the book-keeping to fight
+ with the C++ compile for it.
+ * text.c (ibyte_string_displayed_columns):
+ Removed a compiler-placating USED() that's no longer necessary.
+
2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net>
* text.h (itext_ichar_eql):
diff -r 2e96482cc410 -r 7053230a0057 src/charset.h
--- a/src/charset.h Sun Mar 12 11:39:25 2017 +0000
+++ b/src/charset.h Sun Mar 12 13:16:09 2017 +0000
＠＠ -97,6 +97,8 ＠＠
be done */
#define Vcharset_ascii Qnil
+#define Vcharset_control_1 Qunbound /* A character's charset will never be
+ this. */
#define ichar_charset(ch) Vcharset_ascii
#define ichar_leading_byte(ch) LEADING_BYTE_ASCII
diff -r 2e96482cc410 -r 7053230a0057 src/redisplay-xlike-inc.c
--- a/src/redisplay-xlike-inc.c Sun Mar 12 11:39:25 2017 +0000
+++ b/src/redisplay-xlike-inc.c Sun Mar 12 13:16:09 2017 +0000
＠＠ -176,9 +176,13 ＠＠
*/
#if !defined (USE_XFT) && !defined (MULE)
+
+#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \
+ (storage = alloca_extbytes (len))
+
static int
separate_textual_runs_nomule (struct buffer * UNUSED (buf),
- const Extbyte *text_storage,
+ Extbyte *text_storage,
struct textual_run *run_storage,
const Ibyte *str, Bytecount len,
struct face_cachel *UNUSED(cachel))
＠＠ -222,7 +226,7 ＠＠
UCS-2. */
static int
separate_textual_runs_xft_nomule (struct buffer * UNUSED (buf),
- const Extbyte *text_storage,
+ Extbyte *text_storage,
struct textual_run *run_storage,
const Ibyte *str, Bytecount len,
struct face_cachel *UNUSED (cachel))
＠＠ -243,7 +247,7 ＠＠
#if defined (USE_XFT) && defined (MULE)
static int
separate_textual_runs_xft_mule (struct buffer *buf,
- const Extbyte *text_storage,
+ Extbyte *text_storage,
struct textual_run *run_storage,
const Ibyte *str, Bytecount len,
struct face_cachel *UNUSED (cachel))
＠＠ -262,7 +266,6 ＠＠
Ichar ch = itext_ichar (str);
Lisp_Object charset;
int byte1, byte2;
- int ucs = ichar_to_unicode (ch, CONVERR_SUBSTITUTE);
/* ＠＠#### This use of CONVERR_SUBSTITUTE is somewhat bogus.
It will substitute a '?' if we can't convert. Not clear whether
diff -r 2e96482cc410 -r 7053230a0057 src/text.c
--- a/src/text.c Sun Mar 12 11:39:25 2017 +0000
+++ b/src/text.c Sun Mar 12 13:16:09 2017 +0000
＠＠ -2587,10 +2587,6 ＠＠
INC_IBYTEPTR (str);
}
-#ifndef MULE
- USED (ch);
-#endif
-
return cols;
}
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)