diff options
| author | Miles Bader | 2007-10-19 00:00:21 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-10-19 00:00:21 +0000 |
| commit | 9c8020a8df03dc67a56d7df15664dcf7ace54bf0 (patch) | |
| tree | 09b0646addff3c39f9e96ba89c04bdcc038a87a7 /src/macterm.c | |
| parent | dfc3268dfa133a2e0a677f1af7c1ee548eae065d (diff) | |
| parent | bd3164743080f3eb5fc316aca7cc5322ca58fe33 (diff) | |
| download | emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.tar.gz emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 890-898)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 122-128)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 257-258)
- Merge from emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macterm.c b/src/macterm.c index a15f0b0fcfc..3c01a6618a2 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -8300,7 +8300,7 @@ init_font_name_table () | |||
| 8300 | Lisp_Object rest = XCDR (XCDR (text_encoding_info)); | 8300 | Lisp_Object rest = XCDR (XCDR (text_encoding_info)); |
| 8301 | 8301 | ||
| 8302 | if (size > 0 || style == normal) | 8302 | if (size > 0 || style == normal) |
| 8303 | for (; !NILP (rest); rest = XCDR (rest)) | 8303 | for (; CONSP (rest); rest = XCDR (rest)) |
| 8304 | add_mac_font_name (name, size, style, SDATA (XCAR (rest))); | 8304 | add_mac_font_name (name, size, style, SDATA (XCAR (rest))); |
| 8305 | } | 8305 | } |
| 8306 | } | 8306 | } |
| @@ -8375,7 +8375,7 @@ init_font_name_table () | |||
| 8375 | { | 8375 | { |
| 8376 | Lisp_Object rest = XCDR (XCDR (text_encoding_info)); | 8376 | Lisp_Object rest = XCDR (XCDR (text_encoding_info)); |
| 8377 | 8377 | ||
| 8378 | for (; !NILP (rest); rest = XCDR (rest)) | 8378 | for (; CONSP (rest); rest = XCDR (rest)) |
| 8379 | add_mac_font_name (name, assc_entry->fontSize, | 8379 | add_mac_font_name (name, assc_entry->fontSize, |
| 8380 | assc_entry->fontStyle, | 8380 | assc_entry->fontStyle, |
| 8381 | SDATA (XCAR (rest))); | 8381 | SDATA (XCAR (rest))); |