branch: externals/psgml
commit fd1c0bf187b9d9e25f40cb6ffd4bef62a817ff23
Author: Stefan Kangas <stefankan...@gmail.com>
Commit: Stefan Kangas <stefankan...@gmail.com>
; Fix typos
---
ChangeLog.old | 6 +++---
TODO | 4 ++--
about_psgml.html | 2 +-
bugs/bug515351 | 2 +-
psgml-dtd.el | 4 ++--
psgml-edit.el | 12 ++++++------
psgml-maint.el | 2 +-
psgml-parse.el | 18 +++++++++---------
psgml-vars.el | 6 +++---
psgml.el | 4 ++--
psgml.texi | 2 +-
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/ChangeLog.old b/ChangeLog.old
index 65ffa97f6e..227b7f4d15 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -689,7 +689,7 @@ Thu Nov 4 19:07:09 1999 Lennart Staflin
<le...@lysator.liu.se>
* psgml-parse.el (sgml-current-file): New variable, holds the name
of file name (if any) of the entity beeing parsed in the buffer.
(sgml-parse-warning): New func. Log a parser warning, a warning
- including information about where the error occured. Mostly for
+ including information about where the error occurred. Mostly for
DTD parsing.
(sgml-log-entity-stack): new factored function.
(*) Replaces some sgml-parse-error and sgml-log-warning with
@@ -871,7 +871,7 @@ Mon Jun 22 19:58:43 1998 Lennart Staflin
<le...@lysator.liu.se>
* psgml-edit.el (sgml-indent-line): Previous change of
sgml-indent-line did not work well with OMITTAG. Restore old
- functionallity.
+ functionality.
Fri Jun 19 18:54:27 1998 Lennart Staflin <le...@lysator.liu.se>
@@ -968,7 +968,7 @@ Thu Mar 12 00:04:52 1998 Lennart Staflin
<le...@lysator.liu.se>
Wed Mar 11 22:11:01 1998 Lennart Staflin <le...@lysator.liu.se>
* psgml-edit.el (sgml-insert-start-tag): extended meaning of NET
- paramenter to insert XML-TAGCE if XML.
+ parameter to insert XML-TAGCE if XML.
(sgml-change-start-tag): keep XML-TAGCE
* psgml-parse.el (sgml-read-element-name): use completing read on
diff --git a/TODO b/TODO
index b3028de6fa..7abc72972e 100644
--- a/TODO
+++ b/TODO
@@ -87,7 +87,7 @@ sgml-auto-activate-dtd
** Fix documentation of sgml-display-char-list-filename
-File format is not properly descibed.
+File format is not properly described.
** Konstigt beteende när DOCTYPE specar en odefinierad elementtyp,
speciellt om det är nästan samma som topelementet i instansen men
@@ -139,7 +139,7 @@ sgml-omittag-transparent and sgml-insert-tag.
** Parsing start-tag
-Parse the different consituents of the start tag without reference to
+Parse the different constituents of the start tag without reference to
the DTD. If the tag is well-formed then check it against the DTD. If
this is XML w/o a DTD, adjust the constructed DTD to allow the element
and attributes.
diff --git a/about_psgml.html b/about_psgml.html
index 2dda127d6f..755a0a262d 100644
--- a/about_psgml.html
+++ b/about_psgml.html
@@ -156,7 +156,7 @@ HR.divider { width: 50%; align: center; }
info.</p></dd>
<dt>1999-10-20</dt>
- <dd><p>Version 1.2.1 of PSGML with som bugfixes from <a
+ <dd><p>Version 1.2.1 of PSGML with some bugfixes from <a
href="&psgml.dir">lystor ftp</a> or <a
href="&base.url;/&psgml1.2.1;">http</a></p>
</dd>
diff --git a/bugs/bug515351 b/bugs/bug515351
index 80434ce014..ea7bcfbed6 100644
--- a/bugs/bug515351
+++ b/bugs/bug515351
@@ -27,7 +27,7 @@ folds to
Using psgml-1.2.4 on windows 2000
and Emacs 20.3.1 (i386-*-windows955.0)
-folding elements with separate endtags works corectly.
+folding elements with separate endtags works correctly.
-->
diff --git a/psgml-dtd.el b/psgml-dtd.el
index 8d76565c23..1aec853364 100644
--- a/psgml-dtd.el
+++ b/psgml-dtd.el
@@ -269,7 +269,7 @@ Syntax: var dfa-expr &body forms"
(defun sgml-parse-character-reference (&optional dofunchar)
;; *** Actually only numerical character references
- ;; I don't know how to handel the function character references.
+ ;; I don't know how to handle the function character references.
;; For the shortrefs let's give them numeric values.
(if (if dofunchar
(sgml-parse-delim "CRO" (digit nmstart))
@@ -531,7 +531,7 @@ Case transformed for general names."
(sgml-error "XML forbids RCDATA declared content")))
((eq dc 'EMPTY))
(t
- (sgml-error "Exptected content model group or one of %s"
+ (sgml-error "Expected content model group or one of %s"
(if sgml-xml-p
"ANY or EMPTY"
"ANY, CDATA, RCDATA or EMPTY"))))
diff --git a/psgml-edit.el b/psgml-edit.el
index cbb2cc059a..19b0aca85f 100644
--- a/psgml-edit.el
+++ b/psgml-edit.el
@@ -398,7 +398,7 @@ Deprecated: ELEMENT"
(setq element-level (sgml-element-parent element-level)))))
(when (eq element-level sgml-top-tree) ; not in a element at all
(setq element-level nil) ; forget element
- (goto-char here)) ; insert normal tab insted)
+ (goto-char here)) ; insert normal tab instead)
(when element-level
(cond ((and (> (point) (sgml-element-start element-insert))
(< (point) (sgml-element-stag-end element-insert))
@@ -1220,10 +1220,10 @@ buffers local variables list."
;;;; New Right Button Menu
(defun sgml-right-menu (event)
- "Pop up a menu with valid tags and insert the choosen tag.
+ "Pop up a menu with valid tags and insert the chosen tag.
If the variable sgml-balanced-tag-edit is t, also inserts the
corresponding end tag. If sgml-leave-point-after-insert is t, the point
-is left after the inserted tag(s), unless the element has som required
+is left after the inserted tag(s), unless the element has some required
content. If sgml-leave-point-after-insert is nil the point is left
after the first tag inserted."
(interactive "*e")
@@ -1453,7 +1453,7 @@ Editing is done in a separate window."
(let* ((aname (sgml-attdecl-name attr))
(def-value (sgml-attdecl-default-value attr))
(cur-value (sgml-lookup-attspec aname asl)))
- (sgml-insert ; atribute name
+ (sgml-insert ; attribute name
'(read-only t category sgml-form) " %s =" aname)
(cond ; attribute value
((sgml-default-value-type-p 'FIXED def-value)
@@ -1805,7 +1805,7 @@ references will be expanded."
(goto-char (sgml-element-end element))
;; FIXME: actually the sgml-note-change-at called by the
;; before-change-functions need to be delayed to after the normalize
- ;; to avoid destroying the tree wile traversing it.
+ ;; to avoid destroying the tree while traversing it.
(let ((before-change-functions nil))
(sgml-normalize-content element only-one)))
(sgml-note-change-at (sgml-element-start element))
@@ -2036,7 +2036,7 @@ If it is something else complete with
ispell-complete-word."
(setq pattern (buffer-substring (point) here))
(setq c (char-after (1- (point))))
(cond
- ;; entitiy
+ ;; entity
((eq c ?&)
(sgml-need-dtd)
(setq insert-case 'sgml-entity-insert-case)
diff --git a/psgml-maint.el b/psgml-maint.el
index c0073f0577..9632075cb3 100644
--- a/psgml-maint.el
+++ b/psgml-maint.el
@@ -23,7 +23,7 @@
;;; Commentary:
-;; This file contanins commands used during installation and
+;; This file contains commands used during installation and
;; compilation of psgml.
;; psgml-compile-files Compiles the source files. The version of
diff --git a/psgml-parse.el b/psgml-parse.el
index 0522c4f18f..f6981fa762 100644
--- a/psgml-parse.el
+++ b/psgml-parse.el
@@ -368,11 +368,11 @@ Applicable to XML.")
;; DFAs are always represented by the start state, which is a
;; normal state. Normal states contain moves of two types:
;; 1. moves for required tokens, 2. moves for optional tokens.
-;; By design these are keept in two different sets.
-;; [Alt: they could perhaps have been keept in one set but
+;; By design these are kept in two different sets.
+;; [Alt: they could perhaps have been kept in one set but
;; marked in different ways.]
-;; The and-model groups creates too big state machines, therefor
+;; The and-model groups creates too big state machines, therefore
;; there is a datastruture called and-node.
;; An and-node is a specification for a dfa that has not been computed.
@@ -405,7 +405,7 @@ Applicable to XML.")
;; next is the next state
;; The and-state is only used during the parsing.
-;; Primitiv functions to get data from parse state need
+;; Primitive functions to get data from parse state need
;; to know both normal-state and and-state.
@@ -690,7 +690,7 @@ element the value."
;;; declared-value representation
;; token-group = (name-token (symbol+))
;; notation = (notation (symbol+))
-;; simple = symbol lisp symbol correspoinding to SGML type
+;; simple = symbol lisp symbol corresponding to SGML type
(defun sgml-make-declared-value (type &optional names)
"Make a declared-value of TYPE.
@@ -754,7 +754,7 @@ Special case, if ATTVAL is nil this is an implied
attribute."
If ATTSPEC is nil, nil is returned."
(cdr attspec))
-;;; asl representaion = (attspec*)
+;;; asl representation = (attspec*)
(defun sgml-lookup-attspec (name asl)
(assoc name asl))
@@ -2972,7 +2972,7 @@ WHERE is `after'."
(sgml-final state)))
;(defun sgml-current-element-contains-data ()
-; "Retrun true if the current open element is either mixed or is (r)cdata."
+; "Return true if the current open element is either mixed or is (r)cdata."
; (or (eq sgml-cdata sgml-current-state)
; (eq sgml-rcdata sgml-current-state)
; (sgml-current-mixed-p)))
@@ -3146,7 +3146,7 @@ entity hierarchy as possible."
(> at (sgml-element-start u)))
;; restart from to with new position
;; this can't loop forever as
- ;; position allways gets smaller
+ ;; position always gets smaller
(setq at (sgml-element-start u)
u sgml-top-tree))
(t
@@ -3847,7 +3847,7 @@ VALUE is a string. Returns nil or an attdecl."
;; parse. The parser also has a position in the current content model.
;; (Called a state.) The parser is used for several things:
;; 1) To find the state the parser would be in at a point in the buffer.
-;; (Point in emacs sense, I.e. between chararacters).
+;; (Point in emacs sense, I.e. between characters).
;; 2) Identify the element containing a character.
;; 3) Find end of an element.
;; 4) Find the next element.
diff --git a/psgml-vars.el b/psgml-vars.el
index 8a02db319e..1214a625f5 100644
--- a/psgml-vars.el
+++ b/psgml-vars.el
@@ -52,8 +52,8 @@ Setting this variable automatically makes it local to the
current buffer."
(defcustom sgml-system-identifiers-are-preferred nil
"*If nil, PSGML will look up external entities by searching the catalogs
in `sgml-local-catalogs' and `sgml-catalog-files' and only if the
-entity is not found in the catalogs will a given system identifer be
-used. If the variable is non-nil and a system identifer is given, the
+entity is not found in the catalogs will a given system identifier be
+used. If the variable is non-nil and a system identifier is given, the
system identifier will be used for the entity. If no system identifier
is given the catalogs will searched."
:type 'boolean
@@ -72,7 +72,7 @@ of a submenu to indicate the range of items in that menu."
(defcustom sgml-markup-faces
- ;; Fixme: are the font-lock correspondences here the most appopriate
+ ;; Fixme: are the font-lock correspondences here the most appropriate
;; ones? I don't recall whence this set came. -- fx
`((start-tag . ,(if (facep 'font-lock-function-name-face)
'font-lock-function-name-face
diff --git a/psgml.el b/psgml.el
index 87bdb0309f..ff58b6b910 100644
--- a/psgml.el
+++ b/psgml.el
@@ -1217,10 +1217,10 @@ tag inserted." t)
(autoload 'sgml-entities-menu "psgml-edit" nil t)
(autoload 'sgml-attrib-menu "psgml-edit" "Pop up a menu of the attributes of
the current element
\(or the element with start-tag before point)." t)
-(autoload 'sgml-right-menu "psgml-edit" "Pop up a menu with valid tags and
insert the choosen tag.
+(autoload 'sgml-right-menu "psgml-edit" "Pop up a menu with valid tags and
insert the chosen tag.
If the variable sgml-balanced-tag-edit is t, also inserts the
corresponding end tag. If sgml-leave-point-after-insert is t, the point
-is left after the inserted tag(s), unless the element has som required
+is left after the inserted tag(s), unless the element has some required
content. If sgml-leave-point-after-insert is nil the point is left
after the first tag inserted." t)
(autoload 'sgml-fill-element "psgml-edit" "Fill biggest enclosing element with
mixed content.
diff --git a/psgml.texi b/psgml.texi
index 7d82bcddcf..3529f7705d 100644
--- a/psgml.texi
+++ b/psgml.texi
@@ -1233,7 +1233,7 @@ Commands for showing information obtained by parsing the
buffer.
@item C-c C-c
Shows in the message area: context at point, if in a tag or in mixed
content and the open elements (@code{sgml-show-context}). The form of
-the string is controled by the user option
+the string is controlled by the user option
@code{sgml-show-context-function}.
@kindex C-c C-w
