1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Commit graph

26527 commits

Author SHA1 Message Date
Kenichi Handa
1cf6763fdb (xftfont_open): Don't call FcConfigSubstitute and
XftDefaultSubstitute (they are called in XftFontMatch).
(xftfont_open): Fix args to ftfont_font_format.
2008-06-30 07:40:40 +00:00
Kenichi Handa
7d7ad10e33 (fc_charset_table): New member lang.
(ftfont_resolve_generic_family): New arg pattern.
(ftfont_spec_pattern): Check fc_cahrset_table[]->lang.
(ftfont_list): Call ftfont_resolve_generic_family with `pattern'.
(ftfont_open): Fix args to ftfont_font_format.
(ftfont_font_format): New arg filename.
2008-06-30 07:39:14 +00:00
Chong Yidong
811029d313 Fix typo in comments. 2008-06-30 02:12:47 +00:00
Chong Yidong
8d3810fd98 (Finternal_merge_in_global_face): If default face was modified,
realize it again.  Update the font face attribute.
2008-06-30 02:09:21 +00:00
Chong Yidong
44b754c7c9 * xfaces.c (Finternal_merge_in_global_face): If default face was
modified, realize it again.  Update the font face attribute.
2008-06-30 02:08:44 +00:00
Jason Rumney
4e179b1957 (x_set_frame_alpha): Fix logic. 2008-06-29 16:12:37 +00:00
Jason Rumney
a4521b0326 *** empty log message *** 2008-06-29 16:12:15 +00:00
Kenichi Handa
fe44f0091c (Finternal_char_font): Return font-object instead of font-name. 2008-06-29 14:31:18 +00:00
Kenichi Handa
8e86803cbf (get_composition_id): Fix the width calculation for TAB. 2008-06-29 14:27:16 +00:00
Stefan Monnier
baed8445dd (Fvertical_motion): Properly handle float column arg. 2008-06-29 13:56:50 +00:00
Jason Rumney
8b61a89113 * w32term.c (pfnGetFontUnicodeRanges): Remove unused function pointer.
(pfnSetLayeredWindowAttributes): New function pointer.
(w32_initialize): Initialize it when supported.
(x_set_frame_alpha): New function.

* w32fns.c (Fx_create_frame): Initialize frame parameter `alpha'.
(w32_frame_parm_handlers): Set alpha handler.

* frame.c (x_set_alpha) [HAVE_NTGUI]: Call x_set_frame_alpha.
2008-06-28 23:54:27 +00:00
Jason Rumney
57016d3747 * w32fns.c (x_to_w32_font, w32_to_x_font, x_to_w32_weight)
(w32_to_x_weight, w32_to_all_x_charsets): Remove obsolete functions.
(w32_to_x_charset, x_to_w32_charset)
(Qw32_charset_ansi, Qw32_charset_symbol, Qw32_charset_default)
(Qw32_charset_shiftjis, Qw32_charset_hangeul, Qw32_charset_johab)
(Qw32_charset_chinesebig5, Qw32_charset_gb2312, Qw32_charset_oem)
(Qw32_charset_easteurope, Qw32_charset_turkish, Qw32_charset_baltic)
(Qw32_charset_russian, Qw32_charset_arabic, Qw32_charset_greek)
(Qw32_charset_hebrew, Qw32_charset_vietnamese, Qw32_charset_thai)
(Qw32_charset_mac, Vw32_charset_info_alist): Move to w32font.c.
(Qw32_charset_unicode): Remove.
(syms_of_w32fns): Update for above changes.

* w32font.c (w32_to_x_charset, x_to_w32_charset)
(Qw32_charset_ansi, Qw32_charset_symbol, Qw32_charset_default)
(Qw32_charset_shiftjis, Qw32_charset_hangeul, Qw32_charset_johab)
(Qw32_charset_chinesebig5, Qw32_charset_gb2312, Qw32_charset_oem)
(Qw32_charset_easteurope, Qw32_charset_turkish, Qw32_charset_baltic)
(Qw32_charset_russian, Qw32_charset_arabic, Qw32_charset_greek)
(Qw32_charset_hebrew, Qw32_charset_vietnamese, Qw32_charset_thai)
(Qw32_charset_mac, Vw32_charset_info_alist): Move from w32fns.c.
(syms_of_w32font): Update for above changes.

* w32-fns.el (top-level): Unconditionally define all charsets.
2008-06-27 22:33:12 +00:00
Dan Nicolaescu
9fa1c445a9 (USG_SHARED_LIBRARIES): Remove duplicate definition. 2008-06-27 14:32:24 +00:00
Dan Nicolaescu
d6bf1bdb87 Fix previous change: keep the correct branch of a
removed #if.
2008-06-27 14:22:17 +00:00
Glenn Morris
fffa137cb7 American English spelling fix. 2008-06-27 07:34:53 +00:00
Glenn Morris
6772c8e169 American English spelling fix. 2008-06-27 02:41:14 +00:00
Glenn Morris
04bf5b655a American English spelling fix. 2008-06-27 02:14:52 +00:00
Juanma Barranquero
43db14bbd8 Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
* nt/nmake.defs:
* nt/gmake.defs (FONT_CFLAGS): Remove.
(EMACS_EXTRA_C_FLAGS): Don't include FONT_CFLAGS.
(CFLAGS): Don't include WIN32_LEAN_AND_MEAN, _WIN32_WINNT, -D$(ARCH)
and _CRTAPI1.
(ARCH_FLAGS): Don't include _X86_.

* nt/config.nt (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Define.

* src/makefile.w32-in (LOCAL_FLAGS):
Don't include WINDOWSNT, DOS_NT and _UCHAR_T.

* src/sysdep.c (_spawnlp, _getpid):
Declare with explicit _cdecl instead of _CRTAPI1.

* src/editfns.c (Fget_internal_run_time):
Check for WINDOWSNT with #ifdef, not #if.
2008-06-26 22:33:33 +00:00
Jason Rumney
c35f9821de * w32font.h (FONT_HANDLE, FONT_TEXTMETRIC): New macros.
* w32term.c (x_draw_glyph_string_foreground):
(x_draw_composite_glyph_string_foreground): Sync with xterm.c.
Use FONT_HANDLE macro.
(x_draw_glyph_string): Use FONT_TEXTMETRIC macro.

* w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
(uniscribe_encode_char): Use FONT_HANDLE macro.

* w32font.c (Fx_select_font): Use FONT_HANDLE macro.
(w32font_text_extents): Use precast w32_font.
(w32font_close): Free cached metrics.
(w32font_open_internal): Allocate space for name on stack.
2008-06-26 22:11:25 +00:00
Chong Yidong
ec06f5c9a0 (extend_face_to_end_of_line): Fix last change. 2008-06-26 21:37:42 +00:00
Chong Yidong
1f8ad7194a * xdisp.c (extend_face_to_end_of_line): Fix last change. 2008-06-26 21:37:32 +00:00
Jason Rumney
97e716559d (FONT_AVG_WIDTH): Remove obsolete macro.
(CP_8BIT, CP_UNICODE, CP_UNKNOWN): Remove obsolete constants.
2008-06-26 16:20:49 +00:00
Juanma Barranquero
c9fc02c727 * src/Makefile.in (SOME_MACHINE_OBJECTS): Remove w32bdf.o.
* lib-src/makefile.w32-in (obj): Remove w32bdf.o.
2008-06-26 11:57:58 +00:00
Jason Rumney
1b5defe658 * w32bdf.c, w32bdf.h: Remove obsolete files.
* makefile.w32-in: Remove refs to w32bdf.h and w32bdf.c.

* w32gui.h: Don't include w32bdf.h.
(XCharStruct, enum w32_char_font_type, W32FontStruct):
Remove obsolete font support.

* w32font.h (struct w32font_info): Remove compat_w32_font.
Add hfont member.
(FONT_COMPAT): Remove obsolete macro.

* w32font.c (w32font_close): Remove compat code. Delete hfont member.
(w32font_encode_char, w32font_text_extents): Use new hfont member.
(w32font_open_internal): Remove compat code. Set new hfont member.
(Fx_select_font): Use new hfont member.

* w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
(uniscribe_encode_char): Use new hfont member.

* w32term.c (x_draw_glyph_string_foreground):
(x_draw_composite_glyph_string_foreground): Use new hfont member.
(x_draw_glyph_string): Use metrics in w32font_info.
2008-06-26 10:48:28 +00:00
Kenichi Handa
1fc66bcae5 (handle_auto_composed_prop): Fix for the terminal case. 2008-06-26 07:25:25 +00:00
Glenn Morris
16bad4dd2e Comment fixes. 2008-06-26 05:04:23 +00:00
Dan Nicolaescu
f2a77c3a41 * unexnext.c:
* m/ews4800.h:
* m/hp9000s300.h:
* m/ibm370aix.h:
* m/mips-siemens.h:
* m/ncr386.h:
* m/next.h:
* m/pmax.h:
* m/powerpcle.h:
* m/tandem-s2.h:
* s/386bsd.h:
* s/bsd386.h:
* s/bsd4-1.h:
* s/bsd4-2.h:
* s/bsdos2-1.h:
* s/bsdos2.h:
* s/bsdos3.h:
* s/bsdos4.h:
* s/nextstep.h:
* s/ultrix4-3.h:
* s/usg5-0.h:
* s/usg5-2-2.h:
* s/usg5-2.h:
* s/usg5-4-3.h:
* s/ux4800.h:
* s/uxpds.h:
* s/uxpv.h: Remove support for obsolete systems.
* s/hpux.h, s/hpux10.h, s/hpux8.h, s/hpux9.h, s/hpux9shr.h:
Remove, insert contents in s/hpux-10.20.h
* s/aix3-1.h, s/aix3-2-5.h, s/aix3-2.h, s/aix4-1.h, s/aix4.h:
Remove, insert contents in s/aix-4.2.h
* s/usg5-3.h: Remove, insert contents in s/usg5-4.h.
* s/bsd4-3.h: Rename to ..
* s/bsd-common.h: ... this.
* src/data.c:
* src/doc.c:
* src/ecrt0.c:
* src/emacs.c:
* src/fileio.c:
* src/floatfns.c:
* src/keyboard.c:
* src/mem-limits.h:
* src/print.c:
* src/process.c:
* src/sysdep.c:
* src/syssignal.h:
* src/systty.h:
* src/syswait.h:
* src/term.c:
* src/unexec.c:
* src/unexelf.c:
* src/unexhp9k800.c:
* src/m/hp800.h:
* src/m/ibmrs6000.h:
* src/m/mips.h:
* src/m/vax.h:
* src/s/darwin.h:
* src/s/freebsd.h:
* src/s/gnu.h:
* src/s/ms-w32.h:
* src/s/msdos.h:
* src/s/netbsd.h:
* src/s/template.h: Remove references to obsolete variables.

* Makefile.in: Add dependencies for all unexec files.
(admindir): Remove unused variable.
(UNEXEC_SRC): Remove references.

* config.nt: Remove reference to UNEXEC_SRC.

* lwlib.c: Remove references to obsolete variables.

* fakemail.c: Remove references to obsolete variables.

* os.texi: Remove references to obsolete systems.

* configure.in:
* configure: Remove references to obsolete systems.
2008-06-26 04:24:54 +00:00
Chong Yidong
c9055a7d85 Fix last change, using "monospace" rather than "Monospace". 2008-06-25 22:32:56 +00:00
Chong Yidong
be9d013ae8 (x_default_font_parameter): If Xft is available, first try
Monospace-12 for the default font.
2008-06-25 22:29:20 +00:00
Chong Yidong
bd02793aba * xfns.c (x_default_font_parameter): If Xft is available, first
try Monospace-12 for the default font.
2008-06-25 22:29:11 +00:00
Jason Rumney
ccedd25934 (get_glyph_face_and_encoding): Encode invalid glyphs as 0. 2008-06-25 21:46:49 +00:00
Stefan Monnier
603a09371b (Fbyte_code): Disable debugging code that doesn't compile. 2008-06-25 20:57:16 +00:00
Stefan Monnier
fbe062b7fb (syms_of_buffer): Remove default-word-wrap. 2008-06-25 20:55:53 +00:00
Juanma Barranquero
69587bba21 Fix typos. 2008-06-25 14:05:38 +00:00
Kenichi Handa
48e0b4c0d3 (Fstring_to_unibyte): Fix the previous change. 2008-06-25 12:02:48 +00:00
Juanma Barranquero
69785ad0fa * xdisp.c (syms_of_xdisp) <truncate-partial-width-windows>: Doc fix.
<scroll-conservatively>: Fix typo in docstring.

* xselect.c (Fx_send_client_event): Doc fix.
2008-06-25 11:51:46 +00:00
Glenn Morris
c045cf6edc Comment typo. 2008-06-25 07:49:12 +00:00
Glenn Morris
b8350f31b4 Remove witness-emacs. 2008-06-25 07:48:35 +00:00
Kenichi Handa
34e9727275 (Fx_list_fonts): Call Flist_fonts with the arg PREFER. 2008-06-25 07:35:49 +00:00
Kenichi Handa
7181ea6aa0 (font_parse_fcname): Remove unused variables.
(font_sort_entites): Delete the arg SPEC.  Caller changed.  Fix
for the case of ! best_only.
(font_delete_unmatched): Check DPI and AVGWIDTH too.
2008-06-25 07:31:37 +00:00
Kenichi Handa
249e6f764a *** empty log message *** 2008-06-25 04:58:14 +00:00
Kenichi Handa
40ef884328 (Fstring_to_unibyte): Fix typo in docstring. 2008-06-25 02:56:20 +00:00
Kenichi Handa
c042d659c1 (Fstring_to_unibyte): EXFUN it. 2008-06-25 02:45:09 +00:00
Kenichi Handa
0460afe531 (str_to_unibyte): Extern it. 2008-06-25 02:44:43 +00:00
Kenichi Handa
4aa40bb808 (str_to_unibyte): New function. 2008-06-25 02:44:20 +00:00
Kenichi Handa
b4480f1678 (Fstring_to_unibyte): New function.
(syms_of_fns): Defsubr it.
2008-06-25 02:43:59 +00:00
Kenichi Handa
65c108e456 *** empty log message *** 2008-06-25 00:35:02 +00:00
Andreas Schwab
56f6f7604b Fix thinko. 2008-06-24 23:58:00 +00:00
Andreas Schwab
fd13748d94 (bootstrap-clean): Do what distclean does but don't remove
Makefile.
(distclean): Depend on bootstrap-clean and remove Makefile.
2008-06-24 23:44:12 +00:00
Andreas Schwab
4c3f18fe70 (${lispsource}/loaddefs.el): Renamed from
../lisp/loaddefs.el.
2008-06-24 23:00:25 +00:00