Commit 8c2e462a authored by Leo Liu's avatar Leo Liu
Browse files

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

insertion using skeleton-end-newline.

Fixes: debbugs:16138
parent 501158bc
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'
......
......@@ -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)))))))
;; A more serious example can be found in sh-script.el
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment