Attachment #155755 for bug #199553

View | Details | Raw Unified | Return to bug 199553
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-2 / +1 lines)
3		3
4	PORTNAME= emacs	4	PORTNAME= emacs
5	PORTVERSION= ${EMACS_VER}	5	PORTVERSION= ${EMACS_VER}
6	PORTREVISION= 6
7	PORTEPOCH= 3	6	PORTEPOCH= 3
8	CATEGORIES= editors ipv6	7	CATEGORIES= editors ipv6
9	MASTER_SITES= ${MASTER_SITE_GNU}	8	MASTER_SITES= ${MASTER_SITE_GNU}
Lines 24-30 Link Here
24	xemacs-devel-mule-[0-9]* \	23	xemacs-devel-mule-[0-9]* \
25	emacs-devel-[0-9]*	24	emacs-devel-[0-9]*
26		25
27	EMACS_VER= 24.4	26	EMACS_VER= 24.5
28	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
29	USES= cpe gmake makeinfo ncurses pkgconfig shebangfix tar:xz	28	USES= cpe gmake makeinfo ncurses pkgconfig shebangfix tar:xz
30	CPPFLAGS+= -I${LOCALBASE}/include	29	CPPFLAGS+= -I${LOCALBASE}/include

Lines 1-4 Link Here

(-)distinfo (-4 / +2 lines)
1	SHA256 (emacs-24.4.tar.xz) = 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd	1	SHA256 (emacs-24.5.tar.xz) = dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e
2	SIZE (emacs-24.4.tar.xz) = 39733124	2	SIZE (emacs-24.5.tar.xz) = 39759804
3	SHA256 (emacs24.4canna-20141030.diff.gz) = 3c49cbdf9bf822c8d682568b63328c959a79edafa2ac73aa4e5c2d27059fcfa0
4	SIZE (emacs24.4canna-20141030.diff.gz) = 31687




$FreeBSD$

From the commit r117653, bug #18858

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-11-01 13:34:45 +0000
+++ lisp/ChangeLog	2014-11-01 14:08:00 +0000
@@ -1,3 +1,8 @@
+2014-11-01  Wolfgang Jenkner  <wjenkner@inode.at>
+
+	* net/tramp-sh.el (tramp-send-command): Fix the case where the
+	remote-echo connection property is non-nil (bug#18858).
+
 2014-11-01  Michael Albinus  <michael.albinus@gmx.de>
 
 	Backport Tramp changes from trunk.

=== modified file 'lisp/net/tramp-sh.el'
--- lisp/net/tramp-sh.el	2014-11-01 13:34:45 +0000
+++ lisp/net/tramp-sh.el	2014-11-01 14:08:00 +0000
@@ -4769,6 +4769,17 @@
     (when (tramp-get-connection-property p "remote-echo" nil)
       ;; We mark the command string that it can be erased in the output buffer.
       (tramp-set-connection-property p "check-remote-echo" t)
+      ;; If we put `tramp-echo-mark' after a trailing newline (which
+      ;; is assumed to be unquoted) `tramp-send-string' doesn't see
+      ;; that newline and adds `tramp-rsh-end-of-line' right after
+      ;; `tramp-echo-mark', so the remote shell sees two consecutive
+      ;; trailing line endings and sends two prompts after executing
+      ;; the command, which confuses `tramp-wait-for-output'.
+      (when (and (not (string= command ""))
+		 (string-equal (substring command -1) "\n"))
+	(setq command (substring command 0 -1)))
+      ;; No need to restore a trailing newline here since `tramp-send-string'
+      ;; makes sure that the string ends in `tramp-rsh-end-of-line', anyway.
       (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
     ;; Send the command.
     (tramp-message vec 6 "%s" command)





%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/warnings.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/crisp.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/crisp.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-gmrk.el.gz

%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/edt.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-edt.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-edt.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-extras.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-extras.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-mapper.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-mapper.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vi.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vi.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vip.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vip.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-ex.el.gz

%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-util.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/ws-mode.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/ws-mode.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/env.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/env.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/epa-dired.el.gz

%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-bidi.el
%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-brackets.el
%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-category.el
%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-combining.el
%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-comment.el

%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz

%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-extras.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-extras.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/yow.el.gz

%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-bytecomp.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-compat.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-compat.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-engine.el.gz

share/icons/hicolor/48x48/apps/emacs.png
share/icons/hicolor/scalable/apps/emacs.svg
share/icons/hicolor/scalable/mimetypes/emacs-document.svg
@dir %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-parallel

Return to bug 199553

Lines 1646-1653 Link Here

(-)pkg-plist (-16 / +18 lines)
1646	%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/warnings.elc	1646	%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/warnings.elc
1647	%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.el.gz	1647	%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.el.gz
1648	%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.elc	1648	%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.elc
1649	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/crisp.el.gz
1650	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/crisp.elc
1651	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.el.gz	1649	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.el.gz
1652	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.elc	1650	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.elc
1653	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-gmrk.el.gz	1651	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-gmrk.el.gz
Lines 1666-1681 Link Here
1666	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/edt.elc	1664	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/edt.elc
1667	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.el.gz	1665	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.el.gz
1668	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.elc	1666	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.elc
1669	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-edt.el.gz
1670	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-edt.elc
1671	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-extras.el.gz
1672	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-extras.elc
1673	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-mapper.el.gz
1674	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-mapper.elc
1675	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vi.el.gz
1676	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vi.elc
1677	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vip.el.gz
1678	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vip.elc
1679	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.el.gz	1667	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.el.gz
1680	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.elc	1668	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.elc
1681	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-ex.el.gz	1669	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-ex.el.gz
Lines 1692-1699 Link Here
1692	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-util.elc	1680	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-util.elc
1693	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.el.gz	1681	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.el.gz
1694	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.elc	1682	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.elc
1695	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/ws-mode.el.gz
1696	%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/ws-mode.elc
1697	%%DATADIR%%/%%EMACS_VER%%/lisp/env.el.gz	1683	%%DATADIR%%/%%EMACS_VER%%/lisp/env.el.gz
1698	%%DATADIR%%/%%EMACS_VER%%/lisp/env.elc	1684	%%DATADIR%%/%%EMACS_VER%%/lisp/env.elc
1699	%%DATADIR%%/%%EMACS_VER%%/lisp/epa-dired.el.gz	1685	%%DATADIR%%/%%EMACS_VER%%/lisp/epa-dired.el.gz
Lines 2268-2273 Link Here
2268	%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.el.gz	2254	%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.el.gz
2269	%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.elc	2255	%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.elc
2270	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-bidi.el	2256	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-bidi.el
		2257	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-brackets.el
2271	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-category.el	2258	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-category.el
2272	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-combining.el	2259	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-combining.el
2273	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-comment.el	2260	%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-comment.el
Lines 2848-2857 Link Here
2848	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz	2835	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
2849	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc	2836	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
2850	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el	2837	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el
		2838	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz
		2839	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.elc
2851	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.el.gz	2840	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.el.gz
2852	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.elc	2841	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.elc
2853	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.el.gz	2842	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.el.gz
2854	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.elc	2843	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.elc
		2844	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.el.gz
		2845	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.elc
2855	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.el.gz	2846	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.el.gz
2856	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc	2847	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc
2857	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz	2848	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz
Lines 2930-2937 Link Here
2930	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc	2921	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc
2931	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.el.gz	2922	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.el.gz
2932	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc	2923	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc
		2924	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.el.gz
		2925	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.elc
		2926	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-extras.el.gz
		2927	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-extras.elc
		2928	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.el.gz
		2929	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc
2933	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz	2930	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
2934	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc	2931	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
		2932	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz
		2933	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc
		2934	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz
		2935	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.elc
		2936	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.el.gz
		2937	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.elc
2935	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.el.gz	2938	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.el.gz
2936	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.elc	2939	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.elc
2937	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/yow.el.gz	2940	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/yow.el.gz
Lines 3251-3258 Link Here
3251	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-bytecomp.elc	3254	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-bytecomp.elc
3252	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.el.gz	3255	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.el.gz
3253	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.elc	3256	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.elc
3254	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-compat.el.gz
3255	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-compat.elc
3256	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.el.gz	3257	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.el.gz
3257	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.elc	3258	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.elc
3258	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-engine.el.gz	3259	%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-engine.el.gz
Lines 4041-4043 Link Here
4041	share/icons/hicolor/48x48/apps/emacs.png	4042	share/icons/hicolor/48x48/apps/emacs.png
4042	share/icons/hicolor/scalable/apps/emacs.svg	4043	share/icons/hicolor/scalable/apps/emacs.svg
4043	share/icons/hicolor/scalable/mimetypes/emacs-document.svg	4044	share/icons/hicolor/scalable/mimetypes/emacs-document.svg
		4045	@dir %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-parallel

Lines 1-39 Link Here

(-)files/patch-c117653.diff (-39 lines)
1	$FreeBSD$
2
3	From the commit r117653, bug #18858
4
5	=== modified file 'lisp/ChangeLog'
6	--- lisp/ChangeLog 2014-11-01 13:34:45 +0000
7	+++ lisp/ChangeLog 2014-11-01 14:08:00 +0000
8	@@ -1,3 +1,8 @@
9	+2014-11-01 Wolfgang Jenkner <wjenkner@inode.at>
10	+
11	+ * net/tramp-sh.el (tramp-send-command): Fix the case where the
12	+ remote-echo connection property is non-nil (bug#18858).
13	+
14	2014-11-01 Michael Albinus <michael.albinus@gmx.de>
15
16	Backport Tramp changes from trunk.
17
18	=== modified file 'lisp/net/tramp-sh.el'
19	--- lisp/net/tramp-sh.el 2014-11-01 13:34:45 +0000
20	+++ lisp/net/tramp-sh.el 2014-11-01 14:08:00 +0000
21	@@ -4769,6 +4769,17 @@
22	(when (tramp-get-connection-property p "remote-echo" nil)
23	;; We mark the command string that it can be erased in the output buffer.
24	(tramp-set-connection-property p "check-remote-echo" t)
25	+ ;; If we put `tramp-echo-mark' after a trailing newline (which
26	+ ;; is assumed to be unquoted) `tramp-send-string' doesn't see
27	+ ;; that newline and adds `tramp-rsh-end-of-line' right after
28	+ ;; `tramp-echo-mark', so the remote shell sees two consecutive
29	+ ;; trailing line endings and sends two prompts after executing
30	+ ;; the command, which confuses `tramp-wait-for-output'.
31	+ (when (and (not (string= command ""))
32	+ (string-equal (substring command -1) "\n"))
33	+ (setq command (substring command 0 -1)))
34	+ ;; No need to restore a trailing newline here since `tramp-send-string'
35	+ ;; makes sure that the string ends in `tramp-rsh-end-of-line', anyway.
36	(setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
37	;; Send the command.
38	(tramp-message vec 6 "%s" command)
39