Archives
Archives
| From: | "Ulrich Mueller (ulm)" <ulm@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-emacs/tramp/files: tramp-2.1.10-copy-tree-gentoo.patch digest-tramp-2.1.10-r1 digest-tramp-2.1.10 |
| Date: | Tue, 25 Sep 2007 14:40:36 |
| Message-Id: | E1IaBSM-0000SE-Ki@stork.gentoo.org |
| 1 | ulm 07/09/25 14:32:10 |
| 2 | |
| 3 | Added: tramp-2.1.10-copy-tree-gentoo.patch |
| 4 | digest-tramp-2.1.10-r1 |
| 5 | Removed: digest-tramp-2.1.10 |
| 6 | Log: |
| 7 | Define copy-tree function for Emacs 21 compatibility. Fixes bug #193707. |
| 8 | (Portage version: 2.1.3.9, RepoMan options: --force) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 app-emacs/tramp/files/tramp-2.1.10-copy-tree-gentoo.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/tramp/files/tramp-2.1.10-copy-tree-gentoo.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/tramp/files/tramp-2.1.10-copy-tree-gentoo.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: tramp-2.1.10-copy-tree-gentoo.patch |
| 17 | =================================================================== |
| 18 | --- tramp-2.1.10-orig/lisp/tramp.el 2007-07-22 18:25:32.000000000 +0200 |
| 19 | +++ tramp-2.1.10/lisp/tramp.el 2007-09-25 09:13:47.000000000 +0200 |
| 20 | @@ -195,6 +195,29 @@ |
| 21 | (unless (fboundp 'set-buffer-multibyte) |
| 22 | (defalias 'set-buffer-multibyte 'ignore))) |
| 23 | |
| 24 | +;; `copy-tree' is not defined in plain Emacs 21 |
| 25 | +(eval-and-compile |
| 26 | + (if (fboundp 'copy-tree) |
| 27 | + (fset 'tramp-copy-tree 'copy-tree) |
| 28 | + ;; Taken from subr.el of Emacs 22.1. |
| 29 | + (defun tramp-copy-tree (tree &optional vecp) |
| 30 | + "Make a copy of TREE." |
| 31 | + (if (consp tree) |
| 32 | + (let (result) |
| 33 | + (while (consp tree) |
| 34 | + (let ((newcar (car tree))) |
| 35 | + (if (or (consp (car tree)) (and vecp (vectorp (car tree)))) |
| 36 | + (setq newcar (tramp-copy-tree (car tree) vecp))) |
| 37 | + (push newcar result)) |
| 38 | + (setq tree (cdr tree))) |
| 39 | + (nconc (nreverse result) tree)) |
| 40 | + (if (and vecp (vectorp tree)) |
| 41 | + (let ((i (length (setq tree (copy-sequence tree))))) |
| 42 | + (while (>= (setq i (1- i)) 0) |
| 43 | + (aset tree i (tramp-copy-tree (aref tree i) vecp))) |
| 44 | + tree) |
| 45 | + tree))))) |
| 46 | + |
| 47 | ;;; User Customizable Internal Variables: |
| 48 | |
| 49 | (defgroup tramp nil |
| 50 | @@ -2687,7 +2710,7 @@ |
| 51 | (when (file-directory-p directory) |
| 52 | (setq directory (expand-file-name directory)) |
| 53 | (let* ((temp |
| 54 | - (copy-tree |
| 55 | + (tramp-copy-tree |
| 56 | (with-parsed-tramp-file-name directory nil |
| 57 | (with-file-property |
| 58 | v localname |
| 59 | @@ -5083,7 +5106,7 @@ |
| 60 | |
| 61 | (with-current-buffer (tramp-get-connection-buffer vec) |
| 62 | (set (make-local-variable 'tramp-remote-path) |
| 63 | - (copy-tree tramp-remote-path)) |
| 64 | + (tramp-copy-tree tramp-remote-path)) |
| 65 | (let* ((elt (memq 'tramp-default-remote-path tramp-remote-path)) |
| 66 | (tramp-default-remote-path |
| 67 | (with-connection-property vec "default-remote-path" |
| 68 | |
| 69 | |
| 70 | |
| 71 | 1.1 app-emacs/tramp/files/digest-tramp-2.1.10-r1 |
| 72 | |
| 73 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/tramp/files/digest-tramp-2.1.10-r1?rev=1.1&view=markup |
| 74 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/tramp/files/digest-tramp-2.1.10-r1?rev=1.1&content-type=text/plain |
| 75 | |
| 76 | Index: digest-tramp-2.1.10-r1 |
| 77 | =================================================================== |
| 78 | MD5 668acbb5365caabd9ee4abea10944c63 tramp-2.1.10.tar.gz 328846 |
| 79 | RMD160 208ecfec5b9b45efca5abb5bb85a99189f9cb504 tramp-2.1.10.tar.gz 328846 |
| 80 | SHA256 856c5b7c2b3681ca0cc1cc31fe5c4f7bd4be5922f32af5e612c9263ae11b44b9 tramp-2.1.10.tar.gz 328846 |
| 81 | |
| 82 | |
| 83 | |
| 84 | -- |
| 85 | gentoo-commits@g.o mailing list |