2016-01-15 15:29:20 +00:00
|
|
|
;;; nxml-rap.el --- low-level support for random access parsing for nXML mode -*- lexical-binding:t -*-
|
2007-11-23 06:58:00 +00:00
|
|
|
|
2018-01-01 08:21:42 +00:00
|
|
|
;; Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
;; Author: James Clark
|
2014-03-21 06:56:55 +00:00
|
|
|
;; Keywords: wp, hypermedia, languages, XML
|
2007-11-23 06:58:00 +00:00
|
|
|
|
2007-11-28 04:10:03 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
2007-11-23 06:58:00 +00:00
|
|
|
|
2008-05-06 04:29:13 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2007-11-28 04:10:03 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 04:29:13 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2007-11-23 06:58:00 +00:00
|
|
|
|
2007-11-28 04:10:03 +00:00
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; This uses xmltok.el to do XML parsing. The fundamental problem is
|
|
|
|
;; how to handle changes. We don't want to maintain a complete parse
|
|
|
|
;; tree. We also don't want to reparse from the start of the document
|
|
|
|
;; on every keystroke. However, it is not possible in general to
|
|
|
|
;; parse an XML document correctly starting at a random point in the
|
|
|
|
;; middle. The main problems are comments, CDATA sections and
|
|
|
|
;; processing instructions: these can all contain things that are
|
|
|
|
;; indistinguishable from elements. Literals in the prolog are also a
|
|
|
|
;; problem. Attribute value literals are not a problem because
|
|
|
|
;; attribute value literals cannot contain less-than signs.
|
|
|
|
;;
|
|
|
|
;; Our strategy is to keep track of just the problematic things.
|
|
|
|
;; Specifically, we keep track of all comments, CDATA sections and
|
|
|
|
;; processing instructions in the instance. We do this by marking all
|
|
|
|
;; except the first character of these with a non-nil nxml-inside text
|
|
|
|
;; property. The value of the nxml-inside property is comment,
|
|
|
|
;; cdata-section or processing-instruction. The first character does
|
|
|
|
;; not have the nxml-inside property so we can find the beginning of
|
|
|
|
;; the construct by looking for a change in a text property value
|
|
|
|
;; (Emacs provides primitives for this). We use text properties
|
|
|
|
;; rather than overlays, since the implementation of overlays doesn't
|
|
|
|
;; look like it scales to large numbers of overlays in a buffer.
|
|
|
|
;;
|
|
|
|
;; We don't in fact track all these constructs, but only track them in
|
2016-01-16 20:03:42 +00:00
|
|
|
;; some initial part of the instance.
|
2007-11-23 06:58:00 +00:00
|
|
|
;;
|
|
|
|
;; Thus to parse some random point in the file we first ensure that we
|
|
|
|
;; have scanned up to that point. Then we search backwards for a
|
|
|
|
;; <. Then we check whether the < has an nxml-inside property. If it
|
|
|
|
;; does we go backwards to first character that does not have an
|
|
|
|
;; nxml-inside property (this character must be a <). Then we start
|
|
|
|
;; parsing forward from the < we have found.
|
|
|
|
;;
|
|
|
|
;; The prolog has to be parsed specially, so we also keep track of the
|
|
|
|
;; end of the prolog in `nxml-prolog-end'. The prolog is reparsed on
|
|
|
|
;; every change to the prolog. This won't work well if people try to
|
|
|
|
;; edit huge internal subsets. Hopefully that will be rare.
|
|
|
|
;;
|
|
|
|
;; We keep track of the changes by adding to the buffer's
|
|
|
|
;; after-change-functions hook. Scanning is also done as a
|
|
|
|
;; prerequisite to fontification by adding to fontification-functions
|
|
|
|
;; (in the same way as jit-lock). This means that scanning for these
|
|
|
|
;; constructs had better be quick. Fortunately it is. Firstly, the
|
|
|
|
;; typical proportion of comments, CDATA sections and processing
|
|
|
|
;; instructions is small relative to other things. Secondly, to scan
|
|
|
|
;; we just search for the regexp <[!?].
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(require 'xmltok)
|
|
|
|
(require 'nxml-util)
|
2016-01-16 20:03:42 +00:00
|
|
|
(require 'sgml-mode)
|
2007-11-23 06:58:00 +00:00
|
|
|
|
2016-01-16 20:03:42 +00:00
|
|
|
(defvar-local nxml-prolog-end nil
|
2007-11-23 06:58:00 +00:00
|
|
|
"Integer giving position following end of the prolog.")
|
|
|
|
|
|
|
|
(defsubst nxml-get-inside (pos)
|
2016-01-16 20:03:42 +00:00
|
|
|
(save-excursion (nth 8 (syntax-ppss pos))))
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
(defun nxml-inside-end (pos)
|
|
|
|
"Return the end of the inside region containing POS.
|
|
|
|
Return nil if the character at POS is not inside."
|
2016-01-16 20:03:42 +00:00
|
|
|
(save-excursion
|
|
|
|
(let ((ppss (syntax-ppss pos)))
|
|
|
|
(when (nth 8 ppss)
|
|
|
|
(goto-char (nth 8 ppss))
|
|
|
|
(with-syntax-table sgml-tag-syntax-table
|
|
|
|
(if (nth 3 ppss)
|
|
|
|
(progn (forward-comment 1) (point))
|
|
|
|
(or (scan-sexps (point) 1) (point-max))))))))
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
(defun nxml-inside-start (pos)
|
|
|
|
"Return the start of the inside region containing POS.
|
|
|
|
Return nil if the character at POS is not inside."
|
2016-01-16 20:03:42 +00:00
|
|
|
(save-excursion (nth 8 (syntax-ppss pos))))
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
;;; Change management
|
|
|
|
|
2007-11-28 04:10:03 +00:00
|
|
|
;; n-s-p only called from nxml-mode.el, where this variable is defined.
|
|
|
|
(defvar nxml-prolog-regions)
|
|
|
|
|
2007-11-23 06:58:00 +00:00
|
|
|
(defun nxml-scan-prolog ()
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let (xmltok-dtd
|
* lisp/nxml/nxml-mode.el: Treat unclosed <[[, <?, comment, and other
literals as extending to EOB.
(nxml-last-fontify-end): Remove unused variable.
(nxml-after-change1): Use with-silent-modifications.
(nxml-extend-after-change-region): Simplify.
(nxml-extend-after-change-region1): Remove function.
(nxml-after-change1): Don't adjust for dependent regions.
(nxml-fontify-matcher): Simplify.
* lisp/nxml/xmltok.el (xmltok-dependent-regions): Remove variable.
(xmltok-add-dependent): Remove function.
(xmltok-scan-after-lt, xmltok-scan-after-processing-instruction-open)
(xmltok-scan-after-comment-open, xmltok-scan-prolog-literal)
(xmltok-scan-prolog-after-processing-instruction-open): Treat
unclosed <[[, <?, comment, and other literals as extending to EOB.
* lisp/nxml/rng-valid.el (rng-mark-xmltok-dependent-regions)
(rng-mark-xmltok-dependent-region, rng-dependent-region-changed):
Remove functions.
(rng-do-some-validation-1): Don't mark dependent regions.
* lisp/nxml/nxml-rap.el (nxml-adjust-start-for-dependent-regions)
(nxml-mark-parse-dependent-regions, nxml-mark-parse-dependent-region)
(nxml-clear-dependent-regions): Remove functions.
(nxml-scan-after-change, nxml-scan-prolog, nxml-tokenize-forward)
(nxml-ensure-scan-up-to-date):
Don't clear&mark dependent regions.
2013-05-15 18:31:51 +00:00
|
|
|
xmltok-errors)
|
2007-11-23 06:58:00 +00:00
|
|
|
(setq nxml-prolog-regions (xmltok-forward-prolog))
|
2016-01-16 20:03:42 +00:00
|
|
|
(setq nxml-prolog-end (point))))
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
|
|
|
|
;;; Random access parsing
|
|
|
|
|
|
|
|
(defun nxml-token-after ()
|
|
|
|
"Return the position after the token containing the char after point.
|
|
|
|
Sets up the variables `xmltok-type', `xmltok-start',
|
|
|
|
`xmltok-name-end', `xmltok-name-colon', `xmltok-attributes',
|
|
|
|
`xmltok-namespace-attributes' in the same was as does
|
|
|
|
`xmltok-forward'. The prolog will be treated as a single token with
|
|
|
|
type `prolog'."
|
|
|
|
(let ((pos (point)))
|
|
|
|
(if (< pos nxml-prolog-end)
|
|
|
|
(progn
|
|
|
|
(setq xmltok-type 'prolog
|
|
|
|
xmltok-start (point-min))
|
|
|
|
(min nxml-prolog-end (point-max)))
|
|
|
|
(nxml-ensure-scan-up-to-date)
|
|
|
|
(if (nxml-get-inside pos)
|
|
|
|
(save-excursion
|
|
|
|
(nxml-move-outside-backwards)
|
|
|
|
(xmltok-forward)
|
|
|
|
(point))
|
|
|
|
(save-excursion
|
|
|
|
(if (or (eq (char-after) ?<)
|
|
|
|
(search-backward "<"
|
|
|
|
(max (point-min) nxml-prolog-end)
|
|
|
|
t))
|
|
|
|
(nxml-move-outside-backwards)
|
|
|
|
(goto-char (if (<= (point-min) nxml-prolog-end)
|
|
|
|
nxml-prolog-end
|
|
|
|
(or (nxml-inside-end (point-min))
|
|
|
|
(point-min)))))
|
|
|
|
(while (and (nxml-tokenize-forward)
|
|
|
|
(<= (point) pos)))
|
|
|
|
(point))))))
|
|
|
|
|
|
|
|
(defun nxml-token-before ()
|
|
|
|
"Return the position after the token containing the char before point.
|
|
|
|
Sets variables like `nxml-token-after'."
|
|
|
|
(if (/= (point-min) (point))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (1- (point)))
|
|
|
|
(nxml-token-after))
|
|
|
|
(setq xmltok-start (point))
|
|
|
|
(setq xmltok-type nil)
|
|
|
|
(point)))
|
|
|
|
|
|
|
|
(defun nxml-tokenize-forward ()
|
* lisp/nxml/nxml-mode.el: Treat unclosed <[[, <?, comment, and other
literals as extending to EOB.
(nxml-last-fontify-end): Remove unused variable.
(nxml-after-change1): Use with-silent-modifications.
(nxml-extend-after-change-region): Simplify.
(nxml-extend-after-change-region1): Remove function.
(nxml-after-change1): Don't adjust for dependent regions.
(nxml-fontify-matcher): Simplify.
* lisp/nxml/xmltok.el (xmltok-dependent-regions): Remove variable.
(xmltok-add-dependent): Remove function.
(xmltok-scan-after-lt, xmltok-scan-after-processing-instruction-open)
(xmltok-scan-after-comment-open, xmltok-scan-prolog-literal)
(xmltok-scan-prolog-after-processing-instruction-open): Treat
unclosed <[[, <?, comment, and other literals as extending to EOB.
* lisp/nxml/rng-valid.el (rng-mark-xmltok-dependent-regions)
(rng-mark-xmltok-dependent-region, rng-dependent-region-changed):
Remove functions.
(rng-do-some-validation-1): Don't mark dependent regions.
* lisp/nxml/nxml-rap.el (nxml-adjust-start-for-dependent-regions)
(nxml-mark-parse-dependent-regions, nxml-mark-parse-dependent-region)
(nxml-clear-dependent-regions): Remove functions.
(nxml-scan-after-change, nxml-scan-prolog, nxml-tokenize-forward)
(nxml-ensure-scan-up-to-date):
Don't clear&mark dependent regions.
2013-05-15 18:31:51 +00:00
|
|
|
(let (xmltok-errors)
|
2016-01-16 20:03:42 +00:00
|
|
|
(xmltok-forward)
|
2007-11-23 06:58:00 +00:00
|
|
|
xmltok-type))
|
|
|
|
|
2008-06-06 16:14:49 +00:00
|
|
|
(defun nxml-move-tag-backwards (bound)
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
"Move point backwards outside any “inside” regions or tags.
|
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.
2008-07-03 12:25:23 +00:00
|
|
|
Point will not move past `nxml-prolog-end'.
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
Point will either be at BOUND or a `<' character starting a tag
|
|
|
|
outside any “inside” regions.
|
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.
2008-07-03 12:25:23 +00:00
|
|
|
As a precondition, point must be >= BOUND."
|
2008-06-06 16:14:49 +00:00
|
|
|
(nxml-move-outside-backwards)
|
|
|
|
(when (not (equal (char-after) ?<))
|
|
|
|
(if (search-backward "<" bound t)
|
|
|
|
(progn
|
|
|
|
(nxml-move-outside-backwards)
|
|
|
|
(when (not (equal (char-after) ?<))
|
|
|
|
(search-backward "<" bound t)))
|
|
|
|
(goto-char bound))))
|
|
|
|
|
2007-11-23 06:58:00 +00:00
|
|
|
(defun nxml-move-outside-backwards ()
|
|
|
|
"Move point to first character of the containing special thing.
|
|
|
|
Leave point unmoved if it is not inside anything special."
|
|
|
|
(let ((start (nxml-inside-start (point))))
|
|
|
|
(when start
|
2016-01-16 20:03:42 +00:00
|
|
|
(goto-char start)
|
2007-11-23 06:58:00 +00:00
|
|
|
(when (nxml-get-inside (point))
|
2016-01-16 20:03:42 +00:00
|
|
|
(error "Char before inside-start at %s is still \"inside\"" (point))))))
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
(defun nxml-ensure-scan-up-to-date ()
|
2016-01-16 20:03:42 +00:00
|
|
|
(syntax-propertize (point)))
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
;;; Element scanning
|
|
|
|
|
|
|
|
(defun nxml-scan-element-forward (from &optional up)
|
|
|
|
"Scan forward from FROM over a single balanced element.
|
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.
2008-07-03 12:25:23 +00:00
|
|
|
Point must be between tokens. Return the position of the end of
|
|
|
|
the tag that ends the element. `xmltok-start' will contain the
|
|
|
|
position of the start of the tag. If UP is non-nil, then scan
|
|
|
|
past end-tag of element containing point. If no element is
|
|
|
|
found, return nil. If a well-formedness error prevents scanning,
|
|
|
|
signal an `nxml-scan-error'. Point is not moved."
|
2007-11-23 06:58:00 +00:00
|
|
|
(let ((open-tags (and up t))
|
|
|
|
found)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char from)
|
|
|
|
(while (cond ((not (nxml-tokenize-forward))
|
|
|
|
(when (consp open-tags)
|
|
|
|
(nxml-scan-error (cadr open-tags)
|
|
|
|
"Start-tag has no end-tag"))
|
|
|
|
nil)
|
|
|
|
((eq xmltok-type 'start-tag)
|
|
|
|
(setq open-tags
|
|
|
|
(cons (xmltok-start-tag-qname)
|
|
|
|
(cons xmltok-start
|
|
|
|
open-tags)))
|
|
|
|
t)
|
|
|
|
((eq xmltok-type 'end-tag)
|
|
|
|
(cond ((not open-tags) nil)
|
|
|
|
((not (consp open-tags)) (setq found (point)) nil)
|
|
|
|
((not (string= (car open-tags)
|
|
|
|
(xmltok-end-tag-qname)))
|
|
|
|
(nxml-scan-error (+ 2 xmltok-start)
|
|
|
|
"Mismatched end-tag; \
|
|
|
|
expected `%s'"
|
|
|
|
(car open-tags)))
|
|
|
|
((setq open-tags (cddr open-tags)) t)
|
|
|
|
(t (setq found (point)) nil)))
|
|
|
|
((memq xmltok-type '(empty-element
|
|
|
|
partial-empty-element))
|
|
|
|
(if open-tags
|
|
|
|
t
|
|
|
|
(setq found (point))
|
|
|
|
nil))
|
|
|
|
((eq xmltok-type 'partial-end-tag)
|
|
|
|
(cond ((not open-tags) nil)
|
|
|
|
((not (consp open-tags)) (setq found (point)) nil)
|
|
|
|
((setq open-tags (cddr open-tags)) t)
|
|
|
|
(t (setq found (point)) nil)))
|
|
|
|
((eq xmltok-type 'partial-start-tag)
|
|
|
|
(nxml-scan-error xmltok-start
|
|
|
|
"Missing `>'"))
|
|
|
|
(t t))))
|
|
|
|
found))
|
|
|
|
|
|
|
|
(defun nxml-scan-element-backward (from &optional up bound)
|
|
|
|
"Scan backward from FROM over a single balanced element.
|
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.
2008-07-03 12:25:23 +00:00
|
|
|
Point must be between tokens. Return the position of the end of
|
|
|
|
the tag that starts the element. `xmltok-start' will contain the
|
|
|
|
position of the start of the tag. If UP is non-nil, then scan
|
|
|
|
past start-tag of element containing point. If BOUND is non-nil,
|
|
|
|
then don't scan back past BOUND. If no element is found, return
|
|
|
|
nil. If a well-formedness error prevents scanning, signal an
|
|
|
|
`nxml-scan-error'. Point is not moved."
|
2007-11-23 06:58:00 +00:00
|
|
|
(let ((open-tags (and up t))
|
|
|
|
token-end found)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char from)
|
|
|
|
(while (cond ((or (< (point) nxml-prolog-end)
|
|
|
|
(not (search-backward "<"
|
|
|
|
(max (or bound 0)
|
|
|
|
nxml-prolog-end)
|
|
|
|
t)))
|
|
|
|
(when (and (consp open-tags) (not bound))
|
|
|
|
(nxml-scan-error (cadr open-tags)
|
|
|
|
"End-tag has no start-tag"))
|
|
|
|
nil)
|
|
|
|
((progn
|
|
|
|
(nxml-move-outside-backwards)
|
|
|
|
(save-excursion
|
|
|
|
(nxml-tokenize-forward)
|
|
|
|
(setq token-end (point)))
|
|
|
|
(eq xmltok-type 'end-tag))
|
|
|
|
(setq open-tags
|
|
|
|
(cons (xmltok-end-tag-qname)
|
|
|
|
(cons xmltok-start open-tags)))
|
|
|
|
t)
|
|
|
|
((eq xmltok-type 'start-tag)
|
|
|
|
(cond ((not open-tags) nil)
|
|
|
|
((not (consp open-tags))
|
|
|
|
(setq found token-end)
|
|
|
|
nil)
|
|
|
|
((and (car open-tags)
|
|
|
|
(not (string= (car open-tags)
|
|
|
|
(xmltok-start-tag-qname))))
|
|
|
|
(nxml-scan-error (1+ xmltok-start)
|
|
|
|
"Mismatched start-tag; \
|
|
|
|
expected `%s'"
|
|
|
|
(car open-tags)))
|
|
|
|
((setq open-tags (cddr open-tags)) t)
|
|
|
|
(t (setq found token-end) nil)))
|
|
|
|
((memq xmltok-type '(empty-element
|
|
|
|
partial-empty-element))
|
|
|
|
(if open-tags
|
|
|
|
t
|
|
|
|
(setq found token-end)
|
|
|
|
nil))
|
|
|
|
((eq xmltok-type 'partial-end-tag)
|
|
|
|
(setq open-tags
|
|
|
|
(cons nil (cons xmltok-start open-tags)))
|
|
|
|
t)
|
|
|
|
((eq xmltok-type 'partial-start-tag)
|
|
|
|
;; if we have only a partial-start-tag
|
|
|
|
;; then it's unlikely that there's a matching
|
|
|
|
;; end-tag, so it's probably not helpful
|
|
|
|
;; to treat it as a complete start-tag
|
|
|
|
(nxml-scan-error xmltok-start
|
|
|
|
"Missing `>'"))
|
|
|
|
(t t))))
|
|
|
|
found))
|
|
|
|
|
|
|
|
(defun nxml-scan-error (&rest args)
|
|
|
|
(signal 'nxml-scan-error args))
|
|
|
|
|
* lisp/subr.el (define-error): New function.
* doc/lispref/control.texi (Signaling Errors): Refer to define-error.
(Error Symbols): Add `define-error'.
* doc/lispref/errors.texi (Standard Errors): Don't refer to `error-conditions'.
* lisp/progmodes/ada-xref.el (ada-error-file-not-found): Rename from
error-file-not-found and define with define-error.
* lisp/emacs-lisp/cl-lib.el (cl-assertion-failed): Move here from subr.el
and define with define-error.
* lisp/userlock.el (file-locked, file-supersession):
* lisp/simple.el (mark-inactive):
* lisp/progmodes/js.el (js-moz-bad-rpc, js-js-error):
* lisp/progmodes/ada-mode.el (ada-mode-errors):
* lisp/play/life.el (life-extinct):
* lisp/nxml/xsd-regexp.el (xsdre-invalid-regexp, xsdre-parse-error):
* lisp/nxml/xmltok.el (xmltok-markup-declaration-parse-error):
* lisp/nxml/rng-util.el (rng-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-cmpct.el (rng-c-incorrect-schema):
* lisp/nxml/nxml-util.el (nxml-error, nxml-file-parse-error):
* lisp/nxml/nxml-rap.el (nxml-scan-error):
* lisp/nxml/nxml-outln.el (nxml-outline-error):
* lisp/net/soap-client.el (soap-error):
* lisp/net/gnutls.el (gnutls-error):
* lisp/net/ange-ftp.el (ftp-error):
* lisp/mpc.el (mpc-proc-error):
* lisp/json.el (json-error, json-readtable-error, json-unknown-keyword)
(json-number-format, json-string-escape, json-string-format)
(json-key-format, json-object-format):
* lisp/jka-compr.el (compression-error):
* lisp/international/quail.el (quail-error):
* lisp/international/kkc.el (kkc-error):
* lisp/emacs-lisp/ert.el (ert-test-failed):
* lisp/calc/calc.el (calc-error, inexact-result, math-overflow)
(math-underflow):
* lisp/bookmark.el (bookmark-error-no-filename):
* lisp/epg.el (epg-error): Define with define-error.
2013-08-09 21:22:44 +00:00
|
|
|
(define-error 'nxml-scan-error
|
|
|
|
"Scan over element that is not well-formed" 'nxml-error)
|
2007-11-23 06:58:00 +00:00
|
|
|
|
|
|
|
(provide 'nxml-rap)
|
|
|
|
|
|
|
|
;;; nxml-rap.el ends here
|