[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog nxml/nxml-mode.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog nxml/nxml-mode.el |
Date: |
Sat, 24 Oct 2009 21:32:23 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/10/24 21:32:23
Modified files:
lisp : ChangeLog
lisp/nxml : nxml-mode.el
Log message:
* nxml/nxml-mode.el (nxml-balanced-close-start-tag): Use the value
of xmltok-start before the end tag was inserted (Bug#2840).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16503&r2=1.16504
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/nxml-mode.el?cvsroot=emacs&r1=1.19&r2=1.20
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16503
retrieving revision 1.16504
diff -u -b -r1.16503 -r1.16504
--- ChangeLog 24 Oct 2009 21:15:39 -0000 1.16503
+++ ChangeLog 24 Oct 2009 21:32:19 -0000 1.16504
@@ -1,5 +1,8 @@
2009-10-24 Chong Yidong <address@hidden>
+ * nxml/nxml-mode.el (nxml-balanced-close-start-tag): Use the value
+ of xmltok-start before the end tag was inserted (Bug#2840).
+
* progmodes/sh-script.el (sh-font-lock-paren): Handle case
patterns that are preceded by an open-paren (Bug#1320).
Index: nxml/nxml-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/nxml-mode.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- nxml/nxml-mode.el 24 Sep 2009 23:22:20 -0000 1.19
+++ nxml/nxml-mode.el 24 Oct 2009 21:32:22 -0000 1.20
@@ -1254,22 +1254,24 @@
(defun nxml-balanced-close-start-tag (block-or-inline)
(let ((token-end (nxml-token-before))
- (pos (1+ (point))))
+ (pos (1+ (point)))
+ (token-start xmltok-start))
(unless (or (eq xmltok-type 'partial-start-tag)
(and (memq xmltok-type '(start-tag
empty-element
partial-empty-element))
(>= token-end pos)))
(error "Not in a start-tag"))
+ ;; Note that this insertion changes xmltok-start.
(insert "></"
(buffer-substring-no-properties (+ xmltok-start 1)
(min xmltok-name-end (point)))
">")
(if (eq block-or-inline 'inline)
(goto-char pos)
- (goto-char xmltok-start)
+ (goto-char token-start)
(back-to-indentation)
- (if (= (point) xmltok-start)
+ (if (= (point) token-start)
(let ((indent (current-column)))
(goto-char pos)
(insert "\n")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog nxml/nxml-mode.el,
Chong Yidong <=