mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-10 15:56:18 +00:00
Spelling and punctuation fixes.
This commit is contained in:
parent
75b09539a4
commit
f224e50022
@ -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 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 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 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 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 Note that we cannot rely on PATH_SEPARATOR, as that one will always
|
||||||
dnl be computed as ':' in MSYS Bash.
|
dnl be computed as ':' in MSYS Bash.
|
||||||
|
@ -3730,7 +3730,8 @@
|
|||||||
2012-11-19 Daniel Colascione <dancol@dancol.org>
|
2012-11-19 Daniel Colascione <dancol@dancol.org>
|
||||||
|
|
||||||
* term/w32-win.el (cygwin-convert-path-from-windows):
|
* 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 <cyd@gnu.org>
|
2012-11-18 Chong Yidong <cyd@gnu.org>
|
||||||
|
|
||||||
|
@ -992,7 +992,7 @@ If EXTERNAL, browse the URL using `shr-external-browser'."
|
|||||||
(eww-browse-url url)))))
|
(eww-browse-url url)))))
|
||||||
|
|
||||||
(defun eww-same-page-p (url1 url2)
|
(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."
|
Differences in #targets are ignored."
|
||||||
(let ((obj1 (url-generic-parse-url url1))
|
(let ((obj1 (url-generic-parse-url url1))
|
||||||
(obj2 (url-generic-parse-url url2)))
|
(obj2 (url-generic-parse-url url2)))
|
||||||
|
@ -1139,7 +1139,7 @@ The preference is a float determined from `shr-prefer-media-type'."
|
|||||||
(setq pref new-pref
|
(setq pref new-pref
|
||||||
url (cdr (assq :src elem)))
|
url (cdr (assq :src elem)))
|
||||||
(message "new %s %s" url pref))
|
(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...
|
;; source tags might end up as children. So recursion it is...
|
||||||
(dolist (child (cdr elem))
|
(dolist (child (cdr elem))
|
||||||
(when (and (listp child)
|
(when (and (listp child)
|
||||||
|
@ -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
|
recover the necessary lines. Return the number of lines that
|
||||||
were recovered.
|
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.
|
pixels and return the number of pixels that were recovered.
|
||||||
|
|
||||||
This function is called by the minibuffer window resizing
|
This function is called by the minibuffer window resizing
|
||||||
@ -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
|
fringes and the scrollbar or a divider column. Any other non-nil
|
||||||
value for SIDE is currently handled like t (or `right').
|
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
|
If the variable `ignore-window-parameters' is non-nil or the
|
||||||
`split-window' parameter of WINDOW equals t, do not process any
|
`split-window' parameter of WINDOW equals t, do not process any
|
||||||
@ -7091,7 +7091,7 @@ accessible position."
|
|||||||
(if pixelwise
|
(if pixelwise
|
||||||
(window-safe-min-pixel-width)
|
(window-safe-min-pixel-width)
|
||||||
window-safe-min-width))
|
window-safe-min-width))
|
||||||
;; Preserve fringes, margines, scrollbars if present.
|
;; Preserve fringes, margins, scrollbars if present.
|
||||||
(window-min-size nil nil t pixelwise)))
|
(window-min-size nil nil t pixelwise)))
|
||||||
(max-width
|
(max-width
|
||||||
;; Sanitize MAX-WIDTH.
|
;; Sanitize MAX-WIDTH.
|
||||||
|
@ -396,7 +396,7 @@
|
|||||||
Add eventhandler for expose to expose_cb. Remove creation of xft_draw.
|
Add eventhandler for expose to expose_cb. Remove creation of xft_draw.
|
||||||
(create_pixmap_for_menu): New function.
|
(create_pixmap_for_menu): New function.
|
||||||
(remap_menubar): Pop down menus that aren't the same as in old_stack.
|
(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.
|
Call create_pixmap_for_menu.
|
||||||
Replace XUnmapWindow with XtPopdown.
|
Replace XUnmapWindow with XtPopdown.
|
||||||
Remowe two last parameters to display_menu.
|
Remowe two last parameters to display_menu.
|
||||||
|
@ -2840,7 +2840,7 @@
|
|||||||
2012-11-19 Daniel Colascione <dancol@dancol.org>
|
2012-11-19 Daniel Colascione <dancol@dancol.org>
|
||||||
|
|
||||||
* w32fns.c (Fx_file_dialog):
|
* 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*.
|
cygwin_convert_file_name*.
|
||||||
|
|
||||||
* cygw32.c (Fcygwin_convert_path_to_windows, syms_of_cygw32):
|
* cygw32.c (Fcygwin_convert_path_to_windows, syms_of_cygw32):
|
||||||
|
@ -208,7 +208,7 @@ struct charset
|
|||||||
unsigned min_code, max_code;
|
unsigned min_code, max_code;
|
||||||
|
|
||||||
/* Offset value used by macros CODE_POINT_TO_INDEX and
|
/* Offset value used by macros CODE_POINT_TO_INDEX and
|
||||||
INDEX_TO_CODE_POINT. . */
|
INDEX_TO_CODE_POINT. */
|
||||||
unsigned char_index_offset;
|
unsigned char_index_offset;
|
||||||
|
|
||||||
/* Minimum and Maximum character codes of the charset. If the
|
/* Minimum and Maximum character codes of the charset. If the
|
||||||
|
@ -1471,8 +1471,8 @@ struct glyph_string
|
|||||||
So maybe these checks should be removed and any clipping left to the
|
So maybe these checks should be removed and any clipping left to the
|
||||||
window manager. */
|
window manager. */
|
||||||
|
|
||||||
/* Value is non-zero if window W wants a mode line and is large enough
|
/* Value is true if window W wants a mode line and is large enough
|
||||||
to accomodate it. */
|
to accommodate it. */
|
||||||
#define WINDOW_WANTS_MODELINE_P(W) \
|
#define WINDOW_WANTS_MODELINE_P(W) \
|
||||||
(BUFFERP ((W)->contents) \
|
(BUFFERP ((W)->contents) \
|
||||||
? (!MINI_WINDOW_P (W) \
|
? (!MINI_WINDOW_P (W) \
|
||||||
@ -1482,8 +1482,8 @@ struct glyph_string
|
|||||||
&& WINDOW_PIXEL_HEIGHT (W) > WINDOW_FRAME_LINE_HEIGHT (W)) \
|
&& WINDOW_PIXEL_HEIGHT (W) > WINDOW_FRAME_LINE_HEIGHT (W)) \
|
||||||
: 0)
|
: 0)
|
||||||
|
|
||||||
/* Value is non-zero if window W wants a header line and is large enough
|
/* Value is true if window W wants a header line and is large enough
|
||||||
to accomodate it. */
|
to accommodate it. */
|
||||||
#define WINDOW_WANTS_HEADER_LINE_P(W) \
|
#define WINDOW_WANTS_HEADER_LINE_P(W) \
|
||||||
(BUFFERP ((W)->contents) \
|
(BUFFERP ((W)->contents) \
|
||||||
? (!MINI_WINDOW_P (W) \
|
? (!MINI_WINDOW_P (W) \
|
||||||
|
@ -254,7 +254,7 @@ struct frame
|
|||||||
int text_width, text_height;
|
int text_width, text_height;
|
||||||
|
|
||||||
/* New text height and width for pending size change. 0 if no change
|
/* 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
|
according to the value of new_pixelwise and correlate to the the
|
||||||
text width/height of the frame. */
|
text width/height of the frame. */
|
||||||
int new_width, new_height;
|
int new_width, new_height;
|
||||||
@ -1170,7 +1170,7 @@ extern Lisp_Object Vframe_list;
|
|||||||
- FRAME_INTERNAL_BORDER_WIDTH (f))))
|
- FRAME_INTERNAL_BORDER_WIDTH (f))))
|
||||||
|
|
||||||
/* Return the pixel width/height of frame F with a text size of
|
/* 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) \
|
#define FRAME_TEXT_TO_PIXEL_WIDTH(f, width) \
|
||||||
((width) \
|
((width) \
|
||||||
@ -1182,7 +1182,7 @@ extern Lisp_Object Vframe_list;
|
|||||||
((height) + 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
|
((height) + 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
|
||||||
|
|
||||||
/* Return the text width/height of frame F with a pixel size of
|
/* 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) \
|
#define FRAME_PIXEL_TO_TEXT_WIDTH(f, width) \
|
||||||
((width) \
|
((width) \
|
||||||
|
@ -3537,7 +3537,7 @@ read_vector (Lisp_Object readcharfun, bool bytecodeflag)
|
|||||||
return vector;
|
return vector;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FLAG means check for ] to terminate rather than ) and . */
|
/* FLAG means check for ']' to terminate rather than ')' and '.'. */
|
||||||
|
|
||||||
static Lisp_Object
|
static Lisp_Object
|
||||||
read_list (bool flag, Lisp_Object readcharfun)
|
read_list (bool flag, Lisp_Object readcharfun)
|
||||||
|
@ -1390,7 +1390,7 @@ Free a pool and temporary objects it refers to (callable from C)
|
|||||||
color_table->empty_indices = [[NSMutableSet alloc] init];
|
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++)
|
for (i = 1; i < color_table->avail; i++)
|
||||||
if (color_table->colors[i] && [color_table->colors[i] isEqual: color])
|
if (color_table->colors[i] && [color_table->colors[i] isEqual: color])
|
||||||
return i;
|
return i;
|
||||||
|
@ -6153,7 +6153,7 @@ Text larger than the specified size is clipped. */)
|
|||||||
{
|
{
|
||||||
/* PXW: Why do we do the pixel-to-cols conversion only if
|
/* 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
|
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,
|
w->total_cols and FRAME_TOTAL_COLS want the width in columns,
|
||||||
not in pixels. */
|
not in pixels. */
|
||||||
|
@ -5844,12 +5844,12 @@ struct save_window_data
|
|||||||
From `frame-cols' down, the fields are ignored by the GC. */
|
From `frame-cols' down, the fields are ignored by the GC. */
|
||||||
/* We should be able to do without the following two. */
|
/* We should be able to do without the following two. */
|
||||||
int frame_cols, frame_lines;
|
int frame_cols, frame_lines;
|
||||||
/* These two should get eventually replaced by their pixelized
|
/* These two should get eventually replaced by their pixel
|
||||||
counterparts. */
|
counterparts. */
|
||||||
int frame_menu_bar_lines, frame_tool_bar_lines;
|
int frame_menu_bar_lines, frame_tool_bar_lines;
|
||||||
int frame_text_width, frame_text_height;
|
int frame_text_width, frame_text_height;
|
||||||
/* These are currently unused. We need them as soon as we pixelize
|
/* These are currently unused. We need them as soon as we convert
|
||||||
them. */
|
to pixels. */
|
||||||
int frame_menu_bar_height, frame_tool_bar_height;
|
int frame_menu_bar_height, frame_tool_bar_height;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -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_COLUMN_WIDTH (f) - 1,
|
||||||
FRAME_LINE_HEIGHT (f) - 1);
|
FRAME_LINE_HEIGHT (f) - 1);
|
||||||
|
|
||||||
/* PXW: Should we clip pixelized before converting to
|
/* PXW: Should we clip pixels before converting to columns/lines? */
|
||||||
columns/lines ? */
|
|
||||||
if (!noclip)
|
if (!noclip)
|
||||||
{
|
{
|
||||||
if (pix_x < 0)
|
if (pix_x < 0)
|
||||||
@ -13494,7 +13493,7 @@ redisplay_internal (void)
|
|||||||
/* Make sure the cursor was last displayed
|
/* Make sure the cursor was last displayed
|
||||||
in this window. Otherwise we have to reposition it. */
|
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
|
&& 0 <= w->cursor.vpos
|
||||||
&& w->cursor.vpos < WINDOW_TOTAL_LINES (w))
|
&& 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)
|
if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
|
||||||
{
|
{
|
||||||
bool gcscrollbars
|
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 ();
|
= f->redisplay || !REDISPLAY_SOME_P ();
|
||||||
/* Mark all the scroll bars to be removed; we'll redeem
|
/* Mark all the scroll bars to be removed; we'll redeem
|
||||||
the ones we want when we redisplay their windows. */
|
the ones we want when we redisplay their windows. */
|
||||||
|
@ -99,7 +99,7 @@
|
|||||||
;; MS-Windows into their long file-name equivalents, which is
|
;; MS-Windows into their long file-name equivalents, which is
|
||||||
;; necessary for the 'equal' and 'string=' comparisons below. This
|
;; necessary for the 'equal' and 'string=' comparisons below. This
|
||||||
;; also resolves any symlinks, which cannot be bad for the same
|
;; 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
|
;; but I'm too lazy to do that, as one of the tests compares a
|
||||||
;; list.)
|
;; list.)
|
||||||
(let* ((temp-dir (file-truename (make-temp-file "reftex-parse" 'dir)))
|
(let* ((temp-dir (file-truename (make-temp-file "reftex-parse" 'dir)))
|
||||||
|
Loading…
Reference in New Issue
Block a user