From f224e5002292f7b9b9347147d4b5af913fed516a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 Dec 2013 14:33:13 -0800 Subject: [PATCH] Spelling and punctuation fixes. --- configure.ac | 2 +- lisp/ChangeLog.16 | 3 ++- lisp/net/eww.el | 2 +- lisp/net/shr.el | 2 +- lisp/window.el | 10 +++++----- lwlib/ChangeLog | 2 +- src/ChangeLog.12 | 2 +- src/alloc.c | 2 +- src/blockinput.h | 2 +- src/buffer.h | 2 +- src/charset.h | 2 +- src/chartab.c | 2 +- src/dispextern.h | 8 ++++---- src/frame.h | 6 +++--- src/lread.c | 2 +- src/nsterm.m | 4 ++-- src/print.c | 2 +- src/regex.c | 2 +- src/w32fns.c | 2 +- src/window.c | 12 ++++++------ src/xdisp.c | 19 +++++++++---------- src/xrdb.c | 2 +- test/automated/reftex-tests.el | 2 +- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/configure.ac b/configure.ac index a2e4cd9e15..46ddb43635 100644 --- a/configure.ac +++ b/configure.ac @@ -3843,7 +3843,7 @@ dnl The MSYS Bash has heuristics for replacing ':' with ';' when it dnl decides that a command-line argument to be passed to a MinGW program dnl is a PATH-style list of directories. But that heuristics plays it dnl safe, and only does the replacement when it is _absolutely_ sure it -dnl sees a colon-seperated list of file names; e.g. ":." is left alone, +dnl sees a colon-separated list of file names; e.g. ":." is left alone, dnl which breaks in-tree builds. So we do this manually instead. dnl Note that we cannot rely on PATH_SEPARATOR, as that one will always dnl be computed as ':' in MSYS Bash. diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index ebdab33e5e..fb2ce5ecd7 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -3730,7 +3730,8 @@ 2012-11-19 Daniel Colascione * term/w32-win.el (cygwin-convert-path-from-windows): - Accomodate rename of cygwin_convert_path* to cygwin_convert_file_name*. + Accommodate rename of cygwin_convert_path* to + cygwin_convert_file_name*. 2012-11-18 Chong Yidong diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 2726748337..461236f04f 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -992,7 +992,7 @@ If EXTERNAL, browse the URL using `shr-external-browser'." (eww-browse-url url))))) (defun eww-same-page-p (url1 url2) - "Return non-nil if boths URLs represent the same page. + "Return non-nil if both URLs represent the same page. Differences in #targets are ignored." (let ((obj1 (url-generic-parse-url url1)) (obj2 (url-generic-parse-url url2))) diff --git a/lisp/net/shr.el b/lisp/net/shr.el index fff1898df5..5857517684 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1139,7 +1139,7 @@ The preference is a float determined from `shr-prefer-media-type'." (setq pref new-pref url (cdr (assq :src elem))) (message "new %s %s" url pref)) - ;; libxml's html parser isn't HML5 compliant and non terminated + ;; libxml's html parser isn't HTML5 compliant and non terminated ;; source tags might end up as children. So recursion it is... (dolist (child (cdr elem)) (when (and (listp child) diff --git a/lisp/window.el b/lisp/window.el index d35d89814a..7978623ac7 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1165,7 +1165,7 @@ of WINDOW." 0 window-min-width))))) (pixelwise - (max + (max (+ (window-safe-min-size window nil t) (window-header-line-height window) (window-mode-line-height window)) @@ -2753,7 +2753,7 @@ zero, this function can resize fixed-size windows in order to recover the necessary lines. Return the number of lines that were recovered. -Third argument PIXELWISE non-nil means to intepret DELTA as +Third argument PIXELWISE non-nil means to interpret DELTA as pixels and return the number of pixels that were recovered. This function is called by the minibuffer window resizing @@ -3189,7 +3189,7 @@ Return 'frame if deleting WINDOW should also delete its frame." (setq window (window-normalize-window window)) (unless (or ignore-window-parameters - (eq (window-parameter window 'delete-window) t)) + (eq (window-parameter window 'delete-window) t)) ;; Handle atomicity. (when (window-parameter window 'window-atom) (setq window (window-atom-root window)))) @@ -4093,7 +4093,7 @@ window provided SIZE is negative) including space reserved for fringes and the scrollbar or a divider column. Any other non-nil value for SIDE is currently handled like t (or `right'). -PIXELWISE, if non-nil, means to intepret SIZE pixelwise. +PIXELWISE, if non-nil, means to interpret SIZE pixelwise. If the variable `ignore-window-parameters' is non-nil or the `split-window' parameter of WINDOW equals t, do not process any @@ -7091,7 +7091,7 @@ accessible position." (if pixelwise (window-safe-min-pixel-width) window-safe-min-width)) - ;; Preserve fringes, margines, scrollbars if present. + ;; Preserve fringes, margins, scrollbars if present. (window-min-size nil nil t pixelwise))) (max-width ;; Sanitize MAX-WIDTH. diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index e4ab1a91ca..27bf65db84 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -396,7 +396,7 @@ Add eventhandler for expose to expose_cb. Remove creation of xft_draw. (create_pixmap_for_menu): New function. (remap_menubar): Pop down menus that aren't the same as in old_stack. - Set width, heigh, x, y on widget with XtVaSetValues. + Set width, height, x, y on widget with XtVaSetValues. Call create_pixmap_for_menu. Replace XUnmapWindow with XtPopdown. Remowe two last parameters to display_menu. diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index b14ce20ede..02940840ea 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 @@ -2840,7 +2840,7 @@ 2012-11-19 Daniel Colascione * w32fns.c (Fx_file_dialog): - (Fx_file_dialog): Accomodate rename of cygwin_convert_path* to + (Fx_file_dialog): Accommodate rename of cygwin_convert_path* to cygwin_convert_file_name*. * cygw32.c (Fcygwin_convert_path_to_windows, syms_of_cygw32): diff --git a/src/alloc.c b/src/alloc.c index 7024b47fc7..f076075a94 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4317,7 +4317,7 @@ live_buffer_p (struct mem_node *m, void *p) void dump_zombies (void) EXTERNALLY_VISIBLE; /* Array of objects that are kept alive because the C stack contains - a pattern that looks like a reference to them . */ + a pattern that looks like a reference to them. */ #define MAX_ZOMBIES 10 static Lisp_Object zombies[MAX_ZOMBIES]; diff --git a/src/blockinput.h b/src/blockinput.h index 8f1b1e1898..6c69b01d3d 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -59,7 +59,7 @@ extern void unblock_input (void); extern void totally_unblock_input (void); extern void unblock_input_to (int); -/* In critical section ? */ +/* In critical section? */ INLINE bool input_blocked_p (void) diff --git a/src/buffer.h b/src/buffer.h index 586090fbe8..10d5fdc23e 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -741,7 +741,7 @@ struct buffer Lisp_Object INTERNAL_FIELD (cursor_in_non_selected_windows); /* No more Lisp_Object beyond this point. Except undo_list, - which is handled specially in Fgarbage_collect . */ + which is handled specially in Fgarbage_collect. */ /* This structure holds the coordinates of the buffer contents in ordinary buffers. In indirect buffers, this is not used. */ diff --git a/src/charset.h b/src/charset.h index 6e6a8891b4..d5c41ec6f4 100644 --- a/src/charset.h +++ b/src/charset.h @@ -208,7 +208,7 @@ struct charset unsigned min_code, max_code; /* Offset value used by macros CODE_POINT_TO_INDEX and - INDEX_TO_CODE_POINT. . */ + INDEX_TO_CODE_POINT. */ unsigned char_index_offset; /* Minimum and Maximum character codes of the charset. If the diff --git a/src/chartab.c b/src/chartab.c index 16dd85c12c..2a8bbc6983 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1272,7 +1272,7 @@ uniprop_encode_value_run_length (Lisp_Object table, Lisp_Object value) /* Encode VALUE as an element of char-table TABLE which adopts RUN-LENGTH - compression and contains numbers as elements . */ + compression and contains numbers as elements. */ static Lisp_Object uniprop_encode_value_numeric (Lisp_Object table, Lisp_Object value) diff --git a/src/dispextern.h b/src/dispextern.h index 977e2f8c66..2ce0a8f4c9 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1471,8 +1471,8 @@ struct glyph_string So maybe these checks should be removed and any clipping left to the window manager. */ -/* Value is non-zero if window W wants a mode line and is large enough - to accomodate it. */ +/* Value is true if window W wants a mode line and is large enough + to accommodate it. */ #define WINDOW_WANTS_MODELINE_P(W) \ (BUFFERP ((W)->contents) \ ? (!MINI_WINDOW_P (W) \ @@ -1482,8 +1482,8 @@ struct glyph_string && WINDOW_PIXEL_HEIGHT (W) > WINDOW_FRAME_LINE_HEIGHT (W)) \ : 0) -/* Value is non-zero if window W wants a header line and is large enough - to accomodate it. */ +/* Value is true if window W wants a header line and is large enough + to accommodate it. */ #define WINDOW_WANTS_HEADER_LINE_P(W) \ (BUFFERP ((W)->contents) \ ? (!MINI_WINDOW_P (W) \ diff --git a/src/frame.h b/src/frame.h index 4a0ff461f6..8369cf6b17 100644 --- a/src/frame.h +++ b/src/frame.h @@ -254,7 +254,7 @@ struct frame int text_width, text_height; /* New text height and width for pending size change. 0 if no change - pending. These value represent pixels or canoncial character units + pending. These values represent pixels or canonical character units according to the value of new_pixelwise and correlate to the the text width/height of the frame. */ int new_width, new_height; @@ -1170,7 +1170,7 @@ extern Lisp_Object Vframe_list; - FRAME_INTERNAL_BORDER_WIDTH (f)))) /* Return the pixel width/height of frame F with a text size of - width/heigh. */ + width/height. */ #define FRAME_TEXT_TO_PIXEL_WIDTH(f, width) \ ((width) \ @@ -1182,7 +1182,7 @@ extern Lisp_Object Vframe_list; ((height) + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) /* Return the text width/height of frame F with a pixel size of - width/heigh. */ + width/height. */ #define FRAME_PIXEL_TO_TEXT_WIDTH(f, width) \ ((width) \ diff --git a/src/lread.c b/src/lread.c index 679cbb7837..a64f083a5a 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3537,7 +3537,7 @@ read_vector (Lisp_Object readcharfun, bool bytecodeflag) return vector; } -/* FLAG means check for ] to terminate rather than ) and . */ +/* FLAG means check for ']' to terminate rather than ')' and '.'. */ static Lisp_Object read_list (bool flag, Lisp_Object readcharfun) diff --git a/src/nsterm.m b/src/nsterm.m index 7121366527..e58ac9b927 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1390,7 +1390,7 @@ ns_index_color (NSColor *color, struct frame *f) color_table->empty_indices = [[NSMutableSet alloc] init]; } - /* do we already have this color ? */ + /* Do we already have this color? */ for (i = 1; i < color_table->avail; i++) if (color_table->colors[i] && [color_table->colors[i] isEqual: color]) return i; @@ -7585,5 +7585,5 @@ baseline level. The default value is nil. */); #else Fprovide (Qgnustep, Qnil); #endif - + } diff --git a/src/print.c b/src/print.c index 80e010ee0f..6e8aec37ba 100644 --- a/src/print.c +++ b/src/print.c @@ -1119,7 +1119,7 @@ print (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) string (its text properties will be traced), or a symbol that has no obarray (this is for the print-gensym feature). The status fields of Vprint_number_table mean whether each object appears - more than once in OBJ: Qnil at the first time, and Qt after that . */ + more than once in OBJ: Qnil at the first time, and Qt after that. */ static void print_preprocess (Lisp_Object obj) { diff --git a/src/regex.c b/src/regex.c index 615fb3fdf3..b45dbcaada 100644 --- a/src/regex.c +++ b/src/regex.c @@ -5907,7 +5907,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Here, we discard `const', making re_match non-reentrant. */ p2 = (unsigned char*) p + mcnt; - /* Signedness doesn't matter since we only copy MCNT's bits . */ + /* Signedness doesn't matter since we only copy MCNT's bits. */ EXTRACT_NUMBER_AND_INCR (mcnt, p); DEBUG_PRINT (" Setting %p to %d.\n", p2, mcnt); PUSH_NUMBER (p2, mcnt); diff --git a/src/w32fns.c b/src/w32fns.c index 975d3f95e6..f574a86b1e 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6153,7 +6153,7 @@ Text larger than the specified size is clipped. */) { /* PXW: Why do we do the pixel-to-cols conversion only if seen_reversed_p holds? Don't we have to set other fields of - the window/frame stucture ? + the window/frame structure? w->total_cols and FRAME_TOTAL_COLS want the width in columns, not in pixels. */ diff --git a/src/window.c b/src/window.c index e62fdad682..a28449ba1d 100644 --- a/src/window.c +++ b/src/window.c @@ -1212,7 +1212,7 @@ coordinates_in_window (register struct window *w, int x, int y) return ON_NOTHING; /* On vertical window divider (which prevails horizontal - dividers) ? */ + dividers)? */ if (!WINDOW_RIGHTMOST_P (w) && WINDOW_RIGHT_DIVIDER_WIDTH (w) && x >= right_x - WINDOW_RIGHT_DIVIDER_WIDTH (w) @@ -1285,8 +1285,8 @@ coordinates_in_window (register struct window *w, int x, int y) terminals, the vertical line's x coordinate is right_x. */ else if (!w->pseudo_window_p && !WINDOW_RIGHTMOST_P (w) - /* Why check ux if we are not the rightmost window ? Also - shouldn't a pseudo window always be rightmost ? */ + /* Why check ux if we are not the rightmost window? Also + shouldn't a pseudo window always be rightmost? */ && x > right_x - ux) return ON_VERTICAL_BORDER; @@ -5844,12 +5844,12 @@ struct save_window_data From `frame-cols' down, the fields are ignored by the GC. */ /* We should be able to do without the following two. */ int frame_cols, frame_lines; - /* These two should get eventually replaced by their pixelized + /* These two should get eventually replaced by their pixel counterparts. */ int frame_menu_bar_lines, frame_tool_bar_lines; int frame_text_width, frame_text_height; - /* These are currently unused. We need them as soon as we pixelize - them. */ + /* These are currently unused. We need them as soon as we convert + to pixels. */ int frame_menu_bar_height, frame_tool_bar_height; }; diff --git a/src/xdisp.c b/src/xdisp.c index e192ed3fd6..b52c89a755 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1907,8 +1907,7 @@ pixel_to_glyph_coords (struct frame *f, register int pix_x, register int pix_y, FRAME_COLUMN_WIDTH (f) - 1, FRAME_LINE_HEIGHT (f) - 1); - /* PXW: Should we clip pixelized before converting to - columns/lines ? */ + /* PXW: Should we clip pixels before converting to columns/lines? */ if (!noclip) { if (pix_x < 0) @@ -2814,7 +2813,7 @@ init_iterator (struct it *it, struct window *w, && ((!NILP (Vtruncate_partial_width_windows) && !INTEGERP (Vtruncate_partial_width_windows)) || (INTEGERP (Vtruncate_partial_width_windows) - /* PXW: Shall we do something about this ? */ + /* PXW: Shall we do something about this? */ && (WINDOW_TOTAL_COLS (it->w) < XINT (Vtruncate_partial_width_windows)))))) it->line_wrap = TRUNCATE; @@ -12072,7 +12071,7 @@ tool_bar_height (struct frame *f, int *n_rows, bool pixelwise) F->desired_tool_bar_string in the tool-bar window of frame F. */ init_iterator (&it, w, -1, -1, temp_row, TOOL_BAR_FACE_ID); it.first_visible_x = 0; - /* PXW: Use FRAME_PIXEL_WIDTH (f) here ? */ + /* PXW: Use FRAME_PIXEL_WIDTH (f) here? */ it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f); reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); it.paragraph_embedding = L2R; @@ -13494,7 +13493,7 @@ redisplay_internal (void) /* Make sure the cursor was last displayed in this window. Otherwise we have to reposition it. */ - /* PXW: Must be pixelized, probably. */ + /* PXW: Must be converted to pixels, probably. */ && 0 <= w->cursor.vpos && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) { @@ -13588,7 +13587,7 @@ redisplay_internal (void) if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf) { bool gcscrollbars - /* Only GC scollbars when we redisplay the whole frame. */ + /* Only GC scrollbars when we redisplay the whole frame. */ = f->redisplay || !REDISPLAY_SOME_P (); /* Mark all the scroll bars to be removed; we'll redeem the ones we want when we redisplay their windows. */ @@ -15046,7 +15045,7 @@ try_scrolling (Lisp_Object window, int just_this_one_p, if (! cursor_row_fully_visible_p (w, extra_scroll_margin_lines <= 1, 0) /* It's possible that the cursor is on the first line of the buffer, which is partially obscured due to a vscroll - (Bug#7537). In that case, avoid looping forever . */ + (Bug#7537). In that case, avoid looping forever. */ && extra_scroll_margin_lines < w->desired_matrix->nrows - 1) { clear_glyph_matrix (w->desired_matrix); @@ -15101,7 +15100,7 @@ compute_window_start_on_continuation_line (struct window *w) /* If the line start is "too far" away from the window start, say it takes too much time to compute a new window start. */ if (CHARPOS (start_pos) - IT_CHARPOS (it) - /* PXW: Do we need upper bounds here ? */ + /* PXW: Do we need upper bounds here? */ < WINDOW_TOTAL_LINES (w) * WINDOW_TOTAL_COLS (w)) { int min_distance, distance; @@ -20728,7 +20727,7 @@ display_menu_bar (struct window *w) eassert (!FRAME_WINDOW_P (f)); init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); it.first_visible_x = 0; - /* PXW: Use FRAME_PIXEL_WIDTH (f) here ? */ + /* PXW: Use FRAME_PIXEL_WIDTH (f) here? */ it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f); #elif defined (HAVE_X_WINDOWS) /* X without toolkit. */ if (FRAME_WINDOW_P (f)) @@ -20740,7 +20739,7 @@ display_menu_bar (struct window *w) init_iterator (&it, menu_w, -1, -1, menu_w->desired_matrix->rows, MENU_FACE_ID); it.first_visible_x = 0; - /* PXW: Use FRAME_PIXEL_WIDTH (f) here ? */ + /* PXW: Use FRAME_PIXEL_WIDTH (f) here? */ it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f); } else diff --git a/src/xrdb.c b/src/xrdb.c index ea823b2b31..7220915e63 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -179,7 +179,7 @@ magic_db (const char *string, ptrdiff_t string_len, const char *class, else next = p, next_len = 1; - /* Do we have room for this component followed by a '\0' ? */ + /* Do we have room for this component followed by a '\0'? */ if (path_size - path_len <= next_len) { if (min (PTRDIFF_MAX, SIZE_MAX) / 2 - 1 - path_len < next_len) diff --git a/test/automated/reftex-tests.el b/test/automated/reftex-tests.el index 74a9f3d806..0eb3be9fec 100644 --- a/test/automated/reftex-tests.el +++ b/test/automated/reftex-tests.el @@ -99,7 +99,7 @@ ;; MS-Windows into their long file-name equivalents, which is ;; necessary for the 'equal' and 'string=' comparisons below. This ;; also resolves any symlinks, which cannot be bad for the same - ;; reason. (An alternatrive solution would be to use file-equal-p, + ;; reason. (An alternative solution would be to use file-equal-p, ;; but I'm too lazy to do that, as one of the tests compares a ;; list.) (let* ((temp-dir (file-truename (make-temp-file "reftex-parse" 'dir))) -- 2.20.1