diff options
| author | Steven Tamm | 2005-01-16 17:52:09 +0000 |
|---|---|---|
| committer | Steven Tamm | 2005-01-16 17:52:09 +0000 |
| commit | 5ddd7664e9b52a6f98cad3fe626fefb7ff3c22b3 (patch) | |
| tree | d73c9e8b0c21824ff029fcbdfbdbe1520bcc04a7 /src | |
| parent | fc2ff44b4732cc4a2e6d1c293d5531a4723dc0e8 (diff) | |
| download | emacs-5ddd7664e9b52a6f98cad3fe626fefb7ff3c22b3.tar.gz emacs-5ddd7664e9b52a6f98cad3fe626fefb7ff3c22b3.zip | |
* macterm.c (mac_to_x_fontname): Removed spurious argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/macterm.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ba0115d079a..394d5bd11ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-01-16 Steven Tamm <steventamm@mac.com> | ||
| 2 | |||
| 3 | * macterm.c (mac_to_x_fontname): Removed spurious argument. | ||
| 4 | |||
| 1 | 2005-01-16 Andreas Schwab <schwab@suse.de> | 5 | 2005-01-16 Andreas Schwab <schwab@suse.de> |
| 2 | 6 | ||
| 3 | * macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1. | 7 | * macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1. |
diff --git a/src/macterm.c b/src/macterm.c index ae2555ae286..9e454f25ceb 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -5930,7 +5930,7 @@ decode_mac_font_name (name, size, scriptcode) | |||
| 5930 | 5930 | ||
| 5931 | 5931 | ||
| 5932 | static char * | 5932 | static char * |
| 5933 | mac_to_x_fontname (name, size, style, scriptcode, encoding_base) | 5933 | mac_to_x_fontname (name, size, style, scriptcode) |
| 5934 | char *name; | 5934 | char *name; |
| 5935 | int size; | 5935 | int size; |
| 5936 | Style style; | 5936 | Style style; |