Now on revision 111867. ------------------------------------------------------------ revno: 111867 committer: Aidan Gauland branch nick: trunk timestamp: Sun 2013-02-24 18:34:22 +1300 message: * lisp/eshell/em-cmpl.el: Corrected "context-related help" keybinding in commentary. diff: === modified file 'ChangeLog' --- ChangeLog 2013-02-21 22:42:56 +0000 +++ ChangeLog 2013-02-24 05:34:22 +0000 @@ -1,3 +1,8 @@ +2013-02-18 Aidan Gauland + + * lisp/eshell/em-cmpl.el: Corrected "context-related help" + keybinding in commentary. + 2013-02-21 Paul Eggert Parallelize documentation builds. === modified file 'lisp/eshell/em-cmpl.el' --- lisp/eshell/em-cmpl.el 2013-01-01 09:11:05 +0000 +++ lisp/eshell/em-cmpl.el 2013-02-24 05:34:22 +0000 @@ -63,7 +63,7 @@ ;; The list of possible completions can be viewed at any point by ;; pressing . ;; -;; Finally, context-related help can be accessed by pressing . +;; Finally, context-related help can be accessed by pressing . ;; This only works well if the completion function has provided Eshell ;; with sufficient pointers to locate the relevant help text. ------------------------------------------------------------ revno: 111866 committer: Jay Belanger branch nick: trunk timestamp: Sat 2013-02-23 19:05:13 -0600 message: * calc/calc-ext.el (math-to-radians-2, math-from-radians-2): Add option to force `pi' to remain symbolic. * calc/calcalg2.el (calcFunc-sin, calcFunc-cos, calcFunc-tan) (calcFunc-cot, calcFunc-csc, calcFunc-sec, calcFunc-arcsin) (calcFunc-arccos, calcFunc-arctan): Use symbolic `pi' in the derivatives, when necessary. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-02-23 22:06:45 +0000 +++ lisp/ChangeLog 2013-02-24 01:05:13 +0000 @@ -1,3 +1,12 @@ +2013-02-24 Jay Belanger + + * calc/calc-ext.el (math-to-radians-2, math-from-radians-2): + Add option to force `pi' to remain symbolic. + * calc/calcalg2.el (calcFunc-sin, calcFunc-cos, calcFunc-tan) + (calcFunc-cot, calcFunc-csc, calcFunc-sec, calcFunc-arcsin) + (calcFunc-arccos, calcFunc-arctan): Use symbolic `pi' in the + derivatives, when necessary. + 2013-02-23 Peter Kleiweg * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i. === modified file 'lisp/calc/calc-math.el' --- lisp/calc/calc-math.el 2013-01-01 09:11:05 +0000 +++ lisp/calc/calc-math.el 2013-02-24 01:05:13 +0000 @@ -777,18 +777,18 @@ (math-to-hms a 'rad)) (t a))) -(defun math-to-radians-2 (a) ; [N N] +(defun math-to-radians-2 (a &optional force-symbolic) ; [N N] (cond ((eq (car-safe a) 'hms) (math-from-hms a 'rad)) ((memq calc-angle-mode '(deg hms)) - (if calc-symbolic-mode + (if (or calc-symbolic-mode force-symbolic) (math-div (math-mul a '(var pi var-pi)) 180) (math-mul a (math-pi-over-180)))) (t a))) -(defun math-from-radians-2 (a) ; [N N] +(defun math-from-radians-2 (a &optional force-symbolic) ; [N N] (cond ((memq calc-angle-mode '(deg hms)) - (if calc-symbolic-mode + (if (or calc-symbolic-mode force-symbolic) (math-div (math-mul 180 a) '(var pi var-pi)) (math-div a (math-pi-over-180)))) (t a))) === modified file 'lisp/calc/calcalg2.el' --- lisp/calc/calcalg2.el 2013-01-01 09:11:05 +0000 +++ lisp/calc/calcalg2.el 2013-02-24 01:05:13 +0000 @@ -401,18 +401,18 @@ (put 'calcFunc-sin\' 'math-derivative-1 (function (lambda (u) (math-to-radians-2 (math-normalize - (list 'calcFunc-cos u)))))) + (list 'calcFunc-cos u)) t)))) (put 'calcFunc-cos\' 'math-derivative-1 (function (lambda (u) (math-neg (math-to-radians-2 (math-normalize - (list 'calcFunc-sin u))))))) + (list 'calcFunc-sin u)) t))))) (put 'calcFunc-tan\' 'math-derivative-1 (function (lambda (u) (math-to-radians-2 (math-sqr (math-normalize - (list 'calcFunc-sec u))))))) + (list 'calcFunc-sec u))) t)))) (put 'calcFunc-sec\' 'math-derivative-1 (function (lambda (u) (math-to-radians-2 @@ -420,7 +420,7 @@ (math-normalize (list 'calcFunc-sec u)) (math-normalize - (list 'calcFunc-tan u))))))) + (list 'calcFunc-tan u))) t)))) (put 'calcFunc-csc\' 'math-derivative-1 (function (lambda (u) (math-neg @@ -429,32 +429,32 @@ (math-normalize (list 'calcFunc-csc u)) (math-normalize - (list 'calcFunc-cot u)))))))) + (list 'calcFunc-cot u))) t))))) (put 'calcFunc-cot\' 'math-derivative-1 (function (lambda (u) (math-neg (math-to-radians-2 (math-sqr (math-normalize - (list 'calcFunc-csc u)))))))) + (list 'calcFunc-csc u))) t))))) (put 'calcFunc-arcsin\' 'math-derivative-1 (function (lambda (u) (math-from-radians-2 (math-div 1 (math-normalize (list 'calcFunc-sqrt - (math-sub 1 (math-sqr u))))))))) + (math-sub 1 (math-sqr u))))) t)))) (put 'calcFunc-arccos\' 'math-derivative-1 (function (lambda (u) (math-from-radians-2 (math-div -1 (math-normalize (list 'calcFunc-sqrt - (math-sub 1 (math-sqr u))))))))) + (math-sub 1 (math-sqr u))))) t)))) (put 'calcFunc-arctan\' 'math-derivative-1 (function (lambda (u) (math-from-radians-2 - (math-div 1 (math-add 1 (math-sqr u))))))) + (math-div 1 (math-add 1 (math-sqr u))) t)))) (put 'calcFunc-sinh\' 'math-derivative-1 (function (lambda (u) (math-normalize (list 'calcFunc-cosh u))))) ------------------------------------------------------------ revno: 111865 author: Peter Kleiweg committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-02-23 14:06:45 -0800 message: Update ps-mode.el from upstream * lisp/progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i. (ps-mode-octal-region): Use string-make-unibyte. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-02-23 21:54:00 +0000 +++ lisp/ChangeLog 2013-02-23 22:06:45 +0000 @@ -1,3 +1,8 @@ +2013-02-23 Peter Kleiweg + + * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i. + (ps-mode-octal-region): Use string-make-unibyte. + 2013-02-23 Glenn Morris * emulation/viper-cmd.el (viper-submit-report): === modified file 'lisp/progmodes/ps-mode.el' --- lisp/progmodes/ps-mode.el 2013-02-23 21:54:00 +0000 +++ lisp/progmodes/ps-mode.el 2013-02-23 22:06:45 +0000 @@ -5,7 +5,7 @@ ;; Author: Peter Kleiweg ;; Maintainer: Peter Kleiweg ;; Created: 20 Aug 1997 -;; Version: 1.1h +;; Version: 1.1i ;; Keywords: PostScript, languages ;; Yoni Rabkin contacted the maintainer of this @@ -35,7 +35,7 @@ ;;; Code: -(defconst ps-mode-version "1.1h, 16 Jun 2005") +(defconst ps-mode-version "1.1i, 17 May 2008") (defconst ps-mode-maintainer-address "Peter Kleiweg , bug-gnu-emacs@gnu.org") @@ -806,7 +806,7 @@ (while (re-search-forward "[\200-\377]" (marker-position endm) t) (setq i (1+ i)) (backward-char) - (insert (format "\\%03o" (string-to-char (buffer-substring (point) (1+ (point)))))) + (insert (format "\\%03o" (string-to-char (string-make-unibyte (buffer-substring (point) (1+ (point))))))) (delete-char 1)) (message "%d change%s made" i (if (= i 1) "" "s")) (set-marker endm nil))))) ------------------------------------------------------------ revno: 111864 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-02-23 13:54:00 -0800 message: Add bug-gnu-emacs to some specialized bug report addresses * emulation/viper-cmd.el (viper-submit-report): * progmodes/ps-mode.el (ps-mode-maintainer-address): * progmodes/vera-mode.el (vera-mode-help-address): * textmodes/artist.el (artist-maintainer-address): * textmodes/reftex.el (reftex-report-bug): * vc/ediff-util.el (ediff-submit-report): Add bug-gnu-emacs to bug report address. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-02-23 21:49:41 +0000 +++ lisp/ChangeLog 2013-02-23 21:54:00 +0000 @@ -1,5 +1,13 @@ 2013-02-23 Glenn Morris + * emulation/viper-cmd.el (viper-submit-report): + * progmodes/ps-mode.el (ps-mode-maintainer-address): + * progmodes/vera-mode.el (vera-mode-help-address): + * textmodes/artist.el (artist-maintainer-address): + * textmodes/reftex.el (reftex-report-bug): + * vc/ediff-util.el (ediff-submit-report): + Add bug-gnu-emacs to bug report address. + * progmodes/simula.el (simula-mode-menu, simula-mode-map): Remove bug report entries. (simula-mode-help-address, simula-submit-bug-report): Make obsolete. === modified file 'lisp/emulation/viper-cmd.el' --- lisp/emulation/viper-cmd.el 2013-01-01 09:11:05 +0000 +++ lisp/emulation/viper-cmd.el 2013-02-23 21:54:00 +0000 @@ -5085,12 +5085,12 @@ (require 'reporter) (set-window-configuration window-config) - (reporter-submit-bug-report "kifer@cs.stonybrook.edu" - (viper-version) - varlist - nil 'delete-other-windows - salutation) - )) + (reporter-submit-bug-report + "kifer@cs.stonybrook.edu, bug-gnu-emacs@gnu.org" + (viper-version) + varlist + nil 'delete-other-windows + salutation))) === modified file 'lisp/progmodes/ps-mode.el' --- lisp/progmodes/ps-mode.el 2013-01-01 09:11:05 +0000 +++ lisp/progmodes/ps-mode.el 2013-02-23 21:54:00 +0000 @@ -36,7 +36,8 @@ ;;; Code: (defconst ps-mode-version "1.1h, 16 Jun 2005") -(defconst ps-mode-maintainer-address "Peter Kleiweg ") +(defconst ps-mode-maintainer-address + "Peter Kleiweg , bug-gnu-emacs@gnu.org") (require 'comint) (require 'easymenu) === modified file 'lisp/progmodes/vera-mode.el' --- lisp/progmodes/vera-mode.el 2013-01-01 09:11:05 +0000 +++ lisp/progmodes/vera-mode.el 2013-02-23 21:54:00 +0000 @@ -1423,7 +1423,8 @@ ;;; Bug reports ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defconst vera-mode-help-address "Reto Zimmermann " +(defconst vera-mode-help-address + "Reto Zimmermann , bug-gnu-emacs@gnu.org" "Address for Vera Mode bug reports.") ;; get reporter-submit-bug-report when byte-compiling === modified file 'lisp/textmodes/artist.el' --- lisp/textmodes/artist.el 2013-01-01 09:11:05 +0000 +++ lisp/textmodes/artist.el 2013-02-23 21:54:00 +0000 @@ -198,7 +198,7 @@ ;; Variables (defconst artist-version "1.2.6") -(defconst artist-maintainer-address "tab@lysator.liu.se") +(defconst artist-maintainer-address "tab@lysator.liu.se, bug-gnu-emacs@gnu.org") (defvar x-pointer-crosshair) === modified file 'lisp/textmodes/reftex.el' --- lisp/textmodes/reftex.el 2013-01-02 16:13:04 +0000 +++ lisp/textmodes/reftex.el 2013-02-23 21:54:00 +0000 @@ -2464,7 +2464,7 @@ (require 'reporter) (let ((reporter-prompt-for-summary-p "Bug report subject: ")) (reporter-submit-bug-report - "bug-auctex@gnu.org" + "bug-auctex@gnu.org, bug-gnu-emacs@gnu.org" reftex-version (list 'window-system 'reftex-plug-into-AUCTeX) === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2013-02-13 08:41:56 +0000 +++ lisp/vc/ediff-util.el 2013-02-23 21:54:00 +0000 @@ -4024,7 +4024,7 @@ (set-buffer ctl-buf)) (setq buffer-name (buffer-name)) (require 'reporter) - (reporter-submit-bug-report "kifer@cs.stonybrook.edu" + (reporter-submit-bug-report "kifer@cs.stonybrook.edu, bug-gnu-emacs@gnu.org" (ediff-version) varlist nil ------------------------------------------------------------ revno: 111863 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-02-23 13:49:41 -0800 message: Make simula.el special bug reporting obsolete * progmodes/simula.el (simula-mode-menu, simula-mode-map): Remove bug report entries. (simula-mode-help-address, simula-submit-bug-report): Make obsolete. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-02-23 21:14:36 +0000 +++ lisp/ChangeLog 2013-02-23 21:49:41 +0000 @@ -1,5 +1,9 @@ 2013-02-23 Glenn Morris + * progmodes/simula.el (simula-mode-menu, simula-mode-map): + Remove bug report entries. + (simula-mode-help-address, simula-submit-bug-report): Make obsolete. + * emacs-lisp/bytecomp.el (byte-compile-level): New. (byte-compile-file, byte-compile-from-buffer): Use separate input/output buffers for each level of recursive === modified file 'lisp/progmodes/simula.el' --- lisp/progmodes/simula.el 2013-01-01 09:11:05 +0000 +++ lisp/progmodes/simula.el 2013-02-23 21:49:41 +0000 @@ -244,8 +244,7 @@ ; it determines the flavor of the Emacs running (defvar simula-mode-menu - '(["Report Bug" simula-submit-bug-report t] - ["Indent Line" simula-indent-line t] + '(["Indent Line" simula-indent-line t] ["Backward Statement" simula-previous-statement t] ["Forward Statement" simula-next-statement t] ["Backward Up Level" simula-backward-up-level t] @@ -286,10 +285,6 @@ ;; Emacs 19 defines menus in the mode map (define-key map [menu-bar simula] (cons "SIMULA" (make-sparse-keymap "SIMULA"))) - (define-key map [menu-bar simula bug-report] - '("Submit Bug Report" . simula-submit-bug-report)) - (define-key map [menu-bar simula separator-indent] - '("--")) (define-key map [menu-bar simula indent-exp] '("Indent Expression" . simula-indent-exp)) (define-key map [menu-bar simula indent-line] @@ -1622,28 +1617,11 @@ (defconst simula-mode-help-address "bug-gnu-emacs@gnu.org" "Address accepting submission of `simula-mode' bug reports.") -(defun simula-submit-bug-report () - "Submit via mail a bug report on `simula-mode'." - (interactive) - (and - (y-or-n-p "Do you want to submit a report on simula-mode? ") - (reporter-submit-bug-report - simula-mode-help-address - (concat "simula-mode from Emacs " emacs-version) - (list - ;; report only the vars that affect indentation - 'simula-indent-level - 'simula-substatement-offset - 'simula-continued-statement-offset - 'simula-label-offset - 'simula-if-indent - 'simula-inspect-indent - 'simula-electric-indent - 'simula-abbrev-keyword - 'simula-abbrev-stdproc - 'simula-abbrev-file - 'simula-tab-always-indent - )))) +(make-obsolete-variable 'simula-mode-help-address 'report-emacs-bug-address + "24.4") + +(define-obsolete-function-alias 'simula-submit-bug-report + 'report-emacs-bug "24.4") (provide 'simula) ------------------------------------------------------------ revno: 111862 fixes bug: http://debbugs.gnu.org/13787 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-02-23 13:14:36 -0800 message: Avoid recursive byte-compile-files fighting over input/output buffers * lisp/emacs-lisp/bytecomp.el (byte-compile-level): New. (byte-compile-file, byte-compile-from-buffer): Use separate input/output buffers for each level of recursive byte-compile-file calls. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-02-23 12:40:14 +0000 +++ lisp/ChangeLog 2013-02-23 21:14:36 +0000 @@ -1,3 +1,10 @@ +2013-02-23 Glenn Morris + + * emacs-lisp/bytecomp.el (byte-compile-level): New. + (byte-compile-file, byte-compile-from-buffer): + Use separate input/output buffers for each level of recursive + byte-compile-file calls. (Bug#13787) + 2013-02-23 Michael Albinus * net/tramp.el (tramp-methods): Fix docstring. === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2013-02-09 12:52:01 +0000 +++ lisp/emacs-lisp/bytecomp.el 2013-02-23 21:14:36 +0000 @@ -1675,6 +1675,9 @@ (load (if (file-exists-p dest) dest filename))) 'no-byte-compile))) +(defvar byte-compile-level 0 ; bug#13787 + "Depth of a recursive byte compilation.") + ;;;###autoload (defun byte-compile-file (filename &optional load) "Compile a file of Lisp code named FILENAME into a file of byte code. @@ -1717,7 +1720,13 @@ (setq target-file (byte-compile-dest-file filename)) (setq byte-compile-dest-file target-file) (with-current-buffer - (setq input-buffer (get-buffer-create " *Compiler Input*")) + ;; It would be cleaner to use a temp buffer, but if there was + ;; an error, we leave this buffer around for diagnostics. + ;; Its name is documented in the lispref. + (setq input-buffer (get-buffer-create + (concat " *Compiler Input*" + (if (zerop byte-compile-level) "" + (format "-%s" byte-compile-level))))) (erase-buffer) (setq buffer-file-coding-system nil) ;; Always compile an Emacs Lisp file as multibyte @@ -1770,12 +1779,15 @@ (when byte-compile-verbose (message "Compiling %s..." filename)) (setq byte-compiler-error-flag nil) + (setq byte-compile-level (1+ byte-compile-level)) ;; It is important that input-buffer not be current at this call, ;; so that the value of point set in input-buffer ;; within byte-compile-from-buffer lingers in that buffer. (setq output-buffer (save-current-buffer - (byte-compile-from-buffer input-buffer))) + (unwind-protect + (byte-compile-from-buffer input-buffer) + (setq byte-compile-level (1- byte-compile-level))))) (if byte-compiler-error-flag nil (when byte-compile-verbose @@ -1881,7 +1893,10 @@ (byte-compile-close-variables (with-current-buffer (setq byte-compile--outbuffer - (get-buffer-create " *Compiler Output*")) + (get-buffer-create + (concat " *Compiler Output*" + (if (<= byte-compile-level 1) "" + (format "-%s" (1- byte-compile-level)))))) (set-buffer-multibyte t) (erase-buffer) ;; (emacs-lisp-mode) ------------------------------------------------------------ revno: 111861 committer: Michael Albinus branch nick: trunk timestamp: Sat 2013-02-23 13:40:14 +0100 message: * net/tramp.el (tramp-methods): Fix docstring. (tramp-ssh-controlmaster-options): Rename it from `tramp-ssh-controlmaster-template'. Return a string. (tramp-default-method): Adapt check for `tramp-ssh-controlmaster-options'. * net/tramp-sh.el (tramp-methods): Replace `tramp-ssh-controlmaster-template' by "%c". (tramp-do-copy-or-rename-file-out-of-band) (tramp-maybe-open-connection): Use it in format spec. Ensure, that it is applied for the first hop only. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-02-22 17:13:05 +0000 +++ lisp/ChangeLog 2013-02-23 12:40:14 +0000 @@ -1,3 +1,17 @@ +2013-02-23 Michael Albinus + + * net/tramp.el (tramp-methods): Fix docstring. + (tramp-ssh-controlmaster-options): Rename it from + `tramp-ssh-controlmaster-template'. Return a string. + (tramp-default-method): Adapt check for + `tramp-ssh-controlmaster-options'. + + * net/tramp-sh.el (tramp-methods): Replace + `tramp-ssh-controlmaster-template' by "%c". + (tramp-do-copy-or-rename-file-out-of-band) + (tramp-maybe-open-connection): Use it in format spec. Ensure, + that it is applied for the first hop only. + 2013-02-22 Juri Linkov * isearch.el (isearch-lazy-highlight-new-loop): === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2013-02-22 14:05:38 +0000 +++ lisp/net/tramp-sh.el 2013-02-23 12:40:14 +0000 @@ -109,17 +109,15 @@ (tramp-copy-keep-date t))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("scp" + '("scp" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "scp") - (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r") - ,tramp-ssh-controlmaster-template)) + (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r") ("%c"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") @@ -128,17 +126,16 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("scp1" + '("scp1" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-1") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "scp") - (tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k") ("-q") ("-r") - ,tramp-ssh-controlmaster-template)) + (tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k") + ("-q") ("-r") ("%c"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") @@ -147,17 +144,16 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("scp2" + '("scp2" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-2") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "scp") - (tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k") ("-q") ("-r") - ,tramp-ssh-controlmaster-template)) + (tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k") + ("-q") ("-r") ("%c"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") @@ -166,17 +162,16 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("scpx" + '("scpx" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "scp") - (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r") - ,tramp-ssh-controlmaster-template)) + (tramp-copy-args (("-P" "%p") ("-p" "%k") + ("-q") ("-r") ("%c"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") @@ -185,34 +180,27 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("sftp" + '("sftp" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "sftp") - (tramp-copy-args ,tramp-ssh-controlmaster-template))) + (tramp-copy-args ("%c")))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("rsync" + '("rsync" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "rsync") (tramp-copy-args (("-t" "%k") ("-r"))) - (tramp-copy-env (("RSYNC_RSH") - (,(mapconcat - 'identity - (append - '("ssh") tramp-ssh-controlmaster-template) - " ")))) + (tramp-copy-env (("RSYNC_RSH") ("ssh" "%c"))) (tramp-copy-keep-date t) (tramp-copy-keep-tmpfile t) (tramp-copy-recursive t))) @@ -232,10 +220,9 @@ (tramp-remote-shell-args ("-c")))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("ssh" + '("ssh" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") @@ -246,10 +233,9 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("ssh1" + '("ssh1" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-1") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") @@ -260,10 +246,9 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("ssh2" + '("ssh2" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-2") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") @@ -274,10 +259,9 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - `("sshx" + '("sshx" (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") - ,tramp-ssh-controlmaster-template + (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") ("-e" "none") ("-t" "-t") ("%h") ("/bin/sh"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") @@ -2274,7 +2258,7 @@ (t2 (tramp-tramp-file-p newname)) (orig-vec (tramp-dissect-file-name (if t1 filename newname))) copy-program copy-args copy-env copy-keep-date port spec - source target) + options source target) (with-parsed-tramp-file-name (if t1 filename newname) nil (if (and t1 t2) @@ -2342,9 +2326,11 @@ user (or user "") port (or port "") spec (format-spec-make - ?h host ?u user ?p port ?t (tramp-get-connection-property - (tramp-get-connection-process v) "temp-file" "") + (tramp-get-connection-process v) "temp-file" "")) + options (format-spec tramp-ssh-controlmaster-options spec) + spec (format-spec-make + ?h host ?u user ?p port ?c options ?k (if keep-date " " "")) copy-program (tramp-get-method-parameter method 'tramp-copy-program) @@ -4404,6 +4390,9 @@ (setenv "PROMPT_COMMAND") (setenv "PS1" tramp-initial-end-of-output) (let* ((target-alist (tramp-compute-multi-hops vec)) + ;; We will apply `tramp-ssh-controlmaster-options' + ;; only for the first hop. + (options tramp-ssh-controlmaster-options) (process-connection-type tramp-process-connection-type) (process-adaptive-read-buffering nil) (coding-system-for-read nil) @@ -4508,8 +4497,10 @@ l-host (or l-host "") l-user (or l-user "") l-port (or l-port "") + spec (format-spec-make ?t tmpfile) + options (format-spec options spec) spec (format-spec-make - ?h l-host ?u l-user ?p l-port ?t tmpfile) + ?h l-host ?u l-user ?p l-port ?c options) command (concat ;; We do not want to see the trailing local @@ -4536,7 +4527,8 @@ (tramp-message vec 3 "Found remote shell prompt on `%s'" l-host)) ;; Next hop. - (setq target-alist (cdr target-alist))) + (setq options "" + target-alist (cdr target-alist))) ;; Make initial shell settings. (tramp-open-connection-setup-interactive-shell p vec)))) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2013-02-22 14:05:38 +0000 +++ lisp/net/tramp.el 2013-02-23 12:40:14 +0000 @@ -220,7 +220,8 @@ argument. By this, arguments like (\"-l\" \"%u\") are optional. \"%t\" is replaced by the temporary file name produced with `tramp-make-tramp-temp-file'. \"%k\" indicates the keep-date - parameter of a program, if exists. + parameter of a program, if exists. \"%c\" adds additional + `tramp-ssh-controlmaster-options' options for the first hop. * `tramp-async-args' When an asynchronous process is started, we know already that the connection works. Therefore, we can pass additional @@ -281,25 +282,23 @@ useful only in combination with `tramp-default-proxies-alist'.") ;;;###tramp-autoload -(defconst tramp-ssh-controlmaster-template - (let (result) +(defconst tramp-ssh-controlmaster-options + (let ((result "")) (ignore-errors (with-temp-buffer (call-process "ssh" nil t nil "-o" "ControlMaster") (goto-char (point-min)) (when (search-forward-regexp "Missing ControlMaster argument" nil t) - (setq result - '("-o" "ControlPath=%t.%%r@%%h:%%p" - "-o" "ControlMaster=auto")))) + (setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto"))) (when result (with-temp-buffer (call-process "ssh" nil t nil "-o" "ControlPersist") (goto-char (point-min)) (when (search-forward-regexp "Missing ControlPersist argument" nil t) - (setq result (append result '("-o" "ControlPersist=no"))))))) + (setq result (concat result " -o ControlPersist=no")))))) result) "Call ssh to detect whether it supports the Control* arguments. -Return a template to be used in `tramp-methods'.") +Return a string to be used in `tramp-methods'.") (defcustom tramp-default-method ;; An external copy method seems to be preferred, because it performs @@ -333,7 +332,7 @@ (getenv "SSH_AUTH_SOCK") (getenv "SSH_AGENT_PID") ;; We could reuse the connection. - tramp-ssh-controlmaster-template) + (> (length tramp-ssh-controlmaster-options) 0)) "scp" "ssh")) ;; Fallback. ------------------------------------------------------------ revno: 111860 author: David Engster committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2013-02-22 22:54:37 +0000 message: gnus-registry.el (gnus-registry-save): Provide class name when calling `eieio-persistent-read' to avoid "unsafe call" warning Use `condition-case' to stay compatible with older EIEIO versions which only accept one argument diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-02-17 12:46:28 +0000 +++ lisp/gnus/ChangeLog 2013-02-22 22:54:37 +0000 @@ -1,3 +1,10 @@ +2013-02-22 David Engster + + * gnus-registry.el (gnus-registry-save): Provide class name when + calling `eieio-persistent-read' to avoid "unsafe call" warning. Use + `condition-case' to stay compatible with older EIEIO versions which + only accept one argument. + 2013-02-17 Daiki Ueno * mml2015.el (epg-key-user-id-list, epg-user-id-string) === modified file 'lisp/gnus/gnus-registry.el' --- lisp/gnus/gnus-registry.el 2013-01-02 16:13:04 +0000 +++ lisp/gnus/gnus-registry.el 2013-02-22 22:54:37 +0000 @@ -296,8 +296,14 @@ (condition-case nil (progn (gnus-message 5 "Reading Gnus registry from %s..." file) - (setq gnus-registry-db (gnus-registry-fixup-registry - (eieio-persistent-read file))) + (setq gnus-registry-db + (gnus-registry-fixup-registry + (condition-case nil + (with-no-warnings + (eieio-persistent-read file 'registry-db)) + ;; Older EIEIO versions do not check the class name. + ('wrong-number-of-arguments + (eieio-persistent-read file))))) (gnus-message 5 "Reading Gnus registry from %s...done" file)) (error (gnus-message