[Emacs-diffs] Changes to emacs/lisp/textmodes/sgml-mode.el

[Juanma Barranquero]

Index: emacs/lisp/textmodes/sgml-mode.el
diff -c emacs/lisp/textmodes/sgml-mode.el:1.108 
emacs/lisp/textmodes/sgml-mode.el:1.109
*** emacs/lisp/textmodes/sgml-mode.el:1.108     Thu Jun 16 16:23:46 2005
--- emacs/lisp/textmodes/sgml-mode.el   Mon Jul  4 03:37:24 2005
***************
*** 40,46 ****
    (require 'cl))
  
  (defgroup sgml nil
!   "SGML editing mode"
    :group 'languages)
  
  (defcustom sgml-basic-offset 2
--- 40,46 ----
    (require 'cl))
  
  (defgroup sgml nil
!   "SGML editing mode."
    :group 'languages)
  
  (defcustom sgml-basic-offset 2
***************
*** 670,681 ****
            (message "No attributes configured."))
        (if (stringp (car alist))
            (progn
!             (insert (if (eq (preceding-char) ? ) "" ? )
                      (funcall skeleton-transformation (car alist)))
              (sgml-value alist))
          (setq i (length alist))
          (while (> i 0)
!           (insert ? )
            (insert (funcall skeleton-transformation
                             (setq attribute
                                   (skeleton-read '(completing-read
--- 670,681 ----
            (message "No attributes configured."))
        (if (stringp (car alist))
            (progn
!             (insert (if (eq (preceding-char) ?\s) "" ?\s)
                      (funcall skeleton-transformation (car alist)))
              (sgml-value alist))
          (setq i (length alist))
          (while (> i 0)
!           (insert ?\s)
            (insert (funcall skeleton-transformation
                             (setq attribute
                                   (skeleton-read '(completing-read
***************
*** 685,691 ****
                (setq i 0)
              (sgml-value (assoc (downcase attribute) alist))
              (setq i (1- i))))
!         (if (eq (preceding-char) ? )
              (delete-backward-char 1)))
        car)))
  
--- 685,691 ----
                (setq i 0)
              (sgml-value (assoc (downcase attribute) alist))
              (setq i (1- i))))
!         (if (eq (preceding-char) ?\s)
              (delete-backward-char 1)))
        car)))
  
***************
*** 701,707 ****
            (eq (aref tag 0) ?/))
        (self-insert-command (prefix-numeric-value arg))
        (sgml-attributes tag)
!       (setq last-command-char ? )
        (or (> (point) point)
          (self-insert-command 1)))))
  
--- 701,707 ----
            (eq (aref tag 0) ?/))
        (self-insert-command (prefix-numeric-value arg))
        (sgml-attributes tag)
!       (setq last-command-char ?\s)
        (or (> (point) point)
          (self-insert-command 1)))))
  
***************
*** 1875,1881 ****
        (setq toc-index
              (cons (cons (concat (make-string
                                   (* 2 (1- (string-to-number (match-string 
1))))
!                                  ?\ )
                                  (match-string 3))
                          (line-beginning-position))
                    toc-index))))
--- 1875,1881 ----
        (setq toc-index
              (cons (cons (concat (make-string
                                   (* 2 (1- (string-to-number (match-string 
1))))
!                                  ?\s)
                                  (match-string 3))
                          (line-beginning-position))
                    toc-index))))