diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-01 19:25:18 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-01 19:25:18 -0700 |
| commit | f0397f5aa35d39a4b95f73653e587f69bfa3ff11 (patch) | |
| tree | aad36de7bfbb25d3f8e446dd168fea2f3e4e6ba3 | |
| parent | 8664db062341eee9a363de0c37b6fa017a42511b (diff) | |
| download | emacs-f0397f5aa35d39a4b95f73653e587f69bfa3ff11.tar.gz emacs-f0397f5aa35d39a4b95f73653e587f69bfa3ff11.tar.bz2 emacs-f0397f5aa35d39a4b95f73653e587f69bfa3ff11.zip | |
* fontset.c (Finternal_char_font, Ffontset_info): Remove vars
that are set but not used.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fontset.c | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b2a337b1878..5634231fccc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-04-02 Paul Eggert <eggert@cs.ucla.edu> + * fontset.c (Finternal_char_font, Ffontset_info): Remove vars + that are set but not used. + * xfns.c (make_invisible_cursor): Don't return garbage if XCreateBitmapFromData fails. 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, int c; struct frame *f; struct face *face; - int cs_id; if (NILP (position)) { @@ -1824,11 +1823,10 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, f = XFRAME (selected_frame); face_id = lookup_basic_face (f, DEFAULT_FACE_ID); pos = -1; - cs_id = -1; } else { - Lisp_Object window, charset; + Lisp_Object window; struct window *w; CHECK_NUMBER_COERCE_MARKER (position); @@ -1850,11 +1848,6 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, f = XFRAME (w->frame); face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0, -1); - charset = Fget_char_property (position, Qcharset, Qnil); - if (CHARSETP (charset)) - cs_id = XINT (CHARSET_SYMBOL_ID (charset)); - else - cs_id = -1; } if (! CHAR_VALID_P (c, 0)) return Qnil; @@ -1900,7 +1893,6 @@ information about the derived fonts from the default fontset. The format is the same as above. */) (Lisp_Object fontset, Lisp_Object frame) { - FRAME_PTR f; Lisp_Object *realized[2], fontsets[2], tables[2]; Lisp_Object val, elt; int c, i, j, k; @@ -1908,7 +1900,6 @@ format is the same as above. */) (*check_window_system_func) (); fontset = check_fontset_name (fontset, &frame); - f = XFRAME (frame); /* Recode fontsets realized on FRAME from the base fontset FONTSET in the table `realized'. */ |