all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Geoff Gole <geoffgole@gmail.com>
To: Emacs development discussions <emacs-devel@gnu.org>
Subject: [PATCH] Fix for bug 6622, nxml-mode Indentation Behavior
Date: Tue, 13 Jul 2010 10:09:36 +0800	[thread overview]
Message-ID: <AANLkTimZBJQcIRC3RhstAXHDrEVY1f9wl-1zN-2sntpQ@mail.gmail.com> (raw)

Typing a / in nxml-mode is supposed to indent the current line.
Setting nxml-slash-auto-complete-flag incorrectly prevents that from
happening. A patch is below.

*** /usr/local/share/emacs/23.2/lisp/nxml/nxml-mode.el.gz
--- /tmp/buffer-content-33187GX
*************** on the line, reindent the line."
*** 1212,1218 ****
  			   (eq (point) (1- slash-pos)))))
      (self-insert-command (prefix-numeric-value arg))
      (unless arg
!       (if nxml-slash-auto-complete-flag
  	  (if end-tag-p
  	      (condition-case err
  		  (let ((start-tag-end
--- 1212,1218 ----
  			   (eq (point) (1- slash-pos)))))
      (self-insert-command (prefix-numeric-value arg))
      (unless arg
!       (when nxml-slash-auto-complete-flag
  	  (if end-tag-p
  	      (condition-case err
  		  (let ((start-tag-end
*************** on the line, reindent the line."
*** 1232,1240 ****
  		(nxml-scan-error nil))
  	    (when (and (eq (nxml-token-before) (point))
  		       (eq xmltok-type 'partial-empty-element))
! 	      (insert ">")))
  	(when (and end-tag-p at-indentation)
! 	  (nxml-indent-line))))))

  (defun nxml-balanced-close-start-tag-block ()
    "Close the start-tag before point with `>' and insert a balancing end-tag.
--- 1232,1240 ----
  		(nxml-scan-error nil))
  	    (when (and (eq (nxml-token-before) (point))
  		       (eq xmltok-type 'partial-empty-element))
! 	      (insert ">"))))
  	(when (and end-tag-p at-indentation)
! 	  (nxml-indent-line)))))

  (defun nxml-balanced-close-start-tag-block ()
    "Close the start-tag before point with `>' and insert a balancing end-tag.



             reply	other threads:[~2010-07-13  2:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-13  2:09 Geoff Gole [this message]
2010-07-13 15:49 ` [PATCH] Fix for bug 6622, nxml-mode Indentation Behavior Glenn Morris
2010-07-14  3:45   ` Geoff Gole
2010-07-14 19:11     ` Glenn Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AANLkTimZBJQcIRC3RhstAXHDrEVY1f9wl-1zN-2sntpQ@mail.gmail.com \
    --to=geoffgole@gmail.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.