aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-01-25 08:08:24 -0800
committerPaul Eggert2016-01-25 08:09:09 -0800
commita528a60f48f6b939c5014c96d3445de13d2ed243 (patch)
tree8240a9b0e1fa63d38e514e68276e0b6c4e2993b8
parent21beb19d80b6aba2c2b736b3e1d031f1ef0e743d (diff)
downloademacs-a528a60f48f6b939c5014c96d3445de13d2ed243.tar.gz
emacs-a528a60f48f6b939c5014c96d3445de13d2ed243.zip
Spelling fixes
-rw-r--r--doc/emacs/anti.texi2
-rw-r--r--doc/lispref/windows.texi2
-rw-r--r--lisp/emacs-lisp/pcase.el2
-rw-r--r--lisp/org/ChangeLog.12
-rw-r--r--lisp/progmodes/antlr-mode.el2
-rw-r--r--lisp/progmodes/cc-engine.el6
-rw-r--r--lisp/xwidget.el2
-rw-r--r--src/nsterm.m2
-rw-r--r--src/xwidget.c8
9 files changed, 14 insertions, 14 deletions
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index ae13ae09a04..ece4d9456f1 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -197,7 +197,7 @@ for removing the whole bidi support when downgrading to Emacs 23.
197@item 197@item
198Horizontal scroll bars are no longer supported. Enlarge your windows 198Horizontal scroll bars are no longer supported. Enlarge your windows
199and frames instead, or use @code{truncate-lines} and the automatic 199and frames instead, or use @code{truncate-lines} and the automatic
200horizontal scrolling of text that Emacs had since time immemoriam. 200horizontal scrolling of text that Emacs had since time immemorial.
201 201
202@item 202@item
203Emacs is again counting the height of a frame's menu and its tool bar 203Emacs is again counting the height of a frame's menu and its tool bar
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index fee4b0c714f..ca756e3ff7f 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1579,7 +1579,7 @@ combination limit of @var{W4} (the parent window of @var{W6} and
1579 1579
1580Alternatively, the problems sketched above can be avoided by always 1580Alternatively, the problems sketched above can be avoided by always
1581resizing all windows in the same combination whenever one of its windows 1581resizing all windows in the same combination whenever one of its windows
1582is split or deleted. This also permits spliting windows that would be 1582is split or deleted. This also permits splitting windows that would be
1583otherwise too small for such an operation. 1583otherwise too small for such an operation.
1584 1584
1585@defopt window-combination-resize 1585@defopt window-combination-resize
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 549ee96dd5f..7be997e6469 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -117,7 +117,7 @@ two element list, binding its elements to symbols named `foo' and
117 117
118A significant difference from `cl-destructuring-bind' is that, if 118A significant difference from `cl-destructuring-bind' is that, if
119a pattern match fails, the next case is tried until either a 119a pattern match fails, the next case is tried until either a
120succesful match is found or there are no more cases. 120successful match is found or there are no more cases.
121 121
122Another difference is that pattern elements may be backquoted, 122Another difference is that pattern elements may be backquoted,
123meaning they must match exactly: The pattern \\='(foo bar) 123meaning they must match exactly: The pattern \\='(foo bar)
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index d81e44d7c13..8c118ec7dd0 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -32528,7 +32528,7 @@
32528 (org-export-normalize-links) 32528 (org-export-normalize-links)
32529 (org-export-concatenate-multiline-links) 32529 (org-export-concatenate-multiline-links)
32530 (org-export-concatenate-multiline-emphasis): New functions, 32530 (org-export-concatenate-multiline-emphasis): New functions,
32531 obtained from spliting the export preprocessor. 32531 obtained from splitting the export preprocessor.
32532 32532
32533 * org-table.el (org-table-recalculate): Improve error message if 32533 * org-table.el (org-table-recalculate): Improve error message if
32534 the row number is invalid. 32534 the row number is invalid.
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f33609c1d0a..ee81add340c 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -537,7 +537,7 @@ corresponding kind, i.e., looks like \(OPTION-DEF...).
537Each OPTION-DEF looks like \(OPTION-NAME EXTRA-FN VALUE-SPEC...) which 537Each OPTION-DEF looks like \(OPTION-NAME EXTRA-FN VALUE-SPEC...) which
538defines a file/grammar/rule/subrule option with name OPTION-NAME. The 538defines a file/grammar/rule/subrule option with name OPTION-NAME. The
539OPTION-NAMEs are used for the creation of the \"Insert XXX Option\" 539OPTION-NAMEs are used for the creation of the \"Insert XXX Option\"
540submenus, see `antlr-options-use-submenus', and to allow the insersion 540submenus, see `antlr-options-use-submenus', and to allow the insertion
541of the option name with completion when using \\[antlr-insert-option]. 541of the option name with completion when using \\[antlr-insert-option].
542 542
543If EXTRA-FN is a function, it is called at different phases of the 543If EXTRA-FN is a function, it is called at different phases of the
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 815bd7216f2..b75d667d318 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8284,8 +8284,8 @@ comment at the start of cc-engine.el for more info."
8284 before-lparen after-rparen 8284 before-lparen after-rparen
8285 (here (point)) 8285 (here (point))
8286 (pp-count-out 20) ; Max number of paren/brace constructs before 8286 (pp-count-out 20) ; Max number of paren/brace constructs before
8287 ; we give up 8287 ; we give up.
8288 ids ; List of identifiers in the parenthesised list. 8288 ids ; List of identifiers in the parenthesized list.
8289 id-start after-prec-token decl-or-cast decl-res 8289 id-start after-prec-token decl-or-cast decl-res
8290 c-last-identifier-range identifier-ok) 8290 c-last-identifier-range identifier-ok)
8291 (narrow-to-region low-lim (or macro-end (point-max))) 8291 (narrow-to-region low-lim (or macro-end (point-max)))
@@ -8310,7 +8310,7 @@ comment at the start of cc-engine.el for more info."
8310 ;; { 8310 ;; {
8311 ;; 8311 ;;
8312 ;; Additionally, for a knr list to be recognized: 8312 ;; Additionally, for a knr list to be recognized:
8313 ;; o - The identifier of each deeclarator up to and including the 8313 ;; o - The identifier of each declarator up to and including the
8314 ;; one "near" point must be contained in the arg list. 8314 ;; one "near" point must be contained in the arg list.
8315 8315
8316 (catch 'knr 8316 (catch 'knr
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index f184eb31dbb..ebd79f246a1 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -491,7 +491,7 @@ Argument H height."
491(defun xwidget-webkit-execute-script-rv (xw script &optional default) 491(defun xwidget-webkit-execute-script-rv (xw script &optional default)
492 "Same as 'xwidget-webkit-execute-script' but but with return value. 492 "Same as 'xwidget-webkit-execute-script' but but with return value.
493XW is the webkit instance. SCRIPT is the script to execute. 493XW is the webkit instance. SCRIPT is the script to execute.
494DEFAULT is the defaultreturn value." 494DEFAULT is the default return value."
495 ;; Notice the ugly "title" hack. It is needed because the Webkit 495 ;; Notice the ugly "title" hack. It is needed because the Webkit
496 ;; API at the time of writing didn't support returning values. This 496 ;; API at the time of writing didn't support returning values. This
497 ;; is a wrapper for the title hack so it's easy to remove should 497 ;; is a wrapper for the title hack so it's easy to remove should
diff --git a/src/nsterm.m b/src/nsterm.m
index 860c55de70f..19083ef21f7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1170,7 +1170,7 @@ ns_clip_to_row (struct window *w, struct glyph_row *row,
1170 // GNUstep doesn't provide named images. This was reported in 1170 // GNUstep doesn't provide named images. This was reported in
1171 // 2011, see https://savannah.gnu.org/bugs/?33396 1171 // 2011, see https://savannah.gnu.org/bugs/?33396
1172 // 1172 //
1173 // As a drop in replacment, a semi tranparent gray square is used. 1173 // As a drop in replacement, a semitransparent gray square is used.
1174 self.image = [[NSImage alloc] initWithSize:NSMakeSize(32, 32)]; 1174 self.image = [[NSImage alloc] initWithSize:NSMakeSize(32, 32)];
1175 [self.image lockFocus]; 1175 [self.image lockFocus];
1176 [[NSColor colorForEmacsRed:0.5 green:0.5 blue:0.5 alpha:0.5] set]; 1176 [[NSColor colorForEmacsRed:0.5 green:0.5 blue:0.5 alpha:0.5] set];
diff --git a/src/xwidget.c b/src/xwidget.c
index 91a92c0ca4c..9450bdf7870 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -393,7 +393,7 @@ webkit_mime_type_policy_typedecision_requested_cb
393{ 393{
394 /* This function makes webkit send a download signal for all unknown 394 /* This function makes webkit send a download signal for all unknown
395 mime types. TODO: Defer the decision to Lisp, so that it's 395 mime types. TODO: Defer the decision to Lisp, so that it's
396 possible to make Emacs handle teext mime for instance.xs. */ 396 possible to make Emacs handle mime text for instance. */
397 if (!webkit_web_view_can_show_mime_type (webView, mimetype)) 397 if (!webkit_web_view_can_show_mime_type (webView, mimetype))
398 { 398 {
399 webkit_web_policy_decision_download (policy_decision); 399 webkit_web_policy_decision_download (policy_decision);
@@ -594,7 +594,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
594 WINDOW_BOTTOM_EDGE_Y (s->w) - WINDOW_MODE_LINE_HEIGHT (s->w) - y); 594 WINDOW_BOTTOM_EDGE_Y (s->w) - WINDOW_MODE_LINE_HEIGHT (s->w) - y);
595 clip_top = max (0, WINDOW_TOP_EDGE_Y (s->w) - y); 595 clip_top = max (0, WINDOW_TOP_EDGE_Y (s->w) - y);
596 596
597 /* We are conserned with movement of the onscreen area. The area 597 /* We are concerned with movement of the onscreen area. The area
598 might sit still when the widget actually moves. This happens 598 might sit still when the widget actually moves. This happens
599 when an Emacs window border moves across a widget window. So, if 599 when an Emacs window border moves across a widget window. So, if
600 any corner of the outer widget clipping window moves, that counts 600 any corner of the outer widget clipping window moves, that counts
@@ -615,7 +615,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
615 /* Clip the widget window if some parts happen to be outside 615 /* Clip the widget window if some parts happen to be outside
616 drawable area. An Emacs window is not a gtk window. A gtk window 616 drawable area. An Emacs window is not a gtk window. A gtk window
617 covers the entire frame. Clipping might have changed even if we 617 covers the entire frame. Clipping might have changed even if we
618 havent actualy moved, we try figure out when we need to reclip 618 haven't actually moved; try to figure out when we need to reclip
619 for real. */ 619 for real. */
620 if (xv->clip_right != clip_right 620 if (xv->clip_right != clip_right
621 || xv->clip_bottom != clip_bottom 621 || xv->clip_bottom != clip_bottom
@@ -1132,7 +1132,7 @@ xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix)
1132 not in the desired matrix. 1132 not in the desired matrix.
1133 1133
1134 This only takes care of xwidgets in active windows. If a window 1134 This only takes care of xwidgets in active windows. If a window
1135 goes away from screen xwidget views wust be deleted. 1135 goes away from the screen, xwidget views must be deleted.
1136 1136
1137 dump_glyph_matrix (matrix, 2); */ 1137 dump_glyph_matrix (matrix, 2); */
1138 for (i = 0; i < matrix->nrows; ++i) 1138 for (i = 0; i < matrix->nrows; ++i)