[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el
From: |
Mike Williams |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el |
Date: |
Wed, 03 Apr 2002 07:13:00 -0500 |
Index: emacs/lisp/textmodes/sgml-mode.el
diff -c emacs/lisp/textmodes/sgml-mode.el:1.75
emacs/lisp/textmodes/sgml-mode.el:1.76
*** emacs/lisp/textmodes/sgml-mode.el:1.75 Tue Apr 2 07:06:26 2002
--- emacs/lisp/textmodes/sgml-mode.el Wed Apr 3 07:12:59 2002
***************
*** 864,870 ****
(defun sgml-lexical-context (&optional limit)
"Return the lexical context at point as (TYPE . START).
START is the location of the start of the lexical element.
! TYPE is one of `string', `comment', `tag', or `text'.
If non-nil LIMIT is a nearby position before point outside of any tag."
;; As usual, it's difficult to get a reliable answer without parsing the
--- 864,870 ----
(defun sgml-lexical-context (&optional limit)
"Return the lexical context at point as (TYPE . START).
START is the location of the start of the lexical element.
! TYPE is one of `string', `comment', `tag', `cdata', or `text'.
If non-nil LIMIT is a nearby position before point outside of any tag."
;; As usual, it's difficult to get a reliable answer without parsing the
***************
*** 883,893 ****
;; When entering this loop we're inside text.
(setq text-start (point))
(skip-chars-forward "^<" pos)
! (setq cdata-start (if (looking-at "<!\\[CDATA\\[") (point)))
;; We skipped text and reached a tag. Parse it.
;; FIXME: Handle net-enabling start-tags
(if cdata-start
! (search-forward "]]>" pos 'limit)
(setq state (parse-partial-sexp (point) pos 0))))
(cond
(cdata-start (cons 'cdata cdata-start))
--- 883,893 ----
;; When entering this loop we're inside text.
(setq text-start (point))
(skip-chars-forward "^<" pos)
! (setq cdata-start (if (looking-at "<!\\[[A-Z]+\\[") (point)))
;; We skipped text and reached a tag. Parse it.
;; FIXME: Handle net-enabling start-tags
(if cdata-start
! (search-forward "]]>" pos 'move)
(setq state (parse-partial-sexp (point) pos 0))))
(cond
(cdata-start (cons 'cdata cdata-start))
***************
*** 980,987 ****
(setq tag-type 'comment
tag-start (search-backward "<!--" nil t)))
((sgml-looking-back-at "]]") ; cdata
! (setq tag-type 'cdata
! tag-start (search-backward "<![CDATA[" nil t)))
(t
(setq tag-start
(with-syntax-table sgml-tag-syntax-table
--- 980,987 ----
(setq tag-type 'comment
tag-start (search-backward "<!--" nil t)))
((sgml-looking-back-at "]]") ; cdata
! (setq tag-type 'cdata
! tag-start (re-search-backward "<!\\[[A-Z]+\\[" nil t)))
(t
(setq tag-start
(with-syntax-table sgml-tag-syntax-table
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/01
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/01
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Stefan Monnier, 2002/04/01
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/02
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/02
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el,
Mike Williams <=
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/03
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/03
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Stefan Monnier, 2002/04/08
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/09
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/09
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/11
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/14
- [Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el, Mike Williams, 2002/04/16