diff options
| author | Joakim Verona | 2013-02-24 00:04:24 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-02-24 00:04:24 +0100 |
| commit | ceb10cfbad146ee9aef6a59a1af45cc39b1edb86 (patch) | |
| tree | 57f90b4bf417ec2da1fcf7fb8faa175476e41fba | |
| parent | 05a2b6a9e5b5a0d35ba1918bc657666692bcdc91 (diff) | |
| parent | 2ae3d73667b6b59480070b4e6b4f7802cacc3455 (diff) | |
| download | emacs-ceb10cfbad146ee9aef6a59a1af45cc39b1edb86.tar.gz emacs-ceb10cfbad146ee9aef6a59a1af45cc39b1edb86.zip | |
auto upstream
| -rw-r--r-- | lisp/ChangeLog | 38 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 21 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 12 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 92 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 17 | ||||
| -rw-r--r-- | lisp/progmodes/ps-mode.el | 9 | ||||
| -rw-r--r-- | lisp/progmodes/simula.el | 34 | ||||
| -rw-r--r-- | lisp/progmodes/vera-mode.el | 3 | ||||
| -rw-r--r-- | lisp/textmodes/artist.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/reftex.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-util.el | 2 |
11 files changed, 128 insertions, 104 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1555dfc43b6..1897e48d715 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,41 @@ | |||
| 1 | 2013-02-23 Peter Kleiweg <p.c.j.kleiweg@rug.nl> | ||
| 2 | |||
| 3 | * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i. | ||
| 4 | (ps-mode-octal-region): Use string-make-unibyte. | ||
| 5 | |||
| 6 | 2013-02-23 Glenn Morris <rgm@gnu.org> | ||
| 7 | |||
| 8 | * emulation/viper-cmd.el (viper-submit-report): | ||
| 9 | * progmodes/ps-mode.el (ps-mode-maintainer-address): | ||
| 10 | * progmodes/vera-mode.el (vera-mode-help-address): | ||
| 11 | * textmodes/artist.el (artist-maintainer-address): | ||
| 12 | * textmodes/reftex.el (reftex-report-bug): | ||
| 13 | * vc/ediff-util.el (ediff-submit-report): | ||
| 14 | Add bug-gnu-emacs to bug report address. | ||
| 15 | |||
| 16 | * progmodes/simula.el (simula-mode-menu, simula-mode-map): | ||
| 17 | Remove bug report entries. | ||
| 18 | (simula-mode-help-address, simula-submit-bug-report): Make obsolete. | ||
| 19 | |||
| 20 | * emacs-lisp/bytecomp.el (byte-compile-level): New. | ||
| 21 | (byte-compile-file, byte-compile-from-buffer): | ||
| 22 | Use separate input/output buffers for each level of recursive | ||
| 23 | byte-compile-file calls. (Bug#13787) | ||
| 24 | |||
| 25 | 2013-02-23 Michael Albinus <michael.albinus@gmx.de> | ||
| 26 | |||
| 27 | * net/tramp.el (tramp-methods): Fix docstring. | ||
| 28 | (tramp-ssh-controlmaster-options): Rename it from | ||
| 29 | `tramp-ssh-controlmaster-template'. Return a string. | ||
| 30 | (tramp-default-method): Adapt check for | ||
| 31 | `tramp-ssh-controlmaster-options'. | ||
| 32 | |||
| 33 | * net/tramp-sh.el (tramp-methods): Replace | ||
| 34 | `tramp-ssh-controlmaster-template' by "%c". | ||
| 35 | (tramp-do-copy-or-rename-file-out-of-band) | ||
| 36 | (tramp-maybe-open-connection): Use it in format spec. Ensure, | ||
| 37 | that it is applied for the first hop only. | ||
| 38 | |||
| 1 | 2013-02-22 Juri Linkov <juri@jurta.org> | 39 | 2013-02-22 Juri Linkov <juri@jurta.org> |
| 2 | 40 | ||
| 3 | * isearch.el (isearch-lazy-highlight-new-loop): | 41 | * isearch.el (isearch-lazy-highlight-new-loop): |
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 280a1bbc2dd..f5861550c9a 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el | |||
| @@ -1675,6 +1675,9 @@ If compilation is needed, this functions returns the result of | |||
| 1675 | (load (if (file-exists-p dest) dest filename))) | 1675 | (load (if (file-exists-p dest) dest filename))) |
| 1676 | 'no-byte-compile))) | 1676 | 'no-byte-compile))) |
| 1677 | 1677 | ||
| 1678 | (defvar byte-compile-level 0 ; bug#13787 | ||
| 1679 | "Depth of a recursive byte compilation.") | ||
| 1680 | |||
| 1678 | ;;;###autoload | 1681 | ;;;###autoload |
| 1679 | (defun byte-compile-file (filename &optional load) | 1682 | (defun byte-compile-file (filename &optional load) |
| 1680 | "Compile a file of Lisp code named FILENAME into a file of byte code. | 1683 | "Compile a file of Lisp code named FILENAME into a file of byte code. |
| @@ -1717,7 +1720,13 @@ The value is non-nil if there were no errors, nil if errors." | |||
| 1717 | (setq target-file (byte-compile-dest-file filename)) | 1720 | (setq target-file (byte-compile-dest-file filename)) |
| 1718 | (setq byte-compile-dest-file target-file) | 1721 | (setq byte-compile-dest-file target-file) |
| 1719 | (with-current-buffer | 1722 | (with-current-buffer |
| 1720 | (setq input-buffer (get-buffer-create " *Compiler Input*")) | 1723 | ;; It would be cleaner to use a temp buffer, but if there was |
| 1724 | ;; an error, we leave this buffer around for diagnostics. | ||
| 1725 | ;; Its name is documented in the lispref. | ||
| 1726 | (setq input-buffer (get-buffer-create | ||
| 1727 | (concat " *Compiler Input*" | ||
| 1728 | (if (zerop byte-compile-level) "" | ||
| 1729 | (format "-%s" byte-compile-level))))) | ||
| 1721 | (erase-buffer) | 1730 | (erase-buffer) |
| 1722 | (setq buffer-file-coding-system nil) | 1731 | (setq buffer-file-coding-system nil) |
| 1723 | ;; Always compile an Emacs Lisp file as multibyte | 1732 | ;; Always compile an Emacs Lisp file as multibyte |
| @@ -1770,12 +1779,15 @@ The value is non-nil if there were no errors, nil if errors." | |||
| 1770 | (when byte-compile-verbose | 1779 | (when byte-compile-verbose |
| 1771 | (message "Compiling %s..." filename)) | 1780 | (message "Compiling %s..." filename)) |
| 1772 | (setq byte-compiler-error-flag nil) | 1781 | (setq byte-compiler-error-flag nil) |
| 1782 | (setq byte-compile-level (1+ byte-compile-level)) | ||
| 1773 | ;; It is important that input-buffer not be current at this call, | 1783 | ;; It is important that input-buffer not be current at this call, |
| 1774 | ;; so that the value of point set in input-buffer | 1784 | ;; so that the value of point set in input-buffer |
| 1775 | ;; within byte-compile-from-buffer lingers in that buffer. | 1785 | ;; within byte-compile-from-buffer lingers in that buffer. |
| 1776 | (setq output-buffer | 1786 | (setq output-buffer |
| 1777 | (save-current-buffer | 1787 | (save-current-buffer |
| 1778 | (byte-compile-from-buffer input-buffer))) | 1788 | (unwind-protect |
| 1789 | (byte-compile-from-buffer input-buffer) | ||
| 1790 | (setq byte-compile-level (1- byte-compile-level))))) | ||
| 1779 | (if byte-compiler-error-flag | 1791 | (if byte-compiler-error-flag |
| 1780 | nil | 1792 | nil |
| 1781 | (when byte-compile-verbose | 1793 | (when byte-compile-verbose |
| @@ -1881,7 +1893,10 @@ With argument ARG, insert value in current buffer after the form." | |||
| 1881 | (byte-compile-close-variables | 1893 | (byte-compile-close-variables |
| 1882 | (with-current-buffer | 1894 | (with-current-buffer |
| 1883 | (setq byte-compile--outbuffer | 1895 | (setq byte-compile--outbuffer |
| 1884 | (get-buffer-create " *Compiler Output*")) | 1896 | (get-buffer-create |
| 1897 | (concat " *Compiler Output*" | ||
| 1898 | (if (<= byte-compile-level 1) "" | ||
| 1899 | (format "-%s" (1- byte-compile-level)))))) | ||
| 1885 | (set-buffer-multibyte t) | 1900 | (set-buffer-multibyte t) |
| 1886 | (erase-buffer) | 1901 | (erase-buffer) |
| 1887 | ;; (emacs-lisp-mode) | 1902 | ;; (emacs-lisp-mode) |
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 6945e870604..3813c304de1 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el | |||
| @@ -5085,12 +5085,12 @@ Mail anyway (y or n)? ") | |||
| 5085 | (require 'reporter) | 5085 | (require 'reporter) |
| 5086 | (set-window-configuration window-config) | 5086 | (set-window-configuration window-config) |
| 5087 | 5087 | ||
| 5088 | (reporter-submit-bug-report "kifer@cs.stonybrook.edu" | 5088 | (reporter-submit-bug-report |
| 5089 | (viper-version) | 5089 | "kifer@cs.stonybrook.edu, bug-gnu-emacs@gnu.org" |
| 5090 | varlist | 5090 | (viper-version) |
| 5091 | nil 'delete-other-windows | 5091 | varlist |
| 5092 | salutation) | 5092 | nil 'delete-other-windows |
| 5093 | )) | 5093 | salutation))) |
| 5094 | 5094 | ||
| 5095 | 5095 | ||
| 5096 | 5096 | ||
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index f2dc514116a..e63acb6b40e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -109,17 +109,15 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 109 | (tramp-copy-keep-date t))) | 109 | (tramp-copy-keep-date t))) |
| 110 | ;;;###tramp-autoload | 110 | ;;;###tramp-autoload |
| 111 | (add-to-list 'tramp-methods | 111 | (add-to-list 'tramp-methods |
| 112 | `("scp" | 112 | '("scp" |
| 113 | (tramp-login-program "ssh") | 113 | (tramp-login-program "ssh") |
| 114 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 114 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 115 | ,tramp-ssh-controlmaster-template | ||
| 116 | ("-e" "none") ("%h"))) | 115 | ("-e" "none") ("%h"))) |
| 117 | (tramp-async-args (("-q"))) | 116 | (tramp-async-args (("-q"))) |
| 118 | (tramp-remote-shell "/bin/sh") | 117 | (tramp-remote-shell "/bin/sh") |
| 119 | (tramp-remote-shell-args ("-c")) | 118 | (tramp-remote-shell-args ("-c")) |
| 120 | (tramp-copy-program "scp") | 119 | (tramp-copy-program "scp") |
| 121 | (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r") | 120 | (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r") ("%c"))) |
| 122 | ,tramp-ssh-controlmaster-template)) | ||
| 123 | (tramp-copy-keep-date t) | 121 | (tramp-copy-keep-date t) |
| 124 | (tramp-copy-recursive t) | 122 | (tramp-copy-recursive t) |
| 125 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") | 123 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") |
| @@ -128,17 +126,16 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 128 | (tramp-default-port 22))) | 126 | (tramp-default-port 22))) |
| 129 | ;;;###tramp-autoload | 127 | ;;;###tramp-autoload |
| 130 | (add-to-list 'tramp-methods | 128 | (add-to-list 'tramp-methods |
| 131 | `("scp1" | 129 | '("scp1" |
| 132 | (tramp-login-program "ssh") | 130 | (tramp-login-program "ssh") |
| 133 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 131 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 134 | ,tramp-ssh-controlmaster-template | ||
| 135 | ("-1") ("-e" "none") ("%h"))) | 132 | ("-1") ("-e" "none") ("%h"))) |
| 136 | (tramp-async-args (("-q"))) | 133 | (tramp-async-args (("-q"))) |
| 137 | (tramp-remote-shell "/bin/sh") | 134 | (tramp-remote-shell "/bin/sh") |
| 138 | (tramp-remote-shell-args ("-c")) | 135 | (tramp-remote-shell-args ("-c")) |
| 139 | (tramp-copy-program "scp") | 136 | (tramp-copy-program "scp") |
| 140 | (tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k") ("-q") ("-r") | 137 | (tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k") |
| 141 | ,tramp-ssh-controlmaster-template)) | 138 | ("-q") ("-r") ("%c"))) |
| 142 | (tramp-copy-keep-date t) | 139 | (tramp-copy-keep-date t) |
| 143 | (tramp-copy-recursive t) | 140 | (tramp-copy-recursive t) |
| 144 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") | 141 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") |
| @@ -147,17 +144,16 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 147 | (tramp-default-port 22))) | 144 | (tramp-default-port 22))) |
| 148 | ;;;###tramp-autoload | 145 | ;;;###tramp-autoload |
| 149 | (add-to-list 'tramp-methods | 146 | (add-to-list 'tramp-methods |
| 150 | `("scp2" | 147 | '("scp2" |
| 151 | (tramp-login-program "ssh") | 148 | (tramp-login-program "ssh") |
| 152 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 149 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 153 | ,tramp-ssh-controlmaster-template | ||
| 154 | ("-2") ("-e" "none") ("%h"))) | 150 | ("-2") ("-e" "none") ("%h"))) |
| 155 | (tramp-async-args (("-q"))) | 151 | (tramp-async-args (("-q"))) |
| 156 | (tramp-remote-shell "/bin/sh") | 152 | (tramp-remote-shell "/bin/sh") |
| 157 | (tramp-remote-shell-args ("-c")) | 153 | (tramp-remote-shell-args ("-c")) |
| 158 | (tramp-copy-program "scp") | 154 | (tramp-copy-program "scp") |
| 159 | (tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k") ("-q") ("-r") | 155 | (tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k") |
| 160 | ,tramp-ssh-controlmaster-template)) | 156 | ("-q") ("-r") ("%c"))) |
| 161 | (tramp-copy-keep-date t) | 157 | (tramp-copy-keep-date t) |
| 162 | (tramp-copy-recursive t) | 158 | (tramp-copy-recursive t) |
| 163 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") | 159 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") |
| @@ -166,17 +162,16 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 166 | (tramp-default-port 22))) | 162 | (tramp-default-port 22))) |
| 167 | ;;;###tramp-autoload | 163 | ;;;###tramp-autoload |
| 168 | (add-to-list 'tramp-methods | 164 | (add-to-list 'tramp-methods |
| 169 | `("scpx" | 165 | '("scpx" |
| 170 | (tramp-login-program "ssh") | 166 | (tramp-login-program "ssh") |
| 171 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 167 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 172 | ,tramp-ssh-controlmaster-template | ||
| 173 | ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh"))) | 168 | ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh"))) |
| 174 | (tramp-async-args (("-q"))) | 169 | (tramp-async-args (("-q"))) |
| 175 | (tramp-remote-shell "/bin/sh") | 170 | (tramp-remote-shell "/bin/sh") |
| 176 | (tramp-remote-shell-args ("-c")) | 171 | (tramp-remote-shell-args ("-c")) |
| 177 | (tramp-copy-program "scp") | 172 | (tramp-copy-program "scp") |
| 178 | (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r") | 173 | (tramp-copy-args (("-P" "%p") ("-p" "%k") |
| 179 | ,tramp-ssh-controlmaster-template)) | 174 | ("-q") ("-r") ("%c"))) |
| 180 | (tramp-copy-keep-date t) | 175 | (tramp-copy-keep-date t) |
| 181 | (tramp-copy-recursive t) | 176 | (tramp-copy-recursive t) |
| 182 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") | 177 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") |
| @@ -185,34 +180,27 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 185 | (tramp-default-port 22))) | 180 | (tramp-default-port 22))) |
| 186 | ;;;###tramp-autoload | 181 | ;;;###tramp-autoload |
| 187 | (add-to-list 'tramp-methods | 182 | (add-to-list 'tramp-methods |
| 188 | `("sftp" | 183 | '("sftp" |
| 189 | (tramp-login-program "ssh") | 184 | (tramp-login-program "ssh") |
| 190 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 185 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 191 | ,tramp-ssh-controlmaster-template | ||
| 192 | ("-e" "none") ("%h"))) | 186 | ("-e" "none") ("%h"))) |
| 193 | (tramp-async-args (("-q"))) | 187 | (tramp-async-args (("-q"))) |
| 194 | (tramp-remote-shell "/bin/sh") | 188 | (tramp-remote-shell "/bin/sh") |
| 195 | (tramp-remote-shell-args ("-c")) | 189 | (tramp-remote-shell-args ("-c")) |
| 196 | (tramp-copy-program "sftp") | 190 | (tramp-copy-program "sftp") |
| 197 | (tramp-copy-args ,tramp-ssh-controlmaster-template))) | 191 | (tramp-copy-args ("%c")))) |
| 198 | ;;;###tramp-autoload | 192 | ;;;###tramp-autoload |
| 199 | (add-to-list 'tramp-methods | 193 | (add-to-list 'tramp-methods |
| 200 | `("rsync" | 194 | '("rsync" |
| 201 | (tramp-login-program "ssh") | 195 | (tramp-login-program "ssh") |
| 202 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 196 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 203 | ,tramp-ssh-controlmaster-template | ||
| 204 | ("-e" "none") ("%h"))) | 197 | ("-e" "none") ("%h"))) |
| 205 | (tramp-async-args (("-q"))) | 198 | (tramp-async-args (("-q"))) |
| 206 | (tramp-remote-shell "/bin/sh") | 199 | (tramp-remote-shell "/bin/sh") |
| 207 | (tramp-remote-shell-args ("-c")) | 200 | (tramp-remote-shell-args ("-c")) |
| 208 | (tramp-copy-program "rsync") | 201 | (tramp-copy-program "rsync") |
| 209 | (tramp-copy-args (("-t" "%k") ("-r"))) | 202 | (tramp-copy-args (("-t" "%k") ("-r"))) |
| 210 | (tramp-copy-env (("RSYNC_RSH") | 203 | (tramp-copy-env (("RSYNC_RSH") ("ssh" "%c"))) |
| 211 | (,(mapconcat | ||
| 212 | 'identity | ||
| 213 | (append | ||
| 214 | '("ssh") tramp-ssh-controlmaster-template) | ||
| 215 | " ")))) | ||
| 216 | (tramp-copy-keep-date t) | 204 | (tramp-copy-keep-date t) |
| 217 | (tramp-copy-keep-tmpfile t) | 205 | (tramp-copy-keep-tmpfile t) |
| 218 | (tramp-copy-recursive t))) | 206 | (tramp-copy-recursive t))) |
| @@ -232,10 +220,9 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 232 | (tramp-remote-shell-args ("-c")))) | 220 | (tramp-remote-shell-args ("-c")))) |
| 233 | ;;;###tramp-autoload | 221 | ;;;###tramp-autoload |
| 234 | (add-to-list 'tramp-methods | 222 | (add-to-list 'tramp-methods |
| 235 | `("ssh" | 223 | '("ssh" |
| 236 | (tramp-login-program "ssh") | 224 | (tramp-login-program "ssh") |
| 237 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 225 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 238 | ,tramp-ssh-controlmaster-template | ||
| 239 | ("-e" "none") ("%h"))) | 226 | ("-e" "none") ("%h"))) |
| 240 | (tramp-async-args (("-q"))) | 227 | (tramp-async-args (("-q"))) |
| 241 | (tramp-remote-shell "/bin/sh") | 228 | (tramp-remote-shell "/bin/sh") |
| @@ -246,10 +233,9 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 246 | (tramp-default-port 22))) | 233 | (tramp-default-port 22))) |
| 247 | ;;;###tramp-autoload | 234 | ;;;###tramp-autoload |
| 248 | (add-to-list 'tramp-methods | 235 | (add-to-list 'tramp-methods |
| 249 | `("ssh1" | 236 | '("ssh1" |
| 250 | (tramp-login-program "ssh") | 237 | (tramp-login-program "ssh") |
| 251 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 238 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 252 | ,tramp-ssh-controlmaster-template | ||
| 253 | ("-1") ("-e" "none") ("%h"))) | 239 | ("-1") ("-e" "none") ("%h"))) |
| 254 | (tramp-async-args (("-q"))) | 240 | (tramp-async-args (("-q"))) |
| 255 | (tramp-remote-shell "/bin/sh") | 241 | (tramp-remote-shell "/bin/sh") |
| @@ -260,10 +246,9 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 260 | (tramp-default-port 22))) | 246 | (tramp-default-port 22))) |
| 261 | ;;;###tramp-autoload | 247 | ;;;###tramp-autoload |
| 262 | (add-to-list 'tramp-methods | 248 | (add-to-list 'tramp-methods |
| 263 | `("ssh2" | 249 | '("ssh2" |
| 264 | (tramp-login-program "ssh") | 250 | (tramp-login-program "ssh") |
| 265 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 251 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 266 | ,tramp-ssh-controlmaster-template | ||
| 267 | ("-2") ("-e" "none") ("%h"))) | 252 | ("-2") ("-e" "none") ("%h"))) |
| 268 | (tramp-async-args (("-q"))) | 253 | (tramp-async-args (("-q"))) |
| 269 | (tramp-remote-shell "/bin/sh") | 254 | (tramp-remote-shell "/bin/sh") |
| @@ -274,10 +259,9 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 274 | (tramp-default-port 22))) | 259 | (tramp-default-port 22))) |
| 275 | ;;;###tramp-autoload | 260 | ;;;###tramp-autoload |
| 276 | (add-to-list 'tramp-methods | 261 | (add-to-list 'tramp-methods |
| 277 | `("sshx" | 262 | '("sshx" |
| 278 | (tramp-login-program "ssh") | 263 | (tramp-login-program "ssh") |
| 279 | (tramp-login-args (("-l" "%u") ("-p" "%p") | 264 | (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") |
| 280 | ,tramp-ssh-controlmaster-template | ||
| 281 | ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh"))) | 265 | ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh"))) |
| 282 | (tramp-async-args (("-q"))) | 266 | (tramp-async-args (("-q"))) |
| 283 | (tramp-remote-shell "/bin/sh") | 267 | (tramp-remote-shell "/bin/sh") |
| @@ -2274,7 +2258,7 @@ The method used must be an out-of-band method." | |||
| 2274 | (t2 (tramp-tramp-file-p newname)) | 2258 | (t2 (tramp-tramp-file-p newname)) |
| 2275 | (orig-vec (tramp-dissect-file-name (if t1 filename newname))) | 2259 | (orig-vec (tramp-dissect-file-name (if t1 filename newname))) |
| 2276 | copy-program copy-args copy-env copy-keep-date port spec | 2260 | copy-program copy-args copy-env copy-keep-date port spec |
| 2277 | source target) | 2261 | options source target) |
| 2278 | 2262 | ||
| 2279 | (with-parsed-tramp-file-name (if t1 filename newname) nil | 2263 | (with-parsed-tramp-file-name (if t1 filename newname) nil |
| 2280 | (if (and t1 t2) | 2264 | (if (and t1 t2) |
| @@ -2342,9 +2326,11 @@ The method used must be an out-of-band method." | |||
| 2342 | user (or user "") | 2326 | user (or user "") |
| 2343 | port (or port "") | 2327 | port (or port "") |
| 2344 | spec (format-spec-make | 2328 | spec (format-spec-make |
| 2345 | ?h host ?u user ?p port | ||
| 2346 | ?t (tramp-get-connection-property | 2329 | ?t (tramp-get-connection-property |
| 2347 | (tramp-get-connection-process v) "temp-file" "") | 2330 | (tramp-get-connection-process v) "temp-file" "")) |
| 2331 | options (format-spec tramp-ssh-controlmaster-options spec) | ||
| 2332 | spec (format-spec-make | ||
| 2333 | ?h host ?u user ?p port ?c options | ||
| 2348 | ?k (if keep-date " " "")) | 2334 | ?k (if keep-date " " "")) |
| 2349 | copy-program (tramp-get-method-parameter | 2335 | copy-program (tramp-get-method-parameter |
| 2350 | method 'tramp-copy-program) | 2336 | method 'tramp-copy-program) |
| @@ -4404,6 +4390,9 @@ connection if a previous connection has died for some reason." | |||
| 4404 | (setenv "PROMPT_COMMAND") | 4390 | (setenv "PROMPT_COMMAND") |
| 4405 | (setenv "PS1" tramp-initial-end-of-output) | 4391 | (setenv "PS1" tramp-initial-end-of-output) |
| 4406 | (let* ((target-alist (tramp-compute-multi-hops vec)) | 4392 | (let* ((target-alist (tramp-compute-multi-hops vec)) |
| 4393 | ;; We will apply `tramp-ssh-controlmaster-options' | ||
| 4394 | ;; only for the first hop. | ||
| 4395 | (options tramp-ssh-controlmaster-options) | ||
| 4407 | (process-connection-type tramp-process-connection-type) | 4396 | (process-connection-type tramp-process-connection-type) |
| 4408 | (process-adaptive-read-buffering nil) | 4397 | (process-adaptive-read-buffering nil) |
| 4409 | (coding-system-for-read nil) | 4398 | (coding-system-for-read nil) |
| @@ -4508,8 +4497,10 @@ connection if a previous connection has died for some reason." | |||
| 4508 | l-host (or l-host "") | 4497 | l-host (or l-host "") |
| 4509 | l-user (or l-user "") | 4498 | l-user (or l-user "") |
| 4510 | l-port (or l-port "") | 4499 | l-port (or l-port "") |
| 4500 | spec (format-spec-make ?t tmpfile) | ||
| 4501 | options (format-spec options spec) | ||
| 4511 | spec (format-spec-make | 4502 | spec (format-spec-make |
| 4512 | ?h l-host ?u l-user ?p l-port ?t tmpfile) | 4503 | ?h l-host ?u l-user ?p l-port ?c options) |
| 4513 | command | 4504 | command |
| 4514 | (concat | 4505 | (concat |
| 4515 | ;; We do not want to see the trailing local | 4506 | ;; We do not want to see the trailing local |
| @@ -4536,7 +4527,8 @@ connection if a previous connection has died for some reason." | |||
| 4536 | (tramp-message | 4527 | (tramp-message |
| 4537 | vec 3 "Found remote shell prompt on `%s'" l-host)) | 4528 | vec 3 "Found remote shell prompt on `%s'" l-host)) |
| 4538 | ;; Next hop. | 4529 | ;; Next hop. |
| 4539 | (setq target-alist (cdr target-alist))) | 4530 | (setq options "" |
| 4531 | target-alist (cdr target-alist))) | ||
| 4540 | 4532 | ||
| 4541 | ;; Make initial shell settings. | 4533 | ;; Make initial shell settings. |
| 4542 | (tramp-open-connection-setup-interactive-shell p vec)))) | 4534 | (tramp-open-connection-setup-interactive-shell p vec)))) |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index fe4959715d5..e5e69492130 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -220,7 +220,8 @@ pair of the form (KEY VALUE). The following KEYs are defined: | |||
| 220 | argument. By this, arguments like (\"-l\" \"%u\") are optional. | 220 | argument. By this, arguments like (\"-l\" \"%u\") are optional. |
| 221 | \"%t\" is replaced by the temporary file name produced with | 221 | \"%t\" is replaced by the temporary file name produced with |
| 222 | `tramp-make-tramp-temp-file'. \"%k\" indicates the keep-date | 222 | `tramp-make-tramp-temp-file'. \"%k\" indicates the keep-date |
| 223 | parameter of a program, if exists. | 223 | parameter of a program, if exists. \"%c\" adds additional |
| 224 | `tramp-ssh-controlmaster-options' options for the first hop. | ||
| 224 | * `tramp-async-args' | 225 | * `tramp-async-args' |
| 225 | When an asynchronous process is started, we know already that | 226 | When an asynchronous process is started, we know already that |
| 226 | the connection works. Therefore, we can pass additional | 227 | the connection works. Therefore, we can pass additional |
| @@ -281,25 +282,23 @@ started on the local host. You should specify a remote host | |||
| 281 | useful only in combination with `tramp-default-proxies-alist'.") | 282 | useful only in combination with `tramp-default-proxies-alist'.") |
| 282 | 283 | ||
| 283 | ;;;###tramp-autoload | 284 | ;;;###tramp-autoload |
| 284 | (defconst tramp-ssh-controlmaster-template | 285 | (defconst tramp-ssh-controlmaster-options |
| 285 | (let (result) | 286 | (let ((result "")) |
| 286 | (ignore-errors | 287 | (ignore-errors |
| 287 | (with-temp-buffer | 288 | (with-temp-buffer |
| 288 | (call-process "ssh" nil t nil "-o" "ControlMaster") | 289 | (call-process "ssh" nil t nil "-o" "ControlMaster") |
| 289 | (goto-char (point-min)) | 290 | (goto-char (point-min)) |
| 290 | (when (search-forward-regexp "Missing ControlMaster argument" nil t) | 291 | (when (search-forward-regexp "Missing ControlMaster argument" nil t) |
| 291 | (setq result | 292 | (setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto"))) |
| 292 | '("-o" "ControlPath=%t.%%r@%%h:%%p" | ||
| 293 | "-o" "ControlMaster=auto")))) | ||
| 294 | (when result | 293 | (when result |
| 295 | (with-temp-buffer | 294 | (with-temp-buffer |
| 296 | (call-process "ssh" nil t nil "-o" "ControlPersist") | 295 | (call-process "ssh" nil t nil "-o" "ControlPersist") |
| 297 | (goto-char (point-min)) | 296 | (goto-char (point-min)) |
| 298 | (when (search-forward-regexp "Missing ControlPersist argument" nil t) | 297 | (when (search-forward-regexp "Missing ControlPersist argument" nil t) |
| 299 | (setq result (append result '("-o" "ControlPersist=no"))))))) | 298 | (setq result (concat result " -o ControlPersist=no")))))) |
| 300 | result) | 299 | result) |
| 301 | "Call ssh to detect whether it supports the Control* arguments. | 300 | "Call ssh to detect whether it supports the Control* arguments. |
| 302 | Return a template to be used in `tramp-methods'.") | 301 | Return a string to be used in `tramp-methods'.") |
| 303 | 302 | ||
| 304 | (defcustom tramp-default-method | 303 | (defcustom tramp-default-method |
| 305 | ;; An external copy method seems to be preferred, because it performs | 304 | ;; An external copy method seems to be preferred, because it performs |
| @@ -333,7 +332,7 @@ Return a template to be used in `tramp-methods'.") | |||
| 333 | (getenv "SSH_AUTH_SOCK") | 332 | (getenv "SSH_AUTH_SOCK") |
| 334 | (getenv "SSH_AGENT_PID") | 333 | (getenv "SSH_AGENT_PID") |
| 335 | ;; We could reuse the connection. | 334 | ;; We could reuse the connection. |
| 336 | tramp-ssh-controlmaster-template) | 335 | (> (length tramp-ssh-controlmaster-options) 0)) |
| 337 | "scp" | 336 | "scp" |
| 338 | "ssh")) | 337 | "ssh")) |
| 339 | ;; Fallback. | 338 | ;; Fallback. |
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 184de99302e..0f994a8422b 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Peter Kleiweg <p.c.j.kleiweg@rug.nl> | 5 | ;; Author: Peter Kleiweg <p.c.j.kleiweg@rug.nl> |
| 6 | ;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl> | 6 | ;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl> |
| 7 | ;; Created: 20 Aug 1997 | 7 | ;; Created: 20 Aug 1997 |
| 8 | ;; Version: 1.1h | 8 | ;; Version: 1.1i |
| 9 | ;; Keywords: PostScript, languages | 9 | ;; Keywords: PostScript, languages |
| 10 | 10 | ||
| 11 | ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this | 11 | ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this |
| @@ -35,8 +35,9 @@ | |||
| 35 | 35 | ||
| 36 | ;;; Code: | 36 | ;;; Code: |
| 37 | 37 | ||
| 38 | (defconst ps-mode-version "1.1h, 16 Jun 2005") | 38 | (defconst ps-mode-version "1.1i, 17 May 2008") |
| 39 | (defconst ps-mode-maintainer-address "Peter Kleiweg <p.c.j.kleiweg@rug.nl>") | 39 | (defconst ps-mode-maintainer-address |
| 40 | "Peter Kleiweg <p.c.j.kleiweg@rug.nl>, bug-gnu-emacs@gnu.org") | ||
| 40 | 41 | ||
| 41 | (require 'comint) | 42 | (require 'comint) |
| 42 | (require 'easymenu) | 43 | (require 'easymenu) |
| @@ -805,7 +806,7 @@ Only one `%' is removed, and it has to be in the first column." | |||
| 805 | (while (re-search-forward "[\200-\377]" (marker-position endm) t) | 806 | (while (re-search-forward "[\200-\377]" (marker-position endm) t) |
| 806 | (setq i (1+ i)) | 807 | (setq i (1+ i)) |
| 807 | (backward-char) | 808 | (backward-char) |
| 808 | (insert (format "\\%03o" (string-to-char (buffer-substring (point) (1+ (point)))))) | 809 | (insert (format "\\%03o" (string-to-char (string-make-unibyte (buffer-substring (point) (1+ (point))))))) |
| 809 | (delete-char 1)) | 810 | (delete-char 1)) |
| 810 | (message "%d change%s made" i (if (= i 1) "" "s")) | 811 | (message "%d change%s made" i (if (= i 1) "" "s")) |
| 811 | (set-marker endm nil))))) | 812 | (set-marker endm nil))))) |
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index d71c9adbef4..77732ed3241 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el | |||
| @@ -244,8 +244,7 @@ for SIMULA mode to function correctly." | |||
| 244 | ; it determines the flavor of the Emacs running | 244 | ; it determines the flavor of the Emacs running |
| 245 | 245 | ||
| 246 | (defvar simula-mode-menu | 246 | (defvar simula-mode-menu |
| 247 | '(["Report Bug" simula-submit-bug-report t] | 247 | '(["Indent Line" simula-indent-line t] |
| 248 | ["Indent Line" simula-indent-line t] | ||
| 249 | ["Backward Statement" simula-previous-statement t] | 248 | ["Backward Statement" simula-previous-statement t] |
| 250 | ["Forward Statement" simula-next-statement t] | 249 | ["Forward Statement" simula-next-statement t] |
| 251 | ["Backward Up Level" simula-backward-up-level t] | 250 | ["Backward Up Level" simula-backward-up-level t] |
| @@ -286,10 +285,6 @@ for SIMULA mode to function correctly." | |||
| 286 | ;; Emacs 19 defines menus in the mode map | 285 | ;; Emacs 19 defines menus in the mode map |
| 287 | (define-key map [menu-bar simula] | 286 | (define-key map [menu-bar simula] |
| 288 | (cons "SIMULA" (make-sparse-keymap "SIMULA"))) | 287 | (cons "SIMULA" (make-sparse-keymap "SIMULA"))) |
| 289 | (define-key map [menu-bar simula bug-report] | ||
| 290 | '("Submit Bug Report" . simula-submit-bug-report)) | ||
| 291 | (define-key map [menu-bar simula separator-indent] | ||
| 292 | '("--")) | ||
| 293 | (define-key map [menu-bar simula indent-exp] | 288 | (define-key map [menu-bar simula indent-exp] |
| 294 | '("Indent Expression" . simula-indent-exp)) | 289 | '("Indent Expression" . simula-indent-exp)) |
| 295 | (define-key map [menu-bar simula indent-line] | 290 | (define-key map [menu-bar simula indent-line] |
| @@ -1622,28 +1617,11 @@ If not nil and not t, move to limit of search and return nil." | |||
| 1622 | (defconst simula-mode-help-address "bug-gnu-emacs@gnu.org" | 1617 | (defconst simula-mode-help-address "bug-gnu-emacs@gnu.org" |
| 1623 | "Address accepting submission of `simula-mode' bug reports.") | 1618 | "Address accepting submission of `simula-mode' bug reports.") |
| 1624 | 1619 | ||
| 1625 | (defun simula-submit-bug-report () | 1620 | (make-obsolete-variable 'simula-mode-help-address 'report-emacs-bug-address |
| 1626 | "Submit via mail a bug report on `simula-mode'." | 1621 | "24.4") |
| 1627 | (interactive) | 1622 | |
| 1628 | (and | 1623 | (define-obsolete-function-alias 'simula-submit-bug-report |
| 1629 | (y-or-n-p "Do you want to submit a report on simula-mode? ") | 1624 | 'report-emacs-bug "24.4") |
| 1630 | (reporter-submit-bug-report | ||
| 1631 | simula-mode-help-address | ||
| 1632 | (concat "simula-mode from Emacs " emacs-version) | ||
| 1633 | (list | ||
| 1634 | ;; report only the vars that affect indentation | ||
| 1635 | 'simula-indent-level | ||
| 1636 | 'simula-substatement-offset | ||
| 1637 | 'simula-continued-statement-offset | ||
| 1638 | 'simula-label-offset | ||
| 1639 | 'simula-if-indent | ||
| 1640 | 'simula-inspect-indent | ||
| 1641 | 'simula-electric-indent | ||
| 1642 | 'simula-abbrev-keyword | ||
| 1643 | 'simula-abbrev-stdproc | ||
| 1644 | 'simula-abbrev-file | ||
| 1645 | 'simula-tab-always-indent | ||
| 1646 | )))) | ||
| 1647 | 1625 | ||
| 1648 | (provide 'simula) | 1626 | (provide 'simula) |
| 1649 | 1627 | ||
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el index 0c456d3b944..7b59faca261 100644 --- a/lisp/progmodes/vera-mode.el +++ b/lisp/progmodes/vera-mode.el | |||
| @@ -1423,7 +1423,8 @@ If `vera-intelligent-tab' is nil, always indent line." | |||
| 1423 | ;;; Bug reports | 1423 | ;;; Bug reports |
| 1424 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 1424 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 1425 | 1425 | ||
| 1426 | (defconst vera-mode-help-address "Reto Zimmermann <reto@gnu.org>" | 1426 | (defconst vera-mode-help-address |
| 1427 | "Reto Zimmermann <reto@gnu.org>, bug-gnu-emacs@gnu.org" | ||
| 1427 | "Address for Vera Mode bug reports.") | 1428 | "Address for Vera Mode bug reports.") |
| 1428 | 1429 | ||
| 1429 | ;; get reporter-submit-bug-report when byte-compiling | 1430 | ;; get reporter-submit-bug-report when byte-compiling |
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index c2978b0ea40..2bd7283676e 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el | |||
| @@ -198,7 +198,7 @@ | |||
| 198 | ;; Variables | 198 | ;; Variables |
| 199 | 199 | ||
| 200 | (defconst artist-version "1.2.6") | 200 | (defconst artist-version "1.2.6") |
| 201 | (defconst artist-maintainer-address "tab@lysator.liu.se") | 201 | (defconst artist-maintainer-address "tab@lysator.liu.se, bug-gnu-emacs@gnu.org") |
| 202 | 202 | ||
| 203 | (defvar x-pointer-crosshair) | 203 | (defvar x-pointer-crosshair) |
| 204 | 204 | ||
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index a41409fc897..d5bb0170cd9 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el | |||
| @@ -2464,7 +2464,7 @@ information about your RefTeX version and configuration." | |||
| 2464 | (require 'reporter) | 2464 | (require 'reporter) |
| 2465 | (let ((reporter-prompt-for-summary-p "Bug report subject: ")) | 2465 | (let ((reporter-prompt-for-summary-p "Bug report subject: ")) |
| 2466 | (reporter-submit-bug-report | 2466 | (reporter-submit-bug-report |
| 2467 | "bug-auctex@gnu.org" | 2467 | "bug-auctex@gnu.org, bug-gnu-emacs@gnu.org" |
| 2468 | reftex-version | 2468 | reftex-version |
| 2469 | (list 'window-system | 2469 | (list 'window-system |
| 2470 | 'reftex-plug-into-AUCTeX) | 2470 | 'reftex-plug-into-AUCTeX) |
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index fd53aabd33c..81146c0c931 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el | |||
| @@ -4024,7 +4024,7 @@ Mail anyway? (y or n) ") | |||
| 4024 | (set-buffer ctl-buf)) | 4024 | (set-buffer ctl-buf)) |
| 4025 | (setq buffer-name (buffer-name)) | 4025 | (setq buffer-name (buffer-name)) |
| 4026 | (require 'reporter) | 4026 | (require 'reporter) |
| 4027 | (reporter-submit-bug-report "kifer@cs.stonybrook.edu" | 4027 | (reporter-submit-bug-report "kifer@cs.stonybrook.edu, bug-gnu-emacs@gnu.org" |
| 4028 | (ediff-version) | 4028 | (ediff-version) |
| 4029 | varlist | 4029 | varlist |
| 4030 | nil | 4030 | nil |