summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/ORG-NEWS6
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/ChangeLog.152
-rw-r--r--lisp/ChangeLog.92
-rw-r--r--lisp/comint.el2
-rw-r--r--lisp/gnus/ChangeLog.12
-rw-r--r--lisp/gnus/gnus-win.el2
-rw-r--r--lisp/image-mode.el2
-rw-r--r--lisp/net/soap-client.el2
-rw-r--r--lisp/net/soap-inspect.el2
-rw-r--r--lisp/org/org-agenda.el2
-rw-r--r--lisp/org/org-remember.el2
-rw-r--r--lisp/org/org.el2
-rw-r--r--lisp/progmodes/verilog-mode.el4
-rw-r--r--lisp/textmodes/rst.el34
15 files changed, 34 insertions, 34 deletions
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index a6b31cf1249..2cfa08f1286 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -20,7 +20,7 @@ Please send Org bug reports to emacs-orgmode@gnu.org.
:PROPERTIES:
:OrgVersion: 7.4
:END:
-
+
The variable =org-agenda-ndays= is obsolete - please use
=org-agenda-span= instead.
@@ -313,7 +313,7 @@ to mean anything.
:OrgVersion: 7.5
:END:
- You can now create links from messages. This is particularily
+ You can now create links from messages. This is particularly
useful when the user wants to stored messages that he sends, for
later check. Thanks to Ulf Stegemann for the patch.
@@ -328,7 +328,7 @@ to mean anything.
: Percent escaping is used in Org mode to escape certain characters
: in links that would either break the parser (e.g. square brackets
-: in link target oder description) or are not allowed to appear in
+: in link target or description) or are not allowed to appear in
: a particular link type (e.g. non-ascii characters in a http:
: link).
:
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68e8b764ec4..17664888135 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -906,7 +906,7 @@
2012-05-03 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-show-mime): Catch an error caused by text
- decoding, and show a warning message without signalling an error
+ decoding, and show a warning message without signaling an error
(Bug#11282).
2012-05-03 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index e3890b80ec4..65a7baf44c4 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -9023,7 +9023,7 @@
* bookmark.el (bookmark-show-annotation): Use `when' instead of `if'.
This is also from Thierry Volpiatto's patch in bug #6444. However,
because it was extraneous to the functional change in that patch,
- and causes a re-indendation, I am committing it separately.
+ and causes a re-indentation, I am committing it separately.
2010-07-13 Thierry Volpiatto <thierry.volpiatto@gmail.com>
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index b9b6cd5a03d..5c01f872994 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -17245,7 +17245,7 @@
(antlr-downcase-literals): New command.
(antlr-upcase-literals): Ditto.
- * antlr-mode.el: Minor changes: indendation, mode-name.
+ * antlr-mode.el: Minor changes: indentation, mode-name.
(antlr-indent-line): Indent cpp directive at column 0.
(antlr-mode): Use mode-name prefix "Antlr." instead of "Antlr/".
diff --git a/lisp/comint.el b/lisp/comint.el
index db0f5b8b460..d3274eb1164 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2969,7 +2969,7 @@ This is a good thing to set in mode hooks.")
Word constituents are considered to be those in WORD-CHARS, which is like the
inside of a \"[...]\" (see `skip-chars-forward'), plus all non-ASCII characters."
;; FIXME: Need to handle "..." and '...' quoting in shell.el!
- ;; This should be combined with pomplete-parsing somehow.
+ ;; This should be combined with completion parsing somehow.
(save-excursion
(let ((here (point))
giveup)
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index f3ba7bca4d4..f223bd77085 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -2966,7 +2966,7 @@
1997-11-25 Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
- * gnus-move.el (gnus-move-group-to-server): Protect agains
+ * gnus-move.el (gnus-move-group-to-server): Protect against
nil-ness.
1997-11-25 Lars Magne Ingebrigtsen <larsi@menja.ifi.uio.no>
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 34c6c0ca126..efe2a319854 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -275,7 +275,7 @@ See the Gnus manual for an explanation of the syntax used.")
(set-buffer buf))
((eq t (window-dedicated-p))
;; If the window is hard-dedicated, we have a problem because
- ;; we just can't do what we're asked. But signalling an error,
+ ;; we just can't do what we're asked. But signaling an error,
;; like `switch-to-buffer' would do, is not an option because
;; it would prevent things like "^" (to jump to the *Servers*)
;; in a dedicated *Group*.
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 8329c02fb0d..46ce6aa14d3 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -663,7 +663,7 @@ The rotation angle is the value of `image-transform-rotation' in degrees."
;; The following comment and code snippet are from
;; ImageMagick-6.7.4-4/magick/distort.c
-;; /* Set the output image geometry to calculated 'bestfit'.
+;; /* Set the output image geometry to calculated 'best fit'.
;; Yes this tends to 'over do' the file image size, ON PURPOSE!
;; Do not do this for DePolar which needs to be exact for virtual tiling.
;; */
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index 39369111935..93ba0a7e167 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -1569,7 +1569,7 @@ instead."
(defun soap-encode-simple-type (xml-tag value type)
"Encode inside XML-TAG the LISP VALUE according to TYPE."
- ;; Validate VALUE agains the simple type's enumeration, than just encode it
+ ;; Validate VALUE against the simple type's enumeration, than just encode it
;; using `soap-encode-basic-type'
(let ((enumeration (soap-simple-type-enumeration type)))
diff --git a/lisp/net/soap-inspect.el b/lisp/net/soap-inspect.el
index 23937e21770..877ac71f4c1 100644
--- a/lisp/net/soap-inspect.el
+++ b/lisp/net/soap-inspect.el
@@ -67,7 +67,7 @@ use `soap-sample-value' instead."
(t (format "%s" (soap-basic-type-kind type)))))
(defun soap-sample-value-for-simple-type (type)
- "Provive a sample value for TYPE which is a simple type.
+ "Provide a sample value for TYPE which is a simple type.
This is a specific function which should not be called directly,
use `soap-sample-value' instead."
(let ((enumeration (soap-simple-type-enumeration type)))
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 367d8e84471..2b4a001979b 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -799,7 +799,7 @@ because you will take care of it on the day when scheduled."
:group 'org-agenda-daily/weekly
:version "24.1"
:type '(choice
- (const :tag "Alwas show prewarning" nil)
+ (const :tag "Always show prewarning" nil)
(const :tag "Remove prewarning if entry is scheduled" t)
(integer :tag "Restart prewarning N days before deadline")))
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 65e92bab016..d1d863c2845 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -64,7 +64,7 @@ and `org-remember-default-headline'. To force prompting anyway, use
\\[universal-argument] \\[org-remember-finalize] to file the note.
When this variable is nil, \\[org-remember-finalize] gives you the prompts, and
-\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack."
+\\[universal-argument] \\[org-remember-finalize] triggers the fast track."
:group 'org-remember
:type 'boolean)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 972f7801afc..f431c19bf51 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -3031,7 +3031,7 @@ is better to limit inheritance to certain tags using the variables
(const :tag "List them, indented with leading dots" indented)))
(defcustom org-tags-sort-function nil
- "When set, tags are sorted using this function as a comparator."
+ "When set, tags are sorted using this comparison function."
:group 'org-tags
:type '(choice
(const :tag "No sorting" nil)
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 0cd8d01aff1..c072754e66d 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -12105,7 +12105,7 @@ Typing \\[verilog-auto] will make this into:
"Expand AUTOUNDEF statements, as part of \\[verilog-auto].
Take any `defines since the last AUTOUNDEF in the current file
and create `undefs for them. This is used to insure that
-file-local defines do not polute the global `define name space.
+file-local defines do not pollute the global `define name space.
Limitations:
AUTOUNDEF presumes any identifier following `define is the
@@ -12145,7 +12145,7 @@ defines the regular expression will be undefed."
(end-pt (point))
defs def)
(save-excursion
- ;; Scan from beginnng of file, or last AUTOUNDEF
+ ;; Scan from start of file, or last AUTOUNDEF
(or (verilog-re-search-backward-quick "/\\*AUTOUNDEF\\>" end-pt t)
(goto-char (point-min)))
(while (verilog-re-search-forward-quick
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 262a49e2668..c7da1fb5f80 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -446,7 +446,7 @@ For the keyword `:alt' the results form an alternative (\"\\|\")
which is shy-grouped (\"\\(?:...\\)\").
For the keyword `:grp' the results are concatenated and form a
-referencable grouped (\"\\(...\\)\").
+referenceable grouped (\"\\(...\\)\").
After interpretation of ARGS the results are concatenated as for
`:seq'.
@@ -1066,11 +1066,11 @@ Return nil if no syntactically valid adornment is found."
(beg-pnt (progn
(forward-line 0)
(point)))
- (nxt-emp ; Next line inexistant or empty
+ (nxt-emp ; Next line nonexistent or empty
(save-excursion
(or (not (zerop (forward-line 1)))
(looking-at (rst-re 'lin-end)))))
- (prv-emp ; Previous line inexistant or empty
+ (prv-emp ; Previous line nonexistent or empty
(save-excursion
(or (not (zerop (forward-line -1)))
(looking-at (rst-re 'lin-end)))))
@@ -1917,7 +1917,7 @@ Other situations are just ignored and left to users themselves."
"Insert a new list item.
User is asked to select the item style first, for example (a), i), +. Use TAB
-for completition and choices.
+for completion and choices.
If user selects bullets or #, it's just added with position arranged by
`rst-insert-list-pos'.
@@ -2020,7 +2020,7 @@ line, it will insert a list with the same list style.
1. When inserting a new list:
User is asked to select the item style first, for example (a), i), +. Use TAB
-for completition and choices.
+for completion and choices.
(a) If user selects bullets or #, it's just added.
(b) If user selects enumerations, a further prompt is given. User needs to
@@ -2754,11 +2754,11 @@ first of a paragraph."
;; supported; comment lines with leading comment markup should be also
;; supported; may be a customizable option could control which style to prefer
-(defgroup rst-indent nil "Settings for indendation in reStructuredText.
+(defgroup rst-indent nil "Settings for indentation in reStructuredText.
-In reStructuredText indendation points are usually determined by
+In reStructuredText indentation points are usually determined by
preceding lines. Sometimes the syntax allows arbitrary
-indendation points such as where to start the first line
+indentation points such as where to start the first line
following a directive. These indentation widths can be customized
here."
:group 'rst
@@ -2772,25 +2772,25 @@ here."
:type '(integer))
(defcustom rst-indent-field 3
- "Default indendation for first line after a field or 0 to always indent for
+ "Default indentation for first line after a field or 0 to always indent for
content."
:group 'rst-indent
:type '(integer))
(defcustom rst-indent-literal-normal 3
- "Default indendation for literal block after a markup on an own
+ "Default indentation for literal block after a markup on an own
line."
:group 'rst-indent
:type '(integer))
(defcustom rst-indent-literal-minimized 2
- "Default indendation for literal block after a minimized
+ "Default indentation for literal block after a minimized
markup."
:group 'rst-indent
:type '(integer))
(defcustom rst-indent-comment 3
- "Default indendation for first line of a comment."
+ "Default indentation for first line of a comment."
:group 'rst-indent
:type '(integer))
@@ -2810,7 +2810,7 @@ and not from inner alignment points."
(save-match-data
(unless (looking-at (rst-re 'lin-end))
(back-to-indentation)
- ;; Current indendation is always the least likely tab
+ ;; Current indentation is always the least likely tab
(let ((tabs (list (list (point) 0 nil)))) ; (POINT OFFSET INNER)
;; Push inner tabs more likely to continue writing
(cond
@@ -2863,7 +2863,7 @@ and not from inner alignment points."
Search backwards from point PT to build the list of possible
tabs. Return a list of tabs sorted by likeliness to continue
writing like `rst-line-tabs'. Nearer lines have generally a
-higher likeliness than farer lines. Return nil if no tab is found
+higher likeliness than farther lines. Return nil if no tab is found
in the text above."
(save-excursion
(goto-char pt)
@@ -3452,7 +3452,7 @@ details check the Rst Faces Defaults group."
1 rst-definition-face)
;; `Hyperlink References`_
;; FIXME: `Embedded URIs`_ not considered
- ;; FIXME: Directly adjacing marked up words are not fontified correctly
+ ;; FIXME: Directly adjacent marked up words are not fontified correctly
;; unless they are not separated by two spaces: foo_ bar_
(,(rst-re 'ilm-pfx '(:grp (:alt (:seq "`" ilcbkq-tag "`")
(:seq "\\sw" (:alt "\\sw" "-") "+\\sw"))
@@ -3610,7 +3610,7 @@ Return extended point or nil if not moved."
;;
;; * literal blocks following "::"
;;
- ;; which are both indented. Thus indendation is the first thing recognized
+ ;; which are both indented. Thus indentation is the first thing recognized
;; here. The second criteria is an explicit markup tag which may be a comment
;; or a double colon at the end of a line.
;;
@@ -3697,7 +3697,7 @@ Also used as a trigger for
`rst-font-lock-find-unindented-line-match'.")
(defun rst-font-lock-find-unindented-line-limit (ind-pnt)
- "Find the next unindented line relative to indenation at IND-PNT.
+ "Find the next unindented line relative to indentation at IND-PNT.
Return this point, the end of the buffer or nil if nothing found.
If IND-PNT is `next' take the indentation from the next line if
this is not empty and indented more than the current one. If
View Lorry Controller Status