diff options
| author | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
| commit | 4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch) | |
| tree | 18452b36b890faf52d40f555ebe4dc3c6e020bc6 /lisp/nxml/nxml-outln.el | |
| parent | 0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff) | |
| parent | 984a14904658da42ca9dea50a811a901ddc56e60 (diff) | |
| download | emacs-xwidget_mvp.tar.gz | |
merge masterxwidget_mvp
Diffstat (limited to 'lisp/nxml/nxml-outln.el')
| -rw-r--r-- | lisp/nxml/nxml-outln.el | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el index c87cd5378fa..79e6406f553 100644 --- a/lisp/nxml/nxml-outln.el +++ b/lisp/nxml/nxml-outln.el @@ -1,6 +1,6 @@ -;;; nxml-outln.el --- outline support for nXML mode +;;; nxml-outln.el --- outline support for nXML mode -*- lexical-binding:t -*- -;; Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML @@ -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)))) |