Mercurial > emacs
changeset 96270:43fea43f47a2
* 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.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 25 Jun 2008 11:51:46 +0000 |
| parents | 603f00a9cc21 |
| children | 0073930415c3 |
| files | src/ChangeLog src/xdisp.c src/xselect.c |
| diffstat | 3 files changed, 23 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jun 25 07:49:12 2008 +0000 +++ b/src/ChangeLog Wed Jun 25 11:51:46 2008 +0000 @@ -1,15 +1,22 @@ +2008-06-25 Juanma Barranquero <lekktu@gmail.com> + + * 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 Kenichi Handa <handa@m17n.org> * xfaces.c (Fx_list_fonts): Call Flist_fonts with the arg PREFER. * font.c (font_parse_fcname): Remove unused variables. - (font_sort_entites): Delete the arg SPEC. Caller changed. Fix - for the case of ! best_only. + (font_sort_entites): Delete the arg SPEC. Caller changed. + Fix for the case of ! best_only. (font_delete_unmatched): Check DPI and AVGWIDTH too. * lisp.h (Fstring_to_unibyte): EXFUN it. - * character.h: (str_to_unibyte): Extern it. + * character.h (str_to_unibyte): Extern it. * character.c (str_to_unibyte): New function. @@ -24,7 +31,7 @@ 2008-06-24 Andreas Schwab <schwab@suse.de> - * Makefile.in (${lispsource}loaddefs.el): Renamed from + * Makefile.in (${lispsource}loaddefs.el): Rename from ../lisp/loaddefs.el. (bootstrap-clean): Do what distclean does but don't remove Makefile. @@ -67,15 +74,15 @@ 2008-06-24 Jason Rumney <jasonr@gnu.org> - * font.c (Ffont_face_attributes): Multiply pixel size before point - conversion to avoid multiplying rounding error. + * font.c (Ffont_face_attributes): Multiply pixel size before point + conversion to avoid multiplying rounding error. 2008-06-23 Jason Rumney <jasonr@gnu.org> * 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. + * w32term.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): Remove. 2008-06-22 Kenichi Handa <handa@m17n.org>
--- a/src/xdisp.c Wed Jun 25 07:49:12 2008 +0000 +++ b/src/xdisp.c Wed Jun 25 11:51:46 2008 +0000 @@ -628,7 +628,7 @@ Lisp_Object Qmessage_truncate_lines; /* Set to 1 in clear_message to make redisplay_internal aware - of an emptied echo area. */ + of an emptied echo area. */ static int message_cleared_p; @@ -6782,7 +6782,7 @@ next line. Note that both for tabs and padding glyphs, all glyphs have - the same width. */ + the same width. */ if (it->nglyphs) { /* More than one glyph or glyph doesn't fit on line. All @@ -10041,7 +10041,7 @@ row->used[TEXT_AREA] = n_glyphs_before; *it = it_before; /* If this is the only glyph on this line, it will never fit on the - toolbar, so skip it. But ensure there is at least one glyph, + toolbar, so skip it. But ensure there is at least one glyph, so we don't accidentally disable the tool-bar. */ if (n_glyphs_before == 0 && (it->vpos > 0 || IT_STRING_CHARPOS (*it) < it->end_charpos-1)) @@ -17746,7 +17746,7 @@ Optional third and fourth args WINDOW and BUFFER specify the window and buffer to use as the context for the formatting (defaults are the selected window and the window's buffer). */) - (format, face, window, buffer) + (format, face, window, buffer) Lisp_Object format, face, window, buffer; { struct it it; @@ -21613,7 +21613,7 @@ /* EXPORT for RIF: - Insert LEN glyphs from START at the nominal cursor position. */ + Insert LEN glyphs from START at the nominal cursor position. */ void x_insert_glyphs (start, len) @@ -22981,7 +22981,7 @@ A polygon is a cons (poly . [x0 y0 x1 y1 ...]) where each pair in the vector describes one corner in the polygon. Returns the alist element for the first matching AREA in MAP. */) - (map, x, y) + (map, x, y) Lisp_Object map; Lisp_Object x, y; { @@ -24653,7 +24653,7 @@ doc: /* *Scroll up to this many lines, to bring point back on screen. If point moves off-screen, redisplay will scroll by up to `scroll-conservatively' lines in order to bring point just barely -onto the screen again. If that cannot be done, then redisplay +onto the screen again. If that cannot be done, then redisplay recenters point as usual. A value of zero means always recenter point if it moves off screen. */); @@ -24684,7 +24684,7 @@ For any other non-nil value, truncate lines in all windows with less than the full frame width. -Nil means to respect the value of `truncate-lines'. */); +A value of nil means to respect the value of `truncate-lines'. */); Vtruncate_partial_width_windows = make_number (30); DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
--- a/src/xselect.c Wed Jun 25 07:49:12 2008 +0000 +++ b/src/xselect.c Wed Jun 25 11:51:46 2008 +0000 @@ -2826,7 +2826,7 @@ with the high 16 bits from the car and the lower 16 bit from the cdr. That number is then used as a window id. If DEST is a frame the event is sent to the outer window of that frame. -Nil means the currently selected frame. +A value of nil means the currently selected frame. If DEST is the string "PointerWindow" the event is sent to the window that contains the pointer. If DEST is the string "InputFocus" the event is sent to the window that has the input focus.