summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/cedet/semantic/format.el2
-rw-r--r--lisp/cedet/semantic/html.el2
-rw-r--r--lisp/cedet/semantic/texi.el2
-rw-r--r--lisp/cedet/srecode/mode.el2
-rw-r--r--lisp/emacs-lisp/eieio-opt.el2
-rw-r--r--lisp/emacs-lisp/eieio.el2
-rw-r--r--lisp/emulation/viper-cmd.el2
-rw-r--r--lisp/erc/erc-backend.el3
-rw-r--r--lisp/eshell/esh-var.el2
-rw-r--r--lisp/gnus/gnus-sum.el2
-rw-r--r--lisp/htmlfontify.el4
-rw-r--r--lisp/international/quail.el12
-rw-r--r--lisp/international/robin.el2
-rw-r--r--lisp/mh-e/mh-e.el2
-rw-r--r--lisp/net/dbus.el2
-rw-r--r--lisp/net/soap-client.el2
-rw-r--r--lisp/net/webjump.el2
-rw-r--r--lisp/progmodes/cc-fonts.el2
-rw-r--r--lisp/progmodes/ebnf2ps.el2
-rw-r--r--lisp/progmodes/modula2.el2
-rw-r--r--lisp/progmodes/ps-mode.el2
-rw-r--r--lisp/term.el2
-rw-r--r--lisp/textmodes/conf-mode.el2
-rw-r--r--lisp/textmodes/ispell.el2
-rw-r--r--lisp/textmodes/sgml-mode.el2
25 files changed, 31 insertions, 32 deletions
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index fa6e7517624..381801559da 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -291,7 +291,7 @@ local definitions."
;; Try and find a trail of parents from PARENT
(let ((rlist (list parent))
)
- ;; IMPLELEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ ;; IMPLEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
(reverse rlist)))
(define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color)
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 972ce5e26bc..137759d46ac 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -61,7 +61,7 @@
(define-mode-local-override semantic-parse-region
html-mode (&rest ignore)
"Parse the current html buffer for semantic tags.
-INGNORE any arguments. Always parse the whole buffer.
+IGNORE any arguments. Always parse the whole buffer.
Each tag returned is of the form:
(\"NAME\" section (:members CHILDREN))
or
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 393d64e6420..30c5a5cf8b6 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -421,7 +421,7 @@ Optional argument POINT is where to look for the environment."
texinfo-mode (context)
"List smart completions at point.
Since texinfo is not a programming language the default version is not
-useful. Insted, look at the current symbol. If it is a command
+useful. Instead, look at the current symbol. If it is a command
do primitive texinfo built ins. If not, use ispell to lookup words
that start with that symbol."
(let ((prefix (car (oref context :prefix)))
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 6ca0cefe9a7..bb2db79acc6 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -366,7 +366,7 @@ programming modes."
(define-key srecode-prefix-map oldkey nil)
)))
- ;; Update Keybings
+ ;; Update Keybindings
(let ((oldbinding (lookup-key srecode-prefix-map binding)))
;; During development, allow overrides.
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 1b101cef875..8869530dc23 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -92,7 +92,7 @@ Optional HEADERFCN should be called to insert a few bits of info first."
(princ "Class ")
(prin1 class)
(terpri)
- ;; Inheritence tree information
+ ;; Inheritance tree information
(let ((pl (class-parents class)))
(when pl
(princ " Inherits from ")
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index f1fe9594fc0..352bd245ba4 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -1,5 +1,5 @@
;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects
-;;; or maybe Eric's Implementation of Emacs Intrepreted Objects
+;;; or maybe Eric's Implementation of Emacs Interpreted Objects
;; Copyright (C) 1995-1996, 1998-2011 Free Software Foundation, Inc.
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 359b3ff751d..df37157f7a9 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1599,7 +1599,7 @@ as a Meta key and any number of multiple escapes are allowed."
;; call viper-execute-com to execute viper-exec-change, which eventually will
;; call viper-change to invoke the replace mode on the region.
;;
-;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS)
+;; The var viper-d-com is set to (M-COM VAL COM REG INSERTED-TEXT COMMAND-KEYS)
;; via a call to viper-set-destructive-command, for later use by viper-repeat.
(defun viper-execute-com (m-com val com)
(let ((reg viper-use-register))
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index d363ea92bdb..f86c9ef845a 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -79,7 +79,7 @@
;;; TODO:
-;; o Generalise the display-line code so that we can use it to
+;; o Generalize the display-line code so that we can use it to
;; display the stuff we send, as well as the stuff we receive.
;; Then, move all display-related code into another backend-like
;; file, erc-display.el, say.
@@ -2000,4 +2000,3 @@ See `erc-display-error-notice'." nil
;; Local Variables:
;; indent-tabs-mode: nil
;; End:
-
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 69004a841f1..03774396485 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -344,7 +344,7 @@ This function is explicit for adding to `eshell-parse-argument-hook'."
(pcomplete-here))))
(defun eshell/env (&rest args)
- "Implemention of `env' in Lisp."
+ "Implementation of `env' in Lisp."
(eshell-init-print-buffer)
(eshell-eval-using-options
"env" args
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b84c493cc58..6ffc5d9e821 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -4727,7 +4727,7 @@ If LINE, insert the rebuilt thread starting on line LINE."
(car headers))))
(defun gnus-parent-headers (in-headers &optional generation)
- "Return the headers of the GENERATIONeth parent of HEADERS."
+ "Return the headers of the GENERATIONth parent of HEADERS."
(unless generation
(setq generation 1))
(let ((parent t)
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index c8e95581510..ffef8cdf7b7 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -432,8 +432,8 @@ and so on."
(const :tag "Lucid Toolkit" lucid )
(const :tag "Motif Toolkit" motif )))
- (class (choice (const :tag "Colour" color )
- (const :tag "Greyscale" grayscale)))
+ (class (choice (const :tag "Color" color )
+ (const :tag "Grayscale" grayscale)))
(background (choice (const :tag "Dark" dark )
(const :tag "Bright" light ))) ))
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index f47d73a9508..3f83841f60d 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -43,7 +43,7 @@
;; CONVERSION-KEYS argument of the Quail package.
;; [There was an input method for Mule 2.3 called `Tamago' from the
-;; Japanese `TAkusan MAtasete GOmenasai', or `Sorry for having you
+;; Japanese `TAkusan MAtasete GOmen-nasai', or `Sorry for having you
;; wait so long'; this couldn't be included in Emacs 20. `Tamago' is
;; Japanese for `egg' (implicitly a hen's egg). Handa-san made a
;; smaller and simpler system; the smaller quail egg is also eaten in
@@ -1377,7 +1377,7 @@ Return the input string."
(set-buffer-modified-p modified-p)
(quail-show-guidance)
(let* ((prompt (if input-method-use-echo-area
- (format "%s%s %s"
+ (format "%s%s %s"
(or input-method-previous-message "")
quail-current-str
quail-guidance-str)))
@@ -1443,7 +1443,7 @@ Return the input string."
(quail-setup-overlays nil)))
(quail-show-guidance)
(let* ((prompt (if input-method-use-echo-area
- (format "%s%s%s %s"
+ (format "%s%s%s %s"
(or input-method-previous-message "")
quail-conversion-str
quail-current-str
@@ -2125,7 +2125,7 @@ minibuffer and the selected frame has no other windows)."
(- quail-guidance-translations-starting-column
7 (string-width str))
32))))
- (setq str (format "%s(%02d/%s)"
+ (setq str (format "%s(%02d/%s)"
str (nth 3 indices)
(if (nth 4 indices)
(format "%02d" (nth 4 indices))
@@ -2135,7 +2135,7 @@ minibuffer and the selected frame has no other windows)."
(trans (aref (cdr quail-current-translations) idx)))
(or (stringp trans)
(setq trans (string trans)))
- (setq str (format "%s %d.%s"
+ (setq str (format "%s %d.%s"
str
(if (= (- idx start) 9) 0
(1+ (- idx start)))
@@ -2787,7 +2787,7 @@ If CHAR is an ASCII character and can be input by typing itself, return t."
(cdr decode-map)))
(let ((key-head (aref decode-map char)))
(if (stringp key-head)
- (setq key-list (quail-find-key1
+ (setq key-list (quail-find-key1
(quail-lookup-key key-head nil t)
key-head char nil))
(mapc #'(lambda (elt)
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index 6f78aaede3f..443a292f4c1 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -229,7 +229,7 @@
;; As stated in Murphy's law, it took longer than expected to develop the
;; very first version of Japanese input subsystem in NEmacs (Nihongo
;; Emacs). So the subsystem was named "TAMAGO", which is an acronym of
-;; "TAkusan Matasete GOmennasai" (Sorry to have kept you waiting so
+;; "TAkusan Matasete GOmen-nasai" (Sorry to have kept you waiting so
;; long). "Tamago" as a Japanese word means "egg", so the word "egg" was
;; also used for related filenames and function names.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index e0e213b92b9..458993ca8f1 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2447,7 +2447,7 @@ of citations entirely, choose \"None\"."
"Followup-To:" ; RFC 1036
"For-Approval:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"For-Comment:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
- "For-Handdling:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+ "For-Handling:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Forwarded:" ; MH
"From " ; sendmail
"Generate-Delivery-Report:" ; RFC 2156
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index ba7d7115ffc..e5eb2015418 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -145,7 +145,7 @@ association to the service from D-Bus."
(service (car value))
(entry (gethash key dbus-registered-objects-table))
ret)
- ;; key has the structure (BUS INTERRFACE MEMBER).
+ ;; key has the structure (BUS INTERFACE MEMBER).
;; value has the structure (SERVICE PATH [HANDLER]).
;; entry has the structure ((UNAME SERVICE PATH MEMBER [RULE]) ...).
;; MEMBER is either a string (the handler), or a cons cell (a
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index 42c698876cd..d6949e4d250 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -32,7 +32,7 @@
;; `soap-invoke' method passing it the WSDL, the service name, the operation
;; you wish to invoke and any required parameters.
;;
-;; Idealy, the service you want to access will have some documentation about
+;; Ideally, the service you want to access will have some documentation about
;; the operations it supports. If it does not, you can try using
;; `soap-inspect' to browse the WSDL document and see the available operations
;; and their parameters.
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 3a2560b3c61..6ef24e9f354 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -235,7 +235,7 @@
"www.faqs.org/faqs/")
("RTFM Usenet FAQs by Group" .
"ftp://rtfm.mit.edu/pub/usenet-by-group/")
- ("RTFM Usenet FAQs by Hierachy" .
+ ("RTFM Usenet FAQs by Hierarchy" .
"ftp://rtfm.mit.edu/pub/usenet-by-hierarchy/")
("X Consortium Archive" . "ftp.x.org")
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 9a83d5196db..2028a7c4675 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -317,7 +317,7 @@
(match-beginning ,(car highlight))
(match-end ,(car highlight))
,(elt highlight 1))))
- ;; highlight is an "ANCHORED HIGHLIGHER" of the form
+ ;; highlight is an "ANCHORED HIGHLIGHTER" of the form
;; (ANCHORED-MATCHER PRE-FORM POST-FORM SUBEXP-HIGHLIGHTERS...)
(when (nth 3 highlight)
(error "Match highlights currently not supported in %s"
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index f7965d2cd01..c027b2b7454 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -4007,7 +4007,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
/#ebnf2ps#dict 230 dict def
#ebnf2ps#dict begin
-% Initiliaze variables to avoid name-conflicting with document variables.
+% Initialize variables to avoid name-conflicting with document variables.
% This is the case when using `bind' operator.
/-fillp- 0 def /h 0 def
/-ox- 0 def /half 0 def
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index f0b8f7cbca7..0c43a3ed354 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -466,7 +466,7 @@ followed by the first character of the construct.
'(m2-var) \n _ \n \n
'(m2-begin)
'(m2-begin-comment)
- " Module " str " Initialisation Code "
+ " Module " str " Initialization Code "
'(m2-end-comment)
\n \n "END " str "." > \n)
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index d60e7513651..94d55ee3f61 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -624,7 +624,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
(defun ps-mode-target-column ()
"To what column should text on current line be indented?
-Identation is increased if the last token on the current line
+Indentation is increased if the last token on the current line
defines the beginning of a group. These tokens are: { [ <<"
(save-excursion
(beginning-of-line)
diff --git a/lisp/term.el b/lisp/term.el
index 361ff685396..87e5a734701 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -4249,7 +4249,7 @@ special identifiers such as COM1."
"History of serial ports used by `serial-read-name'.")
(defvar serial-speed-history
- ;; Initialised with reasonable values for newbies.
+ ;; Initialized with reasonable values for newbies.
(list "9600" ;; Given twice because 9600 b/s is the most common speed
"1200" "2400" "4800" "9600" "14400" "19200"
"28800" "38400" "57600" "115200")
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 4e6c8bd6b05..5cc5ba45e13 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -417,7 +417,7 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode',
(run-mode-hooks 'conf-mode-hook)))
(defun conf-mode-initialize (comment &optional font-lock)
- "Intitializations for sub-modes of conf-mode.
+ "Initializations for sub-modes of conf-mode.
COMMENT initializes `comment-start' and `comment-start-skip'.
The optional arg FONT-LOCK is the value for FONT-LOCK-KEYWORDS."
(set (make-local-variable 'comment-start) comment)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 62f899d1730..d22346b518b 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2783,7 +2783,7 @@ By just answering RET you can find out what the current dictionary is."
(mapcar 'list (ispell-valid-dictionary-list)))
nil t)
current-prefix-arg))
- (ispell-set-spellchecker-params) ; Initilize variables and dicts alists
+ (ispell-set-spellchecker-params) ; Initialize variables and dicts alists
(unless arg (ispell-buffer-local-dict 'no-reload))
(if (equal dict "default") (setq dict nil))
;; This relies on completing-read's bug of returning "" for no match
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 5b23a24259a..871701b7303 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1897,7 +1897,7 @@ This takes effect when first loading the library.")
("input" . "Form input field")
("ins" . "Inserted text")
("isindex" . "Input field for index search")
- ("kbd" . "Keybard example face")
+ ("kbd" . "Keyboard example face")
("lang" . "Natural language")
("li" . "List item")
("link" . "Link relationship")