bug#16634: 24.3.50; extra newline in skeleton {} in sh-mode

bug#16634: 24.3.50; extra newline in skeleton {} in sh-mode

[Sam Steingold]

In GNU Emacs 24.3.50.1 (x86_64-apple-darwin13.0.0, NS apple-appkit-1265.00)
 of 2014-02-03 on sds-MacBook-Pro.local
Windowing system distributor `Apple', version 10.3.1265
Configured using:
 `configure --with-ns'

when I type "${" in a middle of a shell script command line, the
matching closing brace "}" is auto-inserted together with a newline
after it, which seems wrong since I am inserting a shell variable value
and not a block.


Important settings:
  value of $LANG: C
  locale-coding-system: utf-8-unix

Major mode: Shell-script

Minor modes in effect:
  sh-electric-here-document-mode: t
  rcirc-track-minor-mode: t
  which-function-mode: t
  url-handler-mode: t
  show-paren-mode: t
  desktop-save-mode: t
  shell-dirtrack-mode: t
  tooltip-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t

-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1265
http://www.childpsy.net/ http://www.PetitionOnline.com/tap12009/
http://dhimmi.com http://pmw.org.il http://memri.org
UNIX is as friendly to you as you are to it. Windows is hostile no matter what.

bug#16634: 24.3.50; extra newline in skeleton {} in sh-mode

[Glenn Morris]

Recipe from emacs -Q?

bug#16634: 24.3.50; extra newline in skeleton {} in sh-mode

[Sam Steingold]

> * Glenn Morris <etz@tah.bet> [2014-02-03 22:35:15 -0500]:
>
> Recipe from emacs -Q?

emacs -Q

Eval these:

(define-key global-map "{" 'skeleton-pair-insert-maybe)
(setq skeleton-pair t)

M-x sh-mode RET
insert:

foo bar

put the point between "foo" and " bar" (i.e., before SPC)

hit "{"

result: "{}\n" is inserted, the point is placed between the braces.
expected: "{}" is inserted, the point is placed between the braces.

-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1265
http://www.childpsy.net/ http://pmw.org.il http://americancensorship.org
http://camera.org http://openvotingconsortium.org http://dhimmi.com
My inferiority complex is not as good as yours.

bug#16634: 24.3.50; extra newline in skeleton {} in sh-mode

[npostavs]

[-- Attachment #1: Type: text/plain, Size: 806 bytes --]

tags 16634 patch
quit

Sam Steingold <sds@gnu.org> writes:
>
> emacs -Q
>
> Eval these:
>
> (define-key global-map "{" 'skeleton-pair-insert-maybe)
> (setq skeleton-pair t)
>
> M-x sh-mode RET
> insert:
>
> foo bar
>
> put the point between "foo" and " bar" (i.e., before SPC)
>
> hit "{"
>
> result: "{}\n" is inserted, the point is placed between the braces.
> expected: "{}" is inserted, the point is placed between the braces.

The problem is that sh-mode sets skeleton-end-hook to a function that
doesn't respect skeleton-end-newline:

  (setq-local skeleton-end-hook
	      (lambda () (or (eolp) (newline) (indent-relative))))

Since skeleton-insert already does

  (or (eolp) (not skeleton-end-newline) (newline-and-indent))

I think the fix is simply to remove sh-mode's custom skeleton-end-hook.


[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 995 bytes --]

From b8810e40da2d68555b294b4d809346db6226b144 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Mon, 19 Dec 2016 20:16:50 -0500
Subject: [PATCH v1] Remove sh-mode's skeleton-end-hook

* lisp/progmodes/sh-script.el (sh-mode): Remove local setting of
`skeleton-end-hook', `skeleton-insert' already does `newline-and-indent'
and also respects `skeleton-end-newline' (Bug#16634).
---
 lisp/progmodes/sh-script.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 5d362e4..f34b5e6 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1629,8 +1629,6 @@ sh-mode
 
   (setq-local skeleton-pair-default-alist
 	      sh-skeleton-pair-default-alist)
-  (setq-local skeleton-end-hook
-	      (lambda () (or (eolp) (newline) (indent-relative))))
 
   (setq-local paragraph-start (concat page-delimiter "\\|$"))
   (setq-local paragraph-separate (concat paragraph-start "\\|#!/"))
-- 
2.9.3

bug#16634: 24.3.50; extra newline in skeleton {} in sh-mode

[npostavs]

tags 16634 fixed
close 16634 26.1
quit

npostavs@users.sourceforge.net writes:
>
> I think the fix is simply to remove sh-mode's custom skeleton-end-hook.
>

Pushed as 5da2a5f449cd, "Remove sh-mode's skeleton-end-hook".