diff options
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/fontset.c b/src/fontset.c index b5d8a0db434..eea65535c78 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1815,7 +1815,6 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, | |||
| 1815 | int c; | 1815 | int c; |
| 1816 | struct frame *f; | 1816 | struct frame *f; |
| 1817 | struct face *face; | 1817 | struct face *face; |
| 1818 | int cs_id; | ||
| 1819 | 1818 | ||
| 1820 | if (NILP (position)) | 1819 | if (NILP (position)) |
| 1821 | { | 1820 | { |
| @@ -1824,11 +1823,10 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, | |||
| 1824 | f = XFRAME (selected_frame); | 1823 | f = XFRAME (selected_frame); |
| 1825 | face_id = lookup_basic_face (f, DEFAULT_FACE_ID); | 1824 | face_id = lookup_basic_face (f, DEFAULT_FACE_ID); |
| 1826 | pos = -1; | 1825 | pos = -1; |
| 1827 | cs_id = -1; | ||
| 1828 | } | 1826 | } |
| 1829 | else | 1827 | else |
| 1830 | { | 1828 | { |
| 1831 | Lisp_Object window, charset; | 1829 | Lisp_Object window; |
| 1832 | struct window *w; | 1830 | struct window *w; |
| 1833 | 1831 | ||
| 1834 | CHECK_NUMBER_COERCE_MARKER (position); | 1832 | CHECK_NUMBER_COERCE_MARKER (position); |
| @@ -1850,11 +1848,6 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, | |||
| 1850 | f = XFRAME (w->frame); | 1848 | f = XFRAME (w->frame); |
| 1851 | face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, | 1849 | face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, |
| 1852 | pos + 100, 0, -1); | 1850 | pos + 100, 0, -1); |
| 1853 | charset = Fget_char_property (position, Qcharset, Qnil); | ||
| 1854 | if (CHARSETP (charset)) | ||
| 1855 | cs_id = XINT (CHARSET_SYMBOL_ID (charset)); | ||
| 1856 | else | ||
| 1857 | cs_id = -1; | ||
| 1858 | } | 1851 | } |
| 1859 | if (! CHAR_VALID_P (c, 0)) | 1852 | if (! CHAR_VALID_P (c, 0)) |
| 1860 | return Qnil; | 1853 | return Qnil; |
| @@ -1900,7 +1893,6 @@ information about the derived fonts from the default fontset. The | |||
| 1900 | format is the same as above. */) | 1893 | format is the same as above. */) |
| 1901 | (Lisp_Object fontset, Lisp_Object frame) | 1894 | (Lisp_Object fontset, Lisp_Object frame) |
| 1902 | { | 1895 | { |
| 1903 | FRAME_PTR f; | ||
| 1904 | Lisp_Object *realized[2], fontsets[2], tables[2]; | 1896 | Lisp_Object *realized[2], fontsets[2], tables[2]; |
| 1905 | Lisp_Object val, elt; | 1897 | Lisp_Object val, elt; |
| 1906 | int c, i, j, k; | 1898 | int c, i, j, k; |
| @@ -1908,7 +1900,6 @@ format is the same as above. */) | |||
| 1908 | (*check_window_system_func) (); | 1900 | (*check_window_system_func) (); |
| 1909 | 1901 | ||
| 1910 | fontset = check_fontset_name (fontset, &frame); | 1902 | fontset = check_fontset_name (fontset, &frame); |
| 1911 | f = XFRAME (frame); | ||
| 1912 | 1903 | ||
| 1913 | /* Recode fontsets realized on FRAME from the base fontset FONTSET | 1904 | /* Recode fontsets realized on FRAME from the base fontset FONTSET |
| 1914 | in the table `realized'. */ | 1905 | in the table `realized'. */ |