diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2008-07-03 12:25:23 +0000 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2008-07-03 12:25:23 +0000 |
commit | 10545bd83d3b5c7f6082d56a59449ff1eddae2ff (patch) | |
tree | e6a516cfc9c44e80a6874a534f0e9a9908d0ba1f /lisp/nxml/rng-cmpct.el | |
parent | 946598bf94b5a0fac989f3108a6ee2bc425611de (diff) | |
download | emacs-10545bd83d3b5c7f6082d56a59449ff1eddae2ff.tar.gz emacs-10545bd83d3b5c7f6082d56a59449ff1eddae2ff.tar.bz2 emacs-10545bd83d3b5c7f6082d56a59449ff1eddae2ff.zip |
Fix typos, and general docstring cleanup.
* nxml/nxml-glyph.el (nxml-glyph-set-hook):
* nxml/nxml-uchnm.el (nxml-unicode-blocks)
(nxml-unicode-block-char-name-set):
* nxml/nxml-util.el (nxml-debug, nxml-make-namespace):
* nxml/rng-nxml.el (rng-set-state-after):
* nxml/rng-uri.el (rng-file-name-uri): Fix typo in docstring.
* nxml/rng-cmpct.el (rng-c-lookup-create, rng-c-parse-primary)
(rng-c-parse-annotation-body):
* nxml/rng-dt.el (rng-dt-namespace-context-getter): Reflow docstrings.
* nxml/nxml-mode.el (nxml, nxml-mode, nxml-after-change1)
(nxml-extend-region, nxml-merge-indent-context-type, nxml-complete)
(nxml-forward-balanced-item, nxml-dynamic-markup-word)
(nxml-define-char-name-set, nxml-toggle-char-ref-extra-display):
Fix typos in docstrings.
(nxml-attribute-indent): Reflow docstring.
(nxml-bind-meta-tab-to-complete-flag, nxml-last-fontify-end)
(nxml-default-buffer-file-coding-system): Doc fixes.
* nxml/nxml-ns.el (nxml-ns-state, nxml-ns-initial-state)
(nxml-ns-set-prefix): Fix typos in docstrings.
(nxml-ns-push-state, nxml-ns-pop-state, nxml-ns-set-default):
Reflow docstring.
(nxml-ns-get-prefix, nxml-ns-get-default): Doc fixes.
* nxml/nxml-outln.el (nxml-hide-all-text-content)
(nxml-show-direct-text-content, nxml-show-direct-subheadings)
(nxml-hide-direct-text-content, nxml-hide-subheadings)
(nxml-hide-text-content, nxml-show-subheadings, nxml-hide-other)
(nxml-outline-display-rest, nxml-outline-set-overlay)
(nxml-section-tag-forward, nxml-section-tag-backward)
(nxml-back-to-section-start): Fix typos in docstrings.
* nxml/nxml-parse.el (nxml-validate-function, nxml-parse-file):
Doc fixes.
* nxml/nxml-rap.el (nxml-scan-end, nxml-move-tag-backwards)
(nxml-scan-element-forward, nxml-scan-element-backward): Doc fixes.
(nxml-scan-after-change): Fix typo in docstring.
* nxml/rng-match.el (rng-being-compiled, rng-normalize-choice-list)
(rng-name-class-possible-names): Doc fixes.
(rng-memo-map-add, rng-intern-group, rng-match-possible-namespace-uris)
(rng-match-possible-start-tag-names, rng-match-possible-value-strings):
Fix typos in docstrings.
(rng-intern-group-shortcut, rng-intern-choice-shortcut):
Reflow docstrings.
* nxml/rng-util.el (rng-uniquify-eq, rng-uniquify-equal): Doc fixes.
(rng-substq, rng-complete-before-point): Fix typos in docstrings.
* nxml/rng-xsd.el (rng-xsd-make-date-time-regexp)
(rng-xsd-convert-date-time): Reflow docstrings.
(rng-xsd-compile): Fix typo in docstring.
* nxml/rng-loc.el (rng-current-schema-file-name)
(rng-locate-schema-file-using, rng-locate-schema-file-from-type-id):
Doc fixes.
(rng-set-schema-file): Fix typo in docstring.
* nxml/rng-valid.el (rng-error-count, rng-validate-mode)
(rng-do-some-validation, rng-process-start-tag, rng-process-text):
Fix typos in docstrings.
(rng-message-overlay, rng-conditional-up-to-date-start)
(rng-conditional-up-to-date-end): Doc fixes.
(rng-next-error, rng-previous-error): Reflow docstrings.
* nxml/xmltok.el (xmltok-attribute-raw-normalized-value): Doc fix.
(xmltok-dtd, xmltok-dependent-regions, xmltok-attribute-refs)
(xmltok-valid-char-p, xmltok-standalone, xmltok-forward-prolog)
(xmltok-merge-attributes): Fix typos in docstrings.
(xmltok-make-attribute, xmltok-forward-special)
(xmltok-get-declared-encoding-position): Reflow docstrings.
* nxml/xsd-regexp.el (xsdre-char-class-to-range-list): Doc fix.
(xsdre-range-list-union, xsdre-check-range-list, xsdre-current-regexp):
Fix typos in docstrings.
Diffstat (limited to 'lisp/nxml/rng-cmpct.el')
-rw-r--r-- | lisp/nxml/rng-cmpct.el | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el index c2e0a9eb2e1..53a11caa4de 100644 --- a/lisp/nxml/rng-cmpct.el +++ b/lisp/nxml/rng-cmpct.el @@ -245,14 +245,16 @@ and URI is a symbol.") (defconst rng-c-about-combine-slot 1) (defun rng-c-lookup-create (name grammar) - "Return a def object for NAME. A def object is a pair -\(ABOUT . REF) where REF is returned by `rng-make-ref'. ABOUT is a -two-element vector [OVERRIDE COMBINE]. COMBINE is either nil, choice -or interleave. OVERRIDE is either nil, require or t." + "Return a def object for NAME. +A def object is a pair \(ABOUT . REF) where REF is returned by +`rng-make-ref'. +ABOUT is a two-element vector [OVERRIDE COMBINE]. +COMBINE is either nil, choice or interleave. +OVERRIDE is either nil, require or t." (let ((def (gethash name grammar))) (if def def - (progn + (progn (setq def (cons (vector nil nil) (rng-make-ref name))) (puthash name def grammar) def)))) @@ -470,14 +472,14 @@ or interleave. OVERRIDE is either nil, require or t." (cons (cons prefix (rng-make-datatypes-uri (rng-c-parse-literal))) rng-c-datatype-decls)))) - + (defun rng-c-parse-namespace () (rng-c-declare-namespace nil (rng-c-parse-identifier-or-keyword))) (defun rng-c-parse-default () (rng-c-expect "namespace") - (rng-c-declare-namespace t + (rng-c-declare-namespace t (if (string-equal rng-c-current-token "=") nil (rng-c-parse-identifier-or-keyword)))) @@ -615,9 +617,10 @@ or interleave. OVERRIDE is either nil, require or t." p))) (defun rng-c-parse-primary () - "Parse a primary expression. The current token must be the first -token of the expression. After parsing the current token should be -token following the primary expression." + "Parse a primary expression. +The current token must be the first token of the expression. +After parsing the current token should be the token following +the primary expression." (cond ((rng-c-current-token-keyword-p) (let ((parse-function (get (intern rng-c-current-token) 'rng-c-pattern))) @@ -691,7 +694,7 @@ token following the primary expression." ((rng-c-current-token-quoted-identifier-p) (rng-c-advance-with (substring rng-c-current-token 1))) (t (rng-c-error "Expected identifier or keyword")))) - + (put 'string 'rng-c-pattern 'rng-c-parse-string) (put 'token 'rng-c-pattern 'rng-c-parse-token) (put 'element 'rng-c-pattern 'rng-c-parse-element) @@ -740,7 +743,7 @@ token following the primary expression." (string-equal rng-c-current-token "|"))) (rng-make-choice-name-class name-classes)) name-class))) - + (defun rng-c-parse-primary-name-class (attribute) (cond ((rng-c-current-token-ncname-p) (rng-c-advance-with @@ -901,8 +904,8 @@ token following the primary expression." ;; XXX don't allow attributes after text (defun rng-c-parse-annotation-body (&optional allow-text) - "Current token is [. Parse up to matching ]. Current token after -parse is token following ]." + "Current token is [. Parse up to matching ]. +Current token after parse is token following ]." (or (string-equal rng-c-current-token "[") (rng-c-error "Expected [")) (rng-c-advance) @@ -922,7 +925,7 @@ parse is token following ]." (rng-c-parse-literal)) (t (rng-c-error "Expected = or [")))))) (rng-c-advance)) - + (defun rng-c-advance-with (pattern) (rng-c-advance) pattern) |