unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] Fix for bug 6622, nxml-mode Indentation Behavior
@ 2010-07-13  2:09 Geoff Gole
  2010-07-13 15:49 ` Glenn Morris
  0 siblings, 1 reply; 4+ messages in thread
From: Geoff Gole @ 2010-07-13  2:09 UTC (permalink / raw)
  To: Emacs development discussions

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.



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-07-14 19:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-13  2:09 [PATCH] Fix for bug 6622, nxml-mode Indentation Behavior Geoff Gole
2010-07-13 15:49 ` Glenn Morris
2010-07-14  3:45   ` Geoff Gole
2010-07-14 19:11     ` Glenn Morris

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).