[Emacs-diffs] trunk r115620: * skeleton.el (skeleton-pair-insert-maybe): Disable newline

[Leo Liu]

------------------------------------------------------------
revno: 115620
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16138
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-20 08:38:02 +0800
message:
  * skeleton.el (skeleton-pair-insert-maybe): Disable newline
  insertion using skeleton-end-newline.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/skeleton.el               skeleton.el-20091113204419-o5vbwnq5f7feedwu-728

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-20 00:07:08 +0000
+++ b/lisp/ChangeLog    2013-12-20 00:38:02 +0000
@@ -1,3 +1,8 @@
+2013-12-20  Leo Liu  <address@hidden>
+
+       * skeleton.el (skeleton-pair-insert-maybe): Disable newline
+       insertion using skeleton-end-newline.  (Bug#16138)
+
 2013-12-20  Juri Linkov  <address@hidden>
 
        * replace.el (occur-engine): Use `add-face-text-property'

=== modified file 'lisp/skeleton.el'
--- a/lisp/skeleton.el  2013-10-17 04:51:05 +0000
+++ b/lisp/skeleton.el  2013-12-20 00:38:02 +0000
@@ -509,7 +509,6 @@
     (let* ((mark (and skeleton-autowrap
                      (or (eq last-command 'mouse-drag-region)
                          (and transient-mark-mode mark-active))))
-          (skeleton-end-hook)
           (char last-command-event)
           (skeleton (or (assq char skeleton-pair-alist)
                         (assq char skeleton-pair-default-alist)
@@ -520,7 +519,9 @@
                       (if (not skeleton-pair-on-word) (looking-at "\\w"))
                       (funcall skeleton-pair-filter-function))))
          (self-insert-command (prefix-numeric-value arg))
-       (skeleton-insert (cons nil skeleton) (if mark -1))))))
+       ;; Newlines not desirable for inserting pairs.  See bug#16138.
+       (let ((skeleton-end-newline nil))
+         (skeleton-insert (cons nil skeleton) (if mark -1)))))))
 
 
 ;; A more serious example can be found in sh-script.el