mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Update nXML to use Emacs's Unicode support, and lexical-binding
* etc/nxml/*.el: Remove obsolete char-name files. * lisp/nxml/xsd-regexp.el (xsdre-range-list-difference): Remove unused var `next'. * lisp/nxml/rng-nxml.el (rng-set-state-after): Don't assume point-min==1. * lisp/nxml/rng-match.el (rng-update-match-state): Simplify. * lisp/nxml/nxml-outln.el (nxml-outline-state-transform-exceptions) (nxml-target-section-pos, nxml-depth-in-target-section) (nxml-outline-state-transform-alist) (nxml-outline-display-section-tag-function): Move decl before first use. * lisp/nxml/nxml-mode.el (nxml-char-name-ignore-case) (nxml-char-name-alist, nxml-char-name-table) (nxml-autoload-char-name-set-list, nxml-named-char-history): Remove vars. (nxml-enable-char-name-set, nxml-disable-char-name-set) (nxml-char-name-set-enabled-p, nxml-autoload-char-name-set) (nxml-define-char-name-set, nxml-get-char-name): Remove functions. (nxml-insert-named-char): Use read-char-by-name instead. (nxml-char-ref-display-extra): Use get-char-code-property. * lisp/nxml/nxml-maint.el (nxml-create-unicode-char-name-sets): Remove function. * lisp/nxml/nxml-glyph.el, lisp/nxml/nxml-uchnm.el: Remove files.
This commit is contained in:
parent
a600f4c693
commit
930f8e8377
119 changed files with 61 additions and 14065 deletions
|
|
@ -1,4 +1,4 @@
|
|||
;;; nxml-outln.el --- outline support for nXML mode
|
||||
;;; nxml-outln.el --- outline support for nXML mode -*- lexical-binding:t -*-
|
||||
|
||||
;; Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc.
|
||||
|
||||
|
|
@ -248,6 +248,16 @@ customize which elements are recognized as sections and headings."
|
|||
(interactive)
|
||||
(nxml-transform-subtree-outline '((hide-children . t))))
|
||||
|
||||
;; These variables are dynamically bound. They are use to pass information to
|
||||
;; nxml-section-tag-transform-outline-state.
|
||||
|
||||
(defvar nxml-outline-state-transform-exceptions nil)
|
||||
(defvar nxml-target-section-pos nil)
|
||||
(defvar nxml-depth-in-target-section nil)
|
||||
(defvar nxml-outline-state-transform-alist nil)
|
||||
|
||||
(defvar nxml-outline-display-section-tag-function nil)
|
||||
|
||||
(defun nxml-hide-other ()
|
||||
"Hide text content other than that directly in the section containing point.
|
||||
Hide headings other than those of ancestors of that section and their
|
||||
|
|
@ -275,14 +285,6 @@ customize which elements are recognized as sections and headings."
|
|||
(nxml-transform-buffer-outline '((nil . hide-children)
|
||||
(t . hide-children)))))
|
||||
|
||||
;; These variables are dynamically bound. They are use to pass information to
|
||||
;; nxml-section-tag-transform-outline-state.
|
||||
|
||||
(defvar nxml-outline-state-transform-exceptions nil)
|
||||
(defvar nxml-target-section-pos nil)
|
||||
(defvar nxml-depth-in-target-section nil)
|
||||
(defvar nxml-outline-state-transform-alist nil)
|
||||
|
||||
(defun nxml-transform-buffer-outline (alist)
|
||||
(let ((nxml-target-section-pos nil)
|
||||
(nxml-depth-in-target-section 0)
|
||||
|
|
@ -350,7 +352,7 @@ customize which elements are recognized as sections and headings."
|
|||
(defun nxml-section-tag-transform-outline-state (startp
|
||||
section-start-pos
|
||||
&optional
|
||||
heading-start-pos)
|
||||
_heading-start-pos)
|
||||
(if (not startp)
|
||||
(setq nxml-depth-in-target-section
|
||||
(and nxml-depth-in-target-section
|
||||
|
|
@ -427,8 +429,6 @@ customize which elements are recognized as sections and headings."
|
|||
(nxml-outline-error
|
||||
(nxml-report-outline-error "Cannot display outline: %s" err)))))
|
||||
|
||||
(defvar nxml-outline-display-section-tag-function nil)
|
||||
|
||||
(defun nxml-outline-display-rest (outline-state start-tag-indent tag-qnames)
|
||||
"Display up to and including the end of the current element.
|
||||
OUTLINE-STATE can be nil, t, hide-children. START-TAG-INDENT is the
|
||||
|
|
@ -789,7 +789,7 @@ no new overlay will be created."
|
|||
(defun nxml-end-of-heading ()
|
||||
"Move from the start of the content of the heading to the end.
|
||||
Do not move past the end of the line."
|
||||
(let ((pos (condition-case err
|
||||
(let ((pos (condition-case nil
|
||||
(and (nxml-scan-element-forward (point) t)
|
||||
xmltok-start)
|
||||
(nxml-scan-error nil))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue