aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-08 22:29:34 -0800
committerPaul Eggert2011-03-08 22:29:34 -0800
commit73719eba5cbda861e9a7cc296537cd03506418c1 (patch)
treefb1936b4bff13f5fe224d897f34df07b708367c6 /src
parent1e9966ea025891f948200db6ab85a7e7e169e502 (diff)
downloademacs-73719eba5cbda861e9a7cc296537cd03506418c1.tar.gz
emacs-73719eba5cbda861e9a7cc296537cd03506418c1.zip
* xfaces.c (STRDUPA, LSTRDUPA, FONT_POINT_SIZE_QUANTUM): Remove; not used.
(LFACEP): Define only if XASSERTS, as it's not needed otherwise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xfaces.c16
2 files changed, 4 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 44782386684..244a17a61d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,8 @@
6 (free_realized_faces_for_fontset): Remove; not used. 6 (free_realized_faces_for_fontset): Remove; not used.
7 (Fx_list_fonts): Mark variable that gcc -Wuninitialized 7 (Fx_list_fonts): Mark variable that gcc -Wuninitialized
8 does not deduce is never used uninitialized. 8 does not deduce is never used uninitialized.
9 (STRDUPA, LSTRDUPA, FONT_POINT_SIZE_QUANTUM): Remove; not used.
10 (LFACEP): Define only if XASSERTS, as it's not needed otherwise.
9 11
10 * terminal.c (store_terminal_param): Now static. 12 * terminal.c (store_terminal_param): Now static.
11 13
diff --git a/src/xfaces.c b/src/xfaces.c
index ded871d1fdd..50bcab3c6a9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -297,16 +297,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
297 297
298#define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) 298#define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR))
299 299
300/* Make a copy of string S on the stack using alloca. Value is a pointer
301 to the copy. */
302
303#define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S))
304
305/* Make a copy of the contents of Lisp string S on the stack using
306 alloca. Value is a pointer to the copy. */
307
308#define LSTRDUPA(S) STRDUPA (SDATA ((S)))
309
310/* Size of hash table of realized faces in face caches (should be a 300/* Size of hash table of realized faces in face caches (should be a
311 prime number). */ 301 prime number). */
312 302
@@ -1837,6 +1827,7 @@ the WIDTH times as wide as FACE on FRAME. */)
1837#define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) 1827#define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX)
1838#define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) 1828#define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX)
1839 1829
1830#if XASSERTS
1840/* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size 1831/* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size
1841 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ 1832 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */
1842 1833
@@ -1844,6 +1835,7 @@ the WIDTH times as wide as FACE on FRAME. */)
1844 (VECTORP (LFACE) \ 1835 (VECTORP (LFACE) \
1845 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ 1836 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \
1846 && EQ (AREF (LFACE, 0), Qface)) 1837 && EQ (AREF (LFACE, 0), Qface))
1838#endif
1847 1839
1848 1840
1849#if GLYPH_DEBUG 1841#if GLYPH_DEBUG
@@ -5247,10 +5239,6 @@ be found. Value is ALIST. */)
5247 5239
5248#ifdef HAVE_WINDOW_SYSTEM 5240#ifdef HAVE_WINDOW_SYSTEM
5249 5241
5250/* Ignore the difference of font point size less than this value. */
5251
5252#define FONT_POINT_SIZE_QUANTUM 5
5253
5254/* Return the fontset id of the base fontset name or alias name given 5242/* Return the fontset id of the base fontset name or alias name given
5255 by the fontset attribute of ATTRS. Value is -1 if the fontset 5243 by the fontset attribute of ATTRS. Value is -1 if the fontset
5256 attribute of ATTRS doesn't name a fontset. */ 5244 attribute of ATTRS doesn't name a fontset. */