aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-11-18 00:31:02 -0800
committerPaul Eggert2011-11-18 00:31:02 -0800
commit3ed8598c49cbbe3aa3a3605a28d9b7f2df3caf1e (patch)
treeeedcfcd5751edab39f795fcfb688e1e5cc3ad128
parent5c3a902f0fe2c2306ea7b340d701c1a855d1a3d5 (diff)
downloademacs-3ed8598c49cbbe3aa3a3605a28d9b7f2df3caf1e.tar.gz
emacs-3ed8598c49cbbe3aa3a3605a28d9b7f2df3caf1e.zip
Spelling fixes.
-rw-r--r--doc/misc/org.texi2
-rw-r--r--etc/ChangeLog2
-rw-r--r--etc/NEWS.1-172
-rw-r--r--etc/themes/manoj-dark-theme.el4
-rw-r--r--lisp/calc/calc-misc.el4
-rw-r--r--lisp/cedet/ede/proj.el2
-rw-r--r--lisp/cedet/pulse.el2
-rw-r--r--lisp/emacs-lisp/edebug.el2
-rw-r--r--lisp/emulation/cua-rect.el2
-rw-r--r--lisp/gnus/gnus-sum.el2
-rw-r--r--lisp/gnus/spam-report.el2
-rw-r--r--lisp/info-xref.el2
-rw-r--r--lisp/international/quail.el4
-rw-r--r--lisp/minibuffer.el2
-rw-r--r--lisp/net/browse-url.el2
-rw-r--r--lisp/org/org-taskjuggler.el10
-rw-r--r--lisp/play/bubbles.el2
-rw-r--r--lisp/progmodes/cperl-mode.el4
-rw-r--r--lisp/progmodes/ebnf2ps.el2
-rw-r--r--lisp/progmodes/ps-mode.el2
-rw-r--r--lisp/shell.el2
-rw-r--r--lisp/textmodes/flyspell.el2
-rw-r--r--lwlib/xlwmenu.c2
-rw-r--r--nt/INSTALL4
-rw-r--r--src/gtkutil.c2
-rw-r--r--src/w32.c2
26 files changed, 35 insertions, 35 deletions
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index cc925906c28..34a4ba4f8f3 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -15533,7 +15533,7 @@ chapter about publishing.
15533@i{Jambunathan K} contributed the OpenDocumentText exporter. 15533@i{Jambunathan K} contributed the OpenDocumentText exporter.
15534@item 15534@item
15535@i{Sebastien Vauban} reported many issues with LaTeX and BEAMER export and 15535@i{Sebastien Vauban} reported many issues with LaTeX and BEAMER export and
15536enabled source code highlighling in Gnus. 15536enabled source code highlighting in Gnus.
15537@item 15537@item
15538@i{Stefan Vollmar} organized a video-recorded talk at the 15538@i{Stefan Vollmar} organized a video-recorded talk at the
15539Max-Planck-Institute for Neurology. He also inspired the creation of a 15539Max-Planck-Institute for Neurology. He also inspired the creation of a
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1db595b3175..48b1acacbf9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -4107,7 +4107,7 @@
4107 4107
41082002-02-01 ShengHuo ZHU <zsh@cs.rochester.edu> 41082002-02-01 ShengHuo ZHU <zsh@cs.rochester.edu>
4109 4109
4110 * gnus.xpm: Remove garbages. 4110 * gnus.xpm: Remove garbage.
4111 4111
41122002-01-27 Pavel Janík <Pavel@Janik.cz> 41122002-01-27 Pavel Janík <Pavel@Janik.cz>
4113 4113
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index b1da9122934..aa8c8839d3c 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -2423,7 +2423,7 @@ Changes in Emacs 1.1
2423 or show the text or subheadings under each heading line 2423 or show the text or subheadings under each heading line
2424 independently. Hidden text or subheadings are invisibly 2424 independently. Hidden text or subheadings are invisibly
2425 attached to the end of the preceding heading line, so that 2425 attached to the end of the preceding heading line, so that
2426 if you kill the hading line and yank it back elsewhere 2426 if you kill the heading line and yank it back elsewhere
2427 all the invisible lines accompany it. 2427 all the invisible lines accompany it.
2428 2428
2429 All editing commands treat hidden outline-mode lines 2429 All editing commands treat hidden outline-mode lines
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 55b07e6eaef..b06678636c7 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -37,7 +37,7 @@
37;; (blueish) or mail (greenish), have states (large number of under 37;; (blueish) or mail (greenish), have states (large number of under
38;; messages, normal, and empty). The large number unread groups have 38;; messages, normal, and empty). The large number unread groups have
39;; highest luminance (appear brighter), and the empty one have lower 39;; highest luminance (appear brighter), and the empty one have lower
40;; luminance (appear greyer), but have the same chroma and saturation. 40;; luminance (appear grayer), but have the same chroma and saturation.
41;; Sub states and group priorities are rendered using a color series 41;; Sub states and group priorities are rendered using a color series
42;; which has constant luminance and saturation, and vary in hue by a 42;; which has constant luminance and saturation, and vary in hue by a
43;; constant separation -- so all the related groups have the same 43;; constant separation -- so all the related groups have the same
@@ -53,7 +53,7 @@
53 53
54;; In the message itself, quoted mail messages from different people 54;; In the message itself, quoted mail messages from different people
55;; are color coordinated, with high contrast between citations that are 55;; are color coordinated, with high contrast between citations that are
56;; close to each other in the heirarchy, so it is less likely that one 56;; close to each other in the hierarchy, so it is less likely that one
57;; misunderstands who said what in a long conversation. 57;; misunderstands who said what in a long conversation.
58 58
59;; The following scheme covers programming languages, Gnus, Erc, mail, 59;; The following scheme covers programming languages, Gnus, Erc, mail,
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index db86c08422e..6d034927ae0 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -260,13 +260,13 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
260 (length msg)) 32) 260 (length msg)) 32)
261 " [?=MORE]") 261 " [?=MORE]")
262 "")))))))) 262 ""))))))))
263 263
264 264
265 265
266 266
267;;;; Stack and buffer management. 267;;;; Stack and buffer management.
268 268
269;; The variable calc-last-why-command is set in calc-do-handly-whys 269;; The variable calc-last-why-command is set in calc-do-handle-whys
270;; and used in calc-why (in calc-stuff.el). 270;; and used in calc-why (in calc-stuff.el).
271(defvar calc-last-why-command) 271(defvar calc-last-why-command)
272 272
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 40e6165251c..79022be6a5f 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -584,7 +584,7 @@ Converts all symbols into the objects to be used."
584 link))) 584 link)))
585 585
586 586
587;;; Target type specific autogenerating gobbldegook. 587;;; Target type specific autogenerating gobbledygook.
588;; 588;;
589 589
590(defun ede-proj-makefile-type (&optional proj) 590(defun ede-proj-makefile-type (&optional proj)
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 74dc1ecde31..e3d2bd967b6 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -77,7 +77,7 @@ this flag is ignored."
77 (:background "#AAAA33")) 77 (:background "#AAAA33"))
78 (((class color) (background light)) 78 (((class color) (background light))
79 (:background "#FFFFAA"))) 79 (:background "#FFFFAA")))
80 "*Face used at beginning of a highight." 80 "*Face used at beginning of a highlight."
81 :group 'pulse) 81 :group 'pulse)
82 82
83(defface pulse-highlight-face 83(defface pulse-highlight-face
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 176b906632c..86c7e59fd07 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1285,7 +1285,7 @@ expressions; a `progn' form will be returned enclosing these forms."
1285 ;; Wrap a form, usually a defining form, but any evaluated one. 1285 ;; Wrap a form, usually a defining form, but any evaluated one.
1286 ;; If speclist is non-nil, this is being called by edebug-defining-form. 1286 ;; If speclist is non-nil, this is being called by edebug-defining-form.
1287 ;; Otherwise it is being called from edebug-read-and-maybe-wrap-form1. 1287 ;; Otherwise it is being called from edebug-read-and-maybe-wrap-form1.
1288 ;; This is a hack, but I havent figured out a simpler way yet. 1288 ;; This is a hack, but I haven't figured out a simpler way yet.
1289 (let* ((form-data-entry (edebug-get-form-data-entry form-begin form-end)) 1289 (let* ((form-data-entry (edebug-get-form-data-entry form-begin form-end))
1290 ;; Set this marker before parsing. 1290 ;; Set this marker before parsing.
1291 (edebug-form-begin-marker 1291 (edebug-form-begin-marker
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 5d90ac694a4..76cab39f5b2 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -741,7 +741,7 @@ If command is repeated at same position, delete the rectangle."
741 ;; We try to reuse overlays where possible because this is more efficient 741 ;; We try to reuse overlays where possible because this is more efficient
742 ;; and results in less flicker. 742 ;; and results in less flicker.
743 ;; If cua--rectangle-virtual-edges is nil and the buffer contains tabs or short lines, 743 ;; If cua--rectangle-virtual-edges is nil and the buffer contains tabs or short lines,
744 ;; the higlighted region may not be perfectly rectangular. 744 ;; the highlighted region may not be perfectly rectangular.
745 (let ((deactivate-mark deactivate-mark) 745 (let ((deactivate-mark deactivate-mark)
746 (old cua--rectangle-overlays) 746 (old cua--rectangle-overlays)
747 (new nil) 747 (new nil)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 08f5e44e13f..5380595eadb 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -364,7 +364,7 @@ newsgroups, set the variable to nil in `gnus-select-group-hook'."
364This variable can either be the symbols `first' (place point on the 364This variable can either be the symbols `first' (place point on the
365first subject), `unread' (place point on the subject line of the first 365first subject), `unread' (place point on the subject line of the first
366unread article), `best' (place point on the subject line of the 366unread article), `best' (place point on the subject line of the
367higest-scored article), `unseen' (place point on the subject line of 367highest-scored article), `unseen' (place point on the subject line of
368the first unseen article), `unseen-or-unread' (place point on the subject 368the first unseen article), `unseen-or-unread' (place point on the subject
369line of the first unseen article or, if all articles have been seen, on the 369line of the first unseen article or, if all articles have been seen, on the
370subject line of the first unread article), or a function to be called to 370subject line of the first unread article), or a function to be called to
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 95b5fb578f4..6c94dbdd2c4 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -102,7 +102,7 @@ Reports is as ham when HAM is set."
102 (customize-set-variable 102 (customize-set-variable
103 spam-report-resend-to 103 spam-report-resend-to
104 (read-from-minibuffer "email address to resend SPAM/HAM to? "))) 104 (read-from-minibuffer "email address to resend SPAM/HAM to? ")))
105 ;; This is ganked from the `gnus-summary-resend-message' function. 105 ;; This is yanked from the `gnus-summary-resend-message' function.
106 ;; It involves rendering the SPAM, which is undesirable, but there does 106 ;; It involves rendering the SPAM, which is undesirable, but there does
107 ;; not seem to be a nicer way to achieve this. 107 ;; not seem to be a nicer way to achieve this.
108 ;; select this particular article 108 ;; select this particular article
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 41da9d12c99..8a5cca18496 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -313,7 +313,7 @@ should be harmless."
313 (interactive) 313 (interactive)
314 (info-xref-check-list (info-xref-all-info-files))) 314 (info-xref-check-list (info-xref-all-info-files)))
315 315
316;; An alternative for geting only top-level files here would be to simply 316;; An alternative for getting only top-level files here would be to simply
317;; return all files and have info-xref-check-list not follow "Indirect:". 317;; return all files and have info-xref-check-list not follow "Indirect:".
318;; The current way seems better because it (potentially) gets the proper 318;; The current way seems better because it (potentially) gets the proper
319;; top-level filename into the error messages, and suppresses duplicate "not 319;; top-level filename into the error messages, and suppresses duplicate "not
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index bdbf2c07b7a..a29b729dcf0 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2701,7 +2701,7 @@ KEY BINDINGS FOR CONVERSION
2701 2701
2702(put 'quail-decode-map 'char-table-extra-slots 0) 2702(put 'quail-decode-map 'char-table-extra-slots 0)
2703 2703
2704;; Generate a halfly-cooked decode map (char-table) for the current 2704;; Generate a half-cooked decode map (char-table) for the current
2705;; Quail map. An element for a character C is a key string or a list 2705;; Quail map. An element for a character C is a key string or a list
2706;; of a key strings to type to input C. The lenth of key string is at 2706;; of a key strings to type to input C. The lenth of key string is at
2707;; most 2. If it is 2, more keys may be required to input C. 2707;; most 2. If it is 2, more keys may be required to input C.
@@ -2974,7 +2974,7 @@ of each directory."
2974 (if (not (re-search-forward leim-list-entry-regexp nil t)) 2974 (if (not (re-search-forward leim-list-entry-regexp nil t))
2975 nil 2975 nil
2976 2976
2977 ;; Remove garbages after the header. 2977 ;; Remove garbage after the header.
2978 (goto-char (match-beginning 0)) 2978 (goto-char (match-beginning 0))
2979 (if (< pos (point)) 2979 (if (< pos (point))
2980 (delete-region pos (point))) 2980 (delete-region pos (point)))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 38785fc48e8..fa057aee36f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -51,7 +51,7 @@
51;; - choose-completion doesn't know how to quote the text it inserts. 51;; - choose-completion doesn't know how to quote the text it inserts.
52;; E.g. it fails to double the dollars in file-name completion, or 52;; E.g. it fails to double the dollars in file-name completion, or
53;; to backslash-escape spaces and other chars in comint completion. 53;; to backslash-escape spaces and other chars in comint completion.
54;; - when completing ~/tmp/fo$$o, the highligting in *Completions* 54;; - when completing ~/tmp/fo$$o, the highlighting in *Completions*
55;; is off by one position. 55;; is off by one position.
56;; - all code like PCM which relies on all-completions to match 56;; - all code like PCM which relies on all-completions to match
57;; its argument gets confused because all-completions returns unquoted 57;; its argument gets confused because all-completions returns unquoted
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 89948a2c81a..b55884ff180 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -100,7 +100,7 @@
100;; <URL:ftp://ftp.lysator.liu.se/pub/sgml>; hm--html-menus can be used 100;; <URL:ftp://ftp.lysator.liu.se/pub/sgml>; hm--html-menus can be used
101;; with this. 101;; with this.
102 102
103;; This package generalises function html-previewer-process in Marc 103;; This package generalizes function html-previewer-process in Marc
104;; Andreessen's html-mode (LCD modes/html-mode.el.Z). See also the 104;; Andreessen's html-mode (LCD modes/html-mode.el.Z). See also the
105;; ffap.el package. The huge hyperbole package also contains similar 105;; ffap.el package. The huge hyperbole package also contains similar
106;; functions. 106;; functions.
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 0d9516a389e..1fb3114bf3f 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -70,7 +70,7 @@
70;; "taskjuggler_project" (or whatever you customized 70;; "taskjuggler_project" (or whatever you customized
71;; `org-export-taskjuggler-project-tag' to). You are now ready to 71;; `org-export-taskjuggler-project-tag' to). You are now ready to
72;; export the project plan with `org-export-as-taskjuggler-and-open' 72;; export the project plan with `org-export-as-taskjuggler-and-open'
73;; which will export the project plan and open a gant chart in 73;; which will export the project plan and open a Gantt chart in
74;; TaskJugglerUI. 74;; TaskJugglerUI.
75;; 75;;
76;; * Resources 76;; * Resources
@@ -354,8 +354,8 @@ information, all the properties, etc."
354 (let* ((props (org-entry-properties)) 354 (let* ((props (org-entry-properties))
355 (components (org-heading-components)) 355 (components (org-heading-components))
356 (level (nth 1 components)) 356 (level (nth 1 components))
357 (headline 357 (headline
358 (replace-regexp-in-string 358 (replace-regexp-in-string
359 "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines 359 "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines
360 (parent-ordered (org-taskjuggler-parent-is-ordered-p))) 360 (parent-ordered (org-taskjuggler-parent-is-ordered-p)))
361 (push (cons "level" level) props) 361 (push (cons "level" level) props)
@@ -405,10 +405,10 @@ deeper), then it's not a leaf."
405 (successor (car (cdr tasks)))) 405 (successor (car (cdr tasks))))
406 (cond 406 (cond
407 ;; if a task has no successors it is a leaf 407 ;; if a task has no successors it is a leaf
408 ((null successor) 408 ((null successor)
409 (push (cons (cons "leaf-node" t) task) new-list)) 409 (push (cons (cons "leaf-node" t) task) new-list))
410 ;; if the successor has a lower level than task it is a leaf 410 ;; if the successor has a lower level than task it is a leaf
411 ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) 411 ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task)))
412 (push (cons (cons "leaf-node" t) task) new-list)) 412 (push (cons (cons "leaf-node" t) task) new-list))
413 ;; otherwise examine the rest of the tasks 413 ;; otherwise examine the rest of the tasks
414 (t (push task new-list)))) 414 (t (push task new-list))))
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index f2b7294e2d0..62d486ffca5 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -55,7 +55,7 @@
55 55
56;; 0.3 (2007-03-11) 56;; 0.3 (2007-03-11)
57;; - Renamed shift modes and thus names of score files. All 57;; - Renamed shift modes and thus names of score files. All
58;; highscores are lost, unless you rename the score files from 58;; high scores are lost, unless you rename the score files from
59;; bubbles-shift-... to bubbles-...! 59;; bubbles-shift-... to bubbles-...!
60;; - Bugfixes: Check for successful image creation. 60;; - Bugfixes: Check for successful image creation.
61;; Disable menus and counter when game is over. 61;; Disable menus and counter when game is over.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 1925d16ba58..ca596023151 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -927,7 +927,7 @@ syntax-parsing routines, and marks them up so that either
927 927
928 A1) CPerl may work around these deficiencies (for big chunks, mostly 928 A1) CPerl may work around these deficiencies (for big chunks, mostly
929 PODs and HERE-documents), or 929 PODs and HERE-documents), or
930 A2) On capable Emaxen CPerl will use improved syntax-handlings 930 A2) On capable Emaxen CPerl will use improved syntax-handling
931 which reads mark-up hints directly. 931 which reads mark-up hints directly.
932 932
933 The scan in case A2 is much more comprehensive, thus may be slower. 933 The scan in case A2 is much more comprehensive, thus may be slower.
@@ -4540,7 +4540,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
4540 (forward-char 2)) 4540 (forward-char 2))
4541 (and (eq (following-char) ?\] ) 4541 (and (eq (following-char) ?\] )
4542 (forward-char 1))) 4542 (forward-char 1)))
4543 (setq REx-subgr-end qtag) ;EndOf smart-highlighed 4543 (setq REx-subgr-end qtag) ;End smart-highlighted
4544 ;; Apparently, I can't put \] into a charclass 4544 ;; Apparently, I can't put \] into a charclass
4545 ;; in m]]: m][\\\]\]] produces [\\]] 4545 ;; in m]]: m][\\\]\]] produces [\\]]
4546;;; POSIX? [:word:] [:^word:] only inside [] 4546;;; POSIX? [:word:] [:^word:] only inside []
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index f98f3d191d7..d9adff6c8b8 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -6069,7 +6069,7 @@ killed after process termination."
6069 6069
6070 6070
6071(defun ebnf-make-terminal1 (name gen-func dim-func) 6071(defun ebnf-make-terminal1 (name gen-func dim-func)
6072 (vector gen-func ; 0 generatore 6072 (vector gen-func ; 0 generator
6073 'ignore ; 1 width fun 6073 'ignore ; 1 width fun
6074 dim-func ; 2 dimension fun 6074 dim-func ; 2 dimension fun
6075 0.0 ; 3 entry 6075 0.0 ; 3 entry
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index 94d55ee3f61..7810b377e58 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -267,7 +267,7 @@ If nil, use `temporary-file-directory'."
267 . (1 font-lock-function-name-face)) 267 . (1 font-lock-function-name-face))
268 '("/\\w+" . font-lock-variable-name-face) 268 '("/\\w+" . font-lock-variable-name-face)
269 (cons ps-mode-operators 'font-lock-keyword-face))) 269 (cons ps-mode-operators 'font-lock-keyword-face)))
270 "High level highliting for PostScript mode.") 270 "High level highlighting for PostScript mode.")
271 271
272(defconst ps-mode-font-lock-keywords ps-mode-font-lock-keywords-1 272(defconst ps-mode-font-lock-keywords ps-mode-font-lock-keywords-1
273 "Default expressions to highlight in PostScript mode.") 273 "Default expressions to highlight in PostScript mode.")
diff --git a/lisp/shell.el b/lisp/shell.el
index c75594ddbe4..31c5729b83a 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -293,7 +293,7 @@ Value is a list of strings, which may be nil."
293 (getenv "ESHELL") shell-file-name)) 293 (getenv "ESHELL") shell-file-name))
294 (name (file-name-nondirectory prog))) 294 (name (file-name-nondirectory prog)))
295 ;; Tell bash not to use readline, except for bash 1.x which 295 ;; Tell bash not to use readline, except for bash 1.x which
296 ;; doesn't grook --noediting. Bash 1.x has -nolineediting, but 296 ;; doesn't grok --noediting. Bash 1.x has -nolineediting, but
297 ;; process-send-eof cannot terminate bash if we use it. 297 ;; process-send-eof cannot terminate bash if we use it.
298 (if (and (not purify-flag) 298 (if (and (not purify-flag)
299 (equal name "bash") 299 (equal name "bash")
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index db536c100f3..d54debcec4c 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -715,7 +715,7 @@ not the very same deplacement command."
715 (remove-hook 'after-change-functions 'flyspell-after-change-function t) 715 (remove-hook 'after-change-functions 'flyspell-after-change-function t)
716 (remove-hook 'hack-local-variables-hook 716 (remove-hook 'hack-local-variables-hook
717 (function flyspell-hack-local-variables-hook) t) 717 (function flyspell-hack-local-variables-hook) t)
718 ;; we remove all the flyspell hilightings 718 ;; we remove all the flyspell highlightings
719 (flyspell-delete-all-overlays) 719 (flyspell-delete-all-overlays)
720 ;; we have to erase pre cache variables 720 ;; we have to erase pre cache variables
721 (setq flyspell-pre-buffer nil) 721 (setq flyspell-pre-buffer nil)
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 5ed33d5be05..977f4a70b22 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1486,7 +1486,7 @@ remap_menubar (XlwMenuWidget mw)
1486 if (new_selection && !new_selection->enabled) 1486 if (new_selection && !new_selection->enabled)
1487 new_selection = NULL; 1487 new_selection = NULL;
1488 1488
1489 /* Call callback when the hightlighted item changes. */ 1489 /* Call callback when the highlighted item changes. */
1490 if (old_selection || new_selection) 1490 if (old_selection || new_selection)
1491 XtCallCallbackList ((Widget)mw, mw->menu.highlight, 1491 XtCallCallbackList ((Widget)mw, mw->menu.highlight,
1492 (XtPointer) new_selection); 1492 (XtPointer) new_selection);
diff --git a/nt/INSTALL b/nt/INSTALL
index 63285047a67..bb621dceb6b 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -29,7 +29,7 @@
29 29
30 "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Debug 30 "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Debug
31 31
32 if you are goiung to compile a debug version, or 32 if you are going to compile a debug version, or
33 33
34 "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Release 34 "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Release
35 35
@@ -268,7 +268,7 @@
268 "Error in --cflags argument: ... Backslashes and quotes cannot be 268 "Error in --cflags argument: ... Backslashes and quotes cannot be
269 used with --cflags. Please use forward slashes for filenames and 269 used with --cflags. Please use forward slashes for filenames and
270 paths (e.g. when passing directories to -I)." 270 paths (e.g. when passing directories to -I)."
271 271
272 N.B. It is normal to see a few error messages output while configure 272 N.B. It is normal to see a few error messages output while configure
273 is running, when gcc support is being tested. These cannot be 273 is running, when gcc support is being tested. These cannot be
274 suppressed because of limitations in the Windows 9X command.com shell. 274 suppressed because of limitations in the Windows 9X command.com shell.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0b7fd41f5f6..59bcdfa4afd 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -348,7 +348,7 @@ file_for_image (Lisp_Object image)
348 348
349/* For the image defined in IMG, make and return a GtkImage. For displays with 349/* For the image defined in IMG, make and return a GtkImage. For displays with
350 8 planes or less we must make a GdkPixbuf and apply the mask manually. 350 8 planes or less we must make a GdkPixbuf and apply the mask manually.
351 Otherwise the highlightning and dimming the tool bar code in GTK does 351 Otherwise the highlighting and dimming the tool bar code in GTK does
352 will look bad. For display with more than 8 planes we just use the 352 will look bad. For display with more than 8 planes we just use the
353 pixmap and mask directly. For monochrome displays, GTK doesn't seem 353 pixmap and mask directly. For monochrome displays, GTK doesn't seem
354 able to use external pixmaps, it looks bad whatever we do. 354 able to use external pixmaps, it looks bad whatever we do.
diff --git a/src/w32.c b/src/w32.c
index c752333c68d..b2b47dbd179 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3403,7 +3403,7 @@ stat (const char * path, struct stat * buf)
3403 FILE_FLAG_BACKUP_SEMANTICS, NULL)) 3403 FILE_FLAG_BACKUP_SEMANTICS, NULL))
3404 != INVALID_HANDLE_VALUE) 3404 != INVALID_HANDLE_VALUE)
3405 { 3405 {
3406 /* This is more accurate in terms of gettting the correct number 3406 /* This is more accurate in terms of getting the correct number
3407 of links, but is quite slow (it is noticeable when Emacs is 3407 of links, but is quite slow (it is noticeable when Emacs is
3408 making a list of file name completions). */ 3408 making a list of file name completions). */
3409 BY_HANDLE_FILE_INFORMATION info; 3409 BY_HANDLE_FILE_INFORMATION info;