mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-22 20:42:26 -08:00
Code Issues Projects Releases Wiki Activity
84491 commits 244 branches 194 tags 732 MiB
Commit graph

26556 commits

Author SHA1 Message Date
Andreas Schwab
85cf899228 * fontset.h: Declare fontset_from_font. Don't declare 
new_fontset_from_font and fontset_from_font_name.
* xterm.c: Include "fontset.h".
* Makefile.in (xterm.o): Update dependencies.
 2008-07-08 11:54:10 +00:00
Glenn Morris
4a00783e8e Use __sparc__ rather than sparc. (Bug#507.) 2008-07-08 07:03:07 +00:00
Chong Yidong
a6f7588140 (Qinhibit_face_set_after_frame_default): Var deleted. 
(x_set_frame_parameters): Don't bind it.
 2008-07-07 20:39:00 +00:00
Chong Yidong
4d2d5f5fac * frame.c (Qinhibit_face_set_after_frame_default): Var deleted. 
(x_set_frame_parameters): Don't bind it.
 2008-07-07 20:37:37 +00:00
Juanma Barranquero
dfe66c5b2c * w32fns.c (map_w32_filename): Declare extern. 2008-07-07 14:39:35 +00:00
Jason Rumney
ec7e221c59 (WS_EX_LAYERED): Define if not already. 2008-07-07 10:59:46 +00:00
Juanma Barranquero
3feeda55b3 Fix typo. 2008-07-07 09:57:21 +00:00
Chong Yidong
be22aa9713 (set_font_frame_param): Don't try to set the font parameter if it is 
still unspecified in the lface.
 2008-07-06 03:51:06 +00:00
Chong Yidong
fe5d61c40b * xfaces.c (set_font_frame_param): Don't try to set the font 
parameter if it is still unspecified in the lface.
 2008-07-06 03:50:54 +00:00
Chong Yidong
0421a7a780 (Finternal_merge_in_global_face): Don't realize default face if it 
didn't already exist.
 2008-07-05 21:16:05 +00:00
Chong Yidong
0a143d3a0f * xfaces.c (Finternal_merge_in_global_face): Don't realize default 
face if it didn't already exist.
 2008-07-05 21:15:39 +00:00
Chong Yidong
29bd139205 (try_window_id): Give up if word-wrapping is on. 2008-07-05 18:22:56 +00:00
Chong Yidong
9204cb8b98 * xdisp.c (try_window_id): Give up if word-wrapping is on. 2008-07-05 18:22:46 +00:00
Andreas Schwab
6c95e70d30 (get_it_property): Move out of HAVE_WINDOW_SYSTEM 
section.
 2008-07-05 09:45:56 +00:00
Chong Yidong
4636d4bd84 (IT_OVERFLOW_NEWLINE_INTO_FRINGE): Turn it off if word-wrapping. 
(IT_DISPLAYING_WHITESPACE): New macro.
(move_it_in_display_line_to): Handle MOVE_TO_X requests properly
when word-wrapping.  Simplify word-wrapping logic.  Use correct
pixel positions when saving copies of the iterator.
(display_line): Use proper wrap point if the last character on a
line was preceded by whitespace.
 2008-07-05 05:31:12 +00:00
Chong Yidong
59230395e9 * xdisp.c (IT_OVERFLOW_NEWLINE_INTO_FRINGE): Turn it off if 
word-wrapping.
(IT_DISPLAYING_WHITESPACE): New macro.
(move_it_in_display_line_to): Handle MOVE_TO_X requests properly
when word-wrapping.  Simplify word-wrapping logic.  Use correct
pixel positions when saving copies of the iterator.
(display_line): Use proper wrap point if the last character on a
line was preceded by whitespace.
 2008-07-05 05:30:46 +00:00
Stefan Monnier
d7c664f351 (${etc}DOC): Depend on ${lisp} rather than ${shortlisp}. 2008-07-04 03:39:37 +00:00
Kenichi Handa
9ffc8a3a97 EXFUN adjusted for the change of Fstring_to_unibyte. 2008-07-04 02:26:05 +00:00
Kenichi Handa
6e8b42de75 (Fstring_to_unibyte): Delete the arg ACCEPT-LATIN-1. 2008-07-04 02:22:42 +00:00
Kenichi Handa
f27f70ecd3 (str_to_unibyte): Modify the comment. 2008-07-04 02:20:08 +00:00
Jason Rumney
946598bf94 (syms_of_xfns): Only define x-select-font when both HAVE_FREETYPE and USE_GTK. 2008-07-02 16:23:35 +00:00
Jason Rumney
631855b506 (next_element_from_display_vector): Move assignment out 
of if statement.
 2008-07-02 15:20:33 +00:00
Jason Rumney
6cf29fe815 Changes from Toru Tsuneyoshi for using Trash can when deleting files. 
* files.el (backup-extract-version): Handle versioned directories.
	(trash-directory): New variable.
	(move-file-to-trash): New function.

	* cus-start.el (delete-by-moving-to-trash): Declare for custom.

        * lisp.h (Qdelete_file, Qdelete_directory): Declare extern.

        * fileio.c (delete_by_moving_to_trash, Qmove_file_to_trash): New vars.
        (syms_of_fileio): Initialize and export them.
        (Fdelete_directory, Fdelete_file): Optionally delete via trash.

        * w32fns.c (FOF_NO_CONNECTED_ELEMENTS): Define if not already.
        (Fsystem_move_file_to_trash): New function.
        (syms_of_w32fns): Export it to lisp.
 2008-07-02 13:19:07 +00:00
Juanma Barranquero
1fd877d6cc Fix whitespace. 2008-07-02 01:50:44 +00:00
Jason Rumney
79ca7db176 (w32font_text_extents): Don't count overhang as part of width. 2008-07-01 14:01:06 +00:00
Juanma Barranquero
c2786a3dd5 Fix typos. 2008-07-01 12:09:33 +00:00
Miles Bader
c4f4682b57 Implement display-time wrap/line-prefix feature 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1305
 2008-07-01 09:39:28 +00:00
Glenn Morris
f838179402 Spelling fix. 2008-07-01 03:04:08 +00:00
Glenn Morris
67e8d28aa6 Set bug-reference-url-format. 2008-07-01 03:03:21 +00:00
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