* skeleton.el (skeleton-pair-insert-maybe): Disable newline

insertion using skeleton-end-newline.

Fixes: debbugs:16138

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d91dd13dd28281d9d7378f3b8010cd03fe25ccb8..aabbeb313756df7c63e35c4d4b730bcf363b06df 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-20  Leo Liu  <sdl.web@gmail.com>
+
+       * skeleton.el (skeleton-pair-insert-maybe): Disable newline
+       insertion using skeleton-end-newline.  (Bug#16138)
+
 2013-12-20  Juri Linkov  <juri@jurta.org>
 
        * replace.el (occur-engine): Use `add-face-text-property'

diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 27b672c55522b7632ce7f1e07d91221f56e08c7c..ac6550efe1b30a240fa0e95d8249f13b4b1e8314 100644 (file)
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -509,7 +509,6 @@ symmetrical ones, and the same character twice for the others."
     (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 @@ symmetrical ones, and the same character twice for the others."
                       (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)))))))
 
 \f
 ;; A more serious example can be found in sh-script.el