1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Commit graph

26474 commits

Author SHA1 Message Date
Chong Yidong
7e17f53d30 Replace truncate_partial_width_windows with
Vtruncate_partial_width_windows.
2008-06-24 17:57:02 +00:00
Chong Yidong
bf7a8847fe (struct it): Replace bool truncate_lines_p with a line_wrap enum
possessing three possible values.
2008-06-24 17:56:41 +00:00
Chong Yidong
0858cd02f0 (syms_of_buffer): New variables default-word-wrap and word-wrap.
(init_buffer_once): Initialize them.
2008-06-24 17:56:14 +00:00
Chong Yidong
b099871957 (struct buffer): New member word_wrap. 2008-06-24 17:55:20 +00:00
Chong Yidong
faa6190fe7 * buffer.h (struct buffer): New member word_wrap.
* buffer.c (syms_of_buffer): New variables default-word-wrap and
word-wrap.
(init_buffer_once): Initialize them.

* dispextern.h (struct it): Replace bool truncate_lines_p with a
line_wrap enum possessing three possible values.

* termopts.h: Replace truncate_partial_width_windows with
Vtruncate_partial_width_windows.

* dispnew.c (direct_output_for_insert): Avoid direct output when
inserting a space with word wrap on.

* indent.c (compute_motion): Obey integer values of
truncate-partial-width-windows.

* xdisp.c (Vtruncate_partial_width_windows): New Lisp_Object,
replacing truncate_partial_width_windows.
(init_iterator): If Vtruncate_partial_width_windows is an integer,
truncate only if the window width is below that integer.
(start_display. resize_mini_window, produce_stretch_glyph)
(display_string, move_it_in_display_line_to): Use line_wrap.
(back_to_previous_visible_line_start, reseat_1): Reset
string_from_display_prop_p.
(display_line): Extend default face to end of line when wrapping.
(display_line, move_it_in_display_line_to): Add ability
to wrap continued lines at word boundaries.
2008-06-24 17:54:59 +00:00
Jason Rumney
c3bb54651c (Ffont_face_attributes): Multiply pixel size before point
conversion to avoid multiplying rounding error.
2008-06-24 10:32:03 +00:00
Jason Rumney
c4e8ee5e6f (PIXEL_TO_POINT): Clarify usage in comment. 2008-06-24 10:31:12 +00:00
Kenichi Handa
2641e21320 (font_score): Even if the PIXEL_SIZE is the same, check
DPI too.
(font_sort_entites): Setup prefer_prop[FONT_DPI_INDEX] too.
2008-06-24 07:01:27 +00:00
Juanma Barranquero
f245f2c610 Fix typos. 2008-06-24 01:07:34 +00:00
Jason Rumney
0b07ad98c5 * w32term.c (x_draw_glyph_string_background)
(x_draw_glyph_string): Remove old bdf font code.

* w32term.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): Remove.
2008-06-23 12:41:50 +00:00
Kenichi Handa
2245966833 (font_find_for_lface): Try the adstyle specified in the property of
LFACE_FONT of LFACE (if any).
2008-06-22 15:07:56 +00:00
Stefan Monnier
d925a42659 (x_set_frame_alpha): Add x_catch_errors for bug#437. 2008-06-22 14:02:07 +00:00
Stefan Monnier
b4945b9599 * Makefile.in ${SUBDIR}: Pass additional BOOTSTRAPEMACS argument.
* Makefile.in (${lisp} ${SOME_MACHINE_LISP}, ../lisp/loaddefs.el):
Use $(BOOTSTRAPEMACS) rather than witness-emacs.
(bootstrap-emacs${EXEEXT}): Merge witness-emacs into it.
(witness-emacs): Remove.
(lisp, shortlisp): Move loaddefs.el earlier.
(mostlyclean): Forget about witness-emacs.
* Makefile.in (COMPILE_FIRST): Trim down and add autoload.el.
2008-06-22 13:57:28 +00:00
Glenn Morris
3656581540 (.SUFFIXES): Declare .el.elc as a suffix rule, for non-GNU makes. 2008-06-22 02:29:32 +00:00
Glenn Morris
6412427914 (witness-emacs): Depend on temacs${EXEEXT}. 2008-06-22 02:02:18 +00:00
Glenn Morris
25656227eb Add witness-emacs. 2008-06-21 19:51:48 +00:00
Stefan Monnier
727f1976d3 (witness-emacs): Tell lisp to use bootstrap-emacs. 2008-06-21 19:32:57 +00:00
Stefan Monnier
4e2665ef95 (witness-emacs): Use ../lisp, not $(lispsource). 2008-06-21 19:22:29 +00:00
Stefan Monnier
768efd8421 * src/Makefile.in (PRECOMP): Remove.
(${lisp} ${SOME_MACHINE_LISP}): Remove pseudo dependency on PRECOMP.
(witness-emacs): Run `compile-first'.
(.el.elc): Use the new compile-onefile target.
* lisp/Makefile.in (update-elclist): Don't exclude COMPILE_FIRST.
(all): Run compile-last.
(compile-onefile): New target.
(compile-first): Simplify.
(compile-last): Don't treat COMPILE_FIRST specially.
(COMPILE_FIRST): List the elc files rather than the el files.
(ELCFILES): Update.
2008-06-21 19:20:40 +00:00
Kenichi Handa
808dd567ef (xftfont_open): Handle QCembolden only when FC_EMBOLDEN is defined. 2008-06-21 11:15:04 +00:00
Andreas Schwab
58e8833b26 (.el.elc): Use ../lisp, not $(lispsource). 2008-06-21 08:48:38 +00:00
Andreas Schwab
0de59eae3a (witness-emacs): Use ../lisp, not $(lispsource). 2008-06-21 08:18:06 +00:00
Miles Bader
fb38e9c96e Fix autoload building command in src Makefile
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1268
2008-06-21 02:37:02 +00:00
Stefan Monnier
fc46d21936 Make "make" do a bootstrap if needed.
* src/Makefile.in (emacs${EXEEXT}): Link the new emacs to bootstrap-emacs.
(bootstrapclean): Remove.
(.el.elc): New rule.
(PRECOMP): New var.
(../lisp/subdirs.el): Remove.
(bootstrap-emacs${EXEEXT}): Remove subdirs.el and charpro.el dependency.
(witness-emacs): New target.
(mostlyclean): Remove witness-emacs as well.
(../lisp/loaddefs.el, ${lisp} ${SOME_MACHINE_LISP}):
Add witness-emacs dependency.
* lisp/loadup.el: Don't add emacs-<VERS> name when bootstrapping.
* lisp/Makefile.in (emacs-deps): Remove.
($(lisp)/cus-load.el, $(lisp)/finder-inf.el): Re-add.
(all): Use them.
(autogen-clean): Remove.
* Makefile.in (maybe_bootstrap, src/bootstrap-emacs${EXEEXT})
(bootstrap-build): Remove.
(top_bootclean): New var.
(top_distclean, bootstrap-clean): Use it.
(bootstrap): Don't recheck config.  Make normally.
2008-06-21 01:38:39 +00:00
Chong Yidong
5989ba2f87 (Ffont_face_attributes): Omit key-attribute pairs not defined by the
font.
2008-06-20 23:27:07 +00:00
Chong Yidong
eaf1f6e7fe * font.c (Ffont_face_attributes): Omit key-attribute pairs not
defined by the font.
2008-06-20 23:27:00 +00:00
Stefan Monnier
49f6eb95b2 * src/Makefile.in (emacs${EXEEXT}): Depend on the machine-specific files.
(bootstrap-clean): New target that keeps TAGS around.
(../lisp/subdirs.el, ../lisp/loaddefs.el): New targets.
(bootstrap-emacs${EXEEXT}): Depend on subdirs.el.
* lisp/Makefile.in (all): New target.
(bootstrap-prepare): Remove.
* Makefile.in (SUBDIR): Include `lisp'.
(lisp): Depend on `src'.
(top_distclean): Don't remove config.status.
(bootstrap-clean): New target.
(maintainer-clean): Use it.
(bootstrap): Use bootstrap-clean.  Re-run config.status.
(src/bootstrap-emacs${EXEEXT}): New target.
(bootstrap-build): Use it.  Don't use bootstrap-prepare because
src/Makefile now takes care of it.
(bootfast, bootstrap-clean-before, bootstrap-clean-before-fast): Remove.
2008-06-20 21:48:17 +00:00
Jason Rumney
db61a7f817 [OLD_FONT]: Remove obsolete font code. 2008-06-20 21:46:05 +00:00
Stefan Monnier
2d3c36ae18 Update. 2008-06-20 18:18:40 +00:00
Jason Rumney
4c100a015c (font_matches_spec): Use csb bitfield from font signature to determine
language support.
2008-06-20 15:28:26 +00:00
Stefan Monnier
759d3f3238 (cfsetspeed): New fun extracted from the code.
(cfmakeraw): Move before first use.
2008-06-20 14:59:37 +00:00
Stefan Monnier
25241b4d5a * configure.in: Check for presence of cfmakeraw and cfsetspeed.
* sysdep.c (cfmakeraw): Provide fallback implementation.
(serial_configure): Provide fallback implementation of cfsetspeed.
2008-06-20 14:50:20 +00:00
Kenichi Handa
dc2226d0dc (xftfont_open): Add FOUNDRY, SPACING, DPI, SCALABLE to the pattern. 2008-06-20 12:28:22 +00:00
Kenichi Handa
9b9cd864a8 (fontset_from_font): Copy font_spec before changing
the elements.
2008-06-20 06:12:33 +00:00
Kenichi Handa
d7afccca70 (x_default_font_parameter): Try "monospace-12" too. 2008-06-20 02:15:52 +00:00
Stefan Monnier
770e2e6ed8 * w32fns.c, xfnc.c (x_default_font_parameter): Only set `font-param'
for explicit `font' parameters.
* frame.c (x_set_font): Remove unexplained call to fix inf-recursion.
2008-06-20 01:53:32 +00:00
Kenichi Handa
22e64f7c64 Include <ctype.h>
(x_set_font_backend): Allow spacing characters in the X resource
for FontBackend.
2008-06-19 10:37:11 +00:00
Stefan Monnier
27129af9d7 * w32fns.c, xfns.c (Qfont_param): New var.
(syms_of_w32fns): Initialize it.
(x_default_font_parameter): Record explicit `font' into `font-parameter'.
* faces.el (face-set-after-frame-default): Re-apply explicit `font'
frame parameters after setting up the `default' face.
2008-06-19 01:57:19 +00:00
Kenichi Handa
d26424c5eb (font_parse_xlfd): Fix previous change.
(font_parse_fcname): Don't use :fc-unknown-spec.
(FRAME_X_DISPLAY_INFO): Besure to have at least 1 pixel height.
(Fcopy_font_spec): Preserve the order of elements in FONT_EXTRA.
(font_add_log): Prepend the driver name to the resulting fonts.
2008-06-19 00:43:34 +00:00
Kenichi Handa
4ffe34a4ed (ftfont_pattern_entity): New arg extra. Caller changed.
(ftfont_spec_pattern): Don't check QCfc_unknown_spec and QCname.
(ftfont_list) [FC_FONTFORMAT]: Include FC_FONTFORMAT in objset.
2008-06-19 00:42:11 +00:00
Kenichi Handa
81094fabdc (QChinting , QCautohint, QChintstyle, QCrgba)
(QCembolden): New variables.
(syms_of_xftfont): DEFSYM them.
(xftfont_open): Call XftFontMatch.  Don't trust the result of
XftTextExtents8 if the pixel_size is less than 5.
2008-06-19 00:41:48 +00:00
Andreas Schwab
51cf11be08 (Ffont_face_attributes): Only define if
HAVE_WINDOW_SYSTEM.
(syms_of_font): Only defsubr if HAVE_WINDOW_SYSTEM.
2008-06-18 14:45:11 +00:00
Jason Rumney
07d9ba9bd8 Add font logging to list and match functions. 2008-06-18 08:33:16 +00:00
Chong Yidong
59facb788f (font_parse_fcname): For known key symbols, intern using correct
symbol name.
2008-06-17 16:04:47 +00:00
Chong Yidong
1578da3196 * font.c (font_parse_fcname): For known key symbols, intern using
correct symbol name.
2008-06-17 16:03:29 +00:00
Chong Yidong
84d50b7123 (font_parse_fcname): Store divider characters for unknown-spec list. 2008-06-17 05:33:06 +00:00
Chong Yidong
0c36bc4ede * font.c (font_parse_fcname): Store divider characters for
unknown-spec list.
2008-06-17 05:32:19 +00:00
Kenichi Handa
70d6ecc654 (realize_default_face): If the frame is not on window
system, set the fontset of face to nil.
2008-06-17 04:50:11 +00:00
Kenichi Handa
821bc4dbf1 (fontset_pattern_regexp): Escape some regexp characters. 2008-06-17 01:26:47 +00:00
Juanma Barranquero
3554e566e3 * dispextern.h (lookup_non_ascii_face, split_font_name_into_vector)
(build_font_name_from_vector): Delete externs.

* xfaces.c (struct font_name): Don't declare.
2008-06-16 22:42:46 +00:00