CVS update by viteno xemacs-builds/viteno ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/04/18 09:15:07
Modified: xemacs-builds/viteno package-index setup-packages.ini
Log:
Package database backup:
- tramp-1.31
Revision Changes Path
1.287 +7 -7 XEmacs/xemacs-builds/viteno/package-index
Index: package-index
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/package-index,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- package-index 2006/04/03 13:07:32 1.286
+++ package-index 2006/04/18 07:15:06 1.287
＠＠ -656,19 +656,19 ＠＠
(package-get-update-base-entry (quote
(tramp
(standards-version 1.1
- version "1.30"
- author-version "2.0.52"
- date "2006-02-13"
- build-date "2006-02-13"
+ version "1.31"
+ author-version "2.0.53"
+ date "2006-04-18"
+ build-date "2006-04-18"
maintainer "Kai Großjohann <kai.grossjohann(a)gmx.net>"
distribution xemacs
priority low
category "standard"
dump nil
description "Remote shell-based file editing."
- filename "tramp-1.30-pkg.tar.gz"
- md5sum "a62dd5f007bc2a74e44fa0ed4c119f9d"
- size 294519
+ filename "tramp-1.31-pkg.tar.gz"
+ md5sum "364095bd737ac9297290516811ca5ac6"
+ size 294962
provides (tramp tramp-efs tramp-ftp tramp-smb tramp-util tramp-uu
tramp-vc trampcache)
requires (tramp xemacs-base vc efs dired mail-lib gnus ediff sh-script)
1.275 +2 -2 XEmacs/xemacs-builds/viteno/setup-packages.ini
Index: setup-packages.ini
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/setup-packages.ini,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- setup-packages.ini 2006/04/03 13:07:32 1.274
+++ setup-packages.ini 2006/04/18 07:15:06 1.275
＠＠ -344,8 +344,8 ＠＠ version: 1.90
install: packages/text-modes-1.90-pkg.tar.gz 442526
＠ tramp
-version: 1.30
-install: packages/tramp-1.30-pkg.tar.gz 294519
+version: 1.31
+install: packages/tramp-1.31-pkg.tar.gz 294962
＠ xemacs-base
version: 2.02
- 1 participants
- 0 comments
CVS update by viteno packages/xemacs-packages/tramp ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/04/18 09:10:08
Modified: packages/xemacs-packages/tramp ChangeLog Makefile
Log:
Increment VERSION in Makefile
Revision Changes Path
1.60 +4 -0 XEmacs/packages/xemacs-packages/tramp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- ChangeLog 2006/04/17 13:11:37 1.59
+++ ChangeLog 2006/04/18 07:10:07 1.60
＠＠ -1,3 +1,7 ＠＠
+2006-04-18 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.31 released.
+
2006-04-17 Michael Albinus <michael.albinus(a)gmx.de>
* Makefile (AUTHOR_VERSION): Bump to 2.0.53.
1.60 +1 -1 XEmacs/packages/xemacs-packages/tramp/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/Makefile,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- Makefile 2006/04/17 13:11:38 1.59
+++ Makefile 2006/04/18 07:10:07 1.60
＠＠ -17,7 +17,7 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.30
+VERSION = 1.31
AUTHOR_VERSION = 2.0.53
MAINTAINER = Kai Großjohann <kai.grossjohann(a)gmx.net>
PACKAGE = tramp
- 1 participants
- 0 comments
CVS update by viteno packages ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/04/18 09:09:51
Modified: packages ChangeLog
Log:
Package release
Revision Changes Path
1.611 +4 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -p -r1.610 -r1.611
--- ChangeLog 2006/04/03 13:03:12 1.610
+++ ChangeLog 2006/04/18 07:09:51 1.611
＠＠ -1,3 +1,7 ＠＠
+2006-04-18 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: tramp.
+
2006-04-03 Norbert Koch <viteno(a)xemacs.org>
* Packages released: xwem.
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/04/17 23:51:08
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1503 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1502
retrieving revision 1.1503
diff -u -p -r1.1502 -r1.1503
--- version.sh 2006/04/16 21:51:09 1.1502
+++ version.sh 2006/04/17 21:51:07 1.1503
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20060416)"
+xemacs_extra_name="(+CVS-20060417)"
xemacs_release_date="2006-04-01"
- 1 participants
- 0 comments
CVS update by albinus packages/xemacs-packages/tramp/texi ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: albinus
Date: 06/04/17 15:11:44
Modified: packages/xemacs-packages/tramp/texi ChangeLog trampver.texi
Log:
Sync with Tramp 2.0.53.
Revision Changes Path
1.59 +4 -0 XEmacs/packages/xemacs-packages/tramp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ChangeLog 2006/02/13 12:19:05 1.58
+++ ChangeLog 2006/04/17 13:11:37 1.59
＠＠ -1,3 +1,7 ＠＠
+2006-04-17 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * Makefile (AUTHOR_VERSION): Bump to 2.0.53.
+
2006-02-13 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.30 released.
1.13 +17 -0 XEmacs/packages/xemacs-packages/tramp/ChangeLog.upstream
Index: ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/ChangeLog.upstream,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ChangeLog.upstream 2006/01/22 22:10:41 1.12
+++ ChangeLog.upstream 2006/04/17 13:11:38 1.13
＠＠ -1,3 +1,20 ＠＠
+2006-04-17 Michael Albinus <michael.albinus(a)gmx.de>
+
+ Version 2.0.53 released.
+
+ * configure.ac: Bump version.
+
+2006-03-14 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * Makefile.in: Implement DESTDIR support.
+
+ * INSTALL: Mention DESTDIR support.
+
+2006-01-27 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * configure.ac: Bump version (to 2.0.53-pre). Update merge
+ version to 2.0.52.
+
2006-01-22 Michael Albinus <michael.albinus(a)gmx.de>
Version 2.0.52 released.
1.59 +1 -1 XEmacs/packages/xemacs-packages/tramp/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/Makefile,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- Makefile 2006/02/13 12:19:05 1.58
+++ Makefile 2006/04/17 13:11:38 1.59
＠＠ -18,7 +18,7 ＠＠
# Boston, MA 02111-1307, USA.
VERSION = 1.30
-AUTHOR_VERSION = 2.0.52
+AUTHOR_VERSION = 2.0.53
MAINTAINER = Kai Großjohann <kai.grossjohann(a)gmx.net>
PACKAGE = tramp
PKG_TYPE = regular
1.32 +51 -1 XEmacs/packages/xemacs-packages/tramp/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ChangeLog 2006/02/12 20:29:37 1.31
+++ ChangeLog 2006/04/17 13:11:41 1.32
＠＠ -1,8 +1,58 ＠＠
+2006-04-17 Michael Albinus <michael.albinus(a)gmx.de>
+
+ Version 2.0.53 released.
+
+2006-04-16 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * tramp.el (tramp-completion-mode): ?\t has event-modifier
+ 'control. Reported by Matthias Förste
+ <slashdevslashnull(a)gmx.net>.
+
+2006-04-13 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * tramp.el (tramp-display-shell-command-buffer): New defvar.
+ (tramp-handle-shell-command): Display output buffer only when
+ `tramp-display-shell-command-buffer' is true.
+ (tramp-handle-process-file): Set `tramp-display-shell-command-buffer'.
+
+2006-03-14 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * Makefile.in: Implement DESTDIR support.
+
2006-02-12 Michael Albinus <michael.albinus(a)gmx.de>
* tramp.el (tramp-remote-path): Add "/usr/xpg4/bin" on top,
because on Solaris a POSIX compatible "id" is needed. Reported by
Magnus Henoch <mange(a)freemail.hu>.
+ (tramp-perl-encode, tramp-perl-decode): Adapt copyright years.
+
+ * tramp-uu.el, trampver.el.in: Adapt copyright years.
+
+2006-02-08 Sam Steingold <sds(a)gnu.org>
+
+ * tramp.el (tramp-maybe-open-connection): Do not wait for
+ output from a dead connection.
+
+2006-02-01 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * tramp.el (tramp-convert-file-attributes): Set file's gid change
+ bit only when id-format is 'integer. Reported by Matt Hodges
+ <M.P.Hodges(a)rl.ac.uk>.
+
+2006-01-30 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * tramp-smb.el (tramp-smb-wait-for-output): Wait always for the
+ prompt. If it returns earlier (when detecting an error message),
+ the rest of the output will merge accidently with the output of
+ the next command. Reported by M Jared Finder <jared(a)hpalace.com>.
+
+2006-01-27 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * tramp.el: Add autoload for adding
+ `tramp-completion-file-name-handler' to `file-name-handler-alist'.
+
+ * tramp-vc.el (vc-user-login-name): Wrap defadvice with a test for
+ `process-file', in order to let it work for older Emacsen too.
2006-01-22 Michael Albinus <michael.albinus(a)gmx.de>
＠＠ -14,7 +64,7 ＠＠
* tramp.el (tramp-unload-file-name-handler-alist)
(tramp-unload-tramp): New defuns.
- (tramp-advice-PC-expand-many-files): New defadvice.
+ (tramp-advice-PC-expand-many-files): New defadvices.
(tramp-save-PC-expand-many-files, tramp-setup-complete) Defuns
removed.
1.8 +2 -2 XEmacs/packages/xemacs-packages/tramp/lisp/tramp-smb.el
Index: tramp-smb.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/tramp-smb.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tramp-smb.el 2005/08/07 15:55:39 1.7
+++ tramp-smb.el 2006/04/17 13:11:41 1.8
＠＠ -1,6 +1,6 ＠＠
;;; tramp-smb.el --- Tramp access functions for SMB servers -*- coding: iso-8859-1; -*-
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Albinus <michael.albinus(a)gmx.de>
;; Keywords: comm, processes
＠＠ -979,7 +979,7 ＠＠ Returns nil if an error message has appe
;; Algorithm: get waiting output. See if last line contains
;; tramp-smb-prompt sentinel or tramp-smb-errors strings.
;; If not, wait a bit and again get waiting output.
- (while (and (not found) (not err))
+ (while (not found)
;; Accept pending output.
(tramp-accept-process-output proc)
1.6 +1 -1 XEmacs/packages/xemacs-packages/tramp/lisp/tramp-uu.el
Index: tramp-uu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/tramp-uu.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tramp-uu.el 2005/08/07 15:55:39 1.5
+++ tramp-uu.el 2006/04/17 13:11:41 1.6
＠＠ -1,7 +1,7 ＠＠
;;; -*- coding: iso-2022-7bit; -*-
;;; tramp-uu.el --- uuencode in Lisp
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kai Gro,A_(Bjohann <kai.grossjohann(a)gmx.net>
;; Keywords: comm, terminals
1.17 +23 -19 XEmacs/packages/xemacs-packages/tramp/lisp/tramp-vc.el
Index: tramp-vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/tramp-vc.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- tramp-vc.el 2006/01/22 22:10:49 1.16
+++ tramp-vc.el 2006/04/17 13:11:41 1.17
＠＠ -436,26 +436,30 ＠＠ filename we are thinking about..."
(t (error "tramp-handle-vc-user-login-name cannot cope!")))))))
-(defadvice vc-user-login-name
- (around tramp-vc-user-login-name activate)
- "Support for files on remote machines accessed by TRAMP."
- ;; We rely on the fact that `file' is bound when this is called.
- ;; This appears to be the case everywhere in vc.el and vc-hooks.el
- ;; as of Emacs 20.5.
- ;;
- ;; CCC TODO there should be a real solution! Talk to Andre Spiegel
- ;; about this.
- (let ((file (when (boundp 'file)
- (symbol-value 'file)))) ;pacify byte-compiler
- (or (and (stringp file)
- (tramp-tramp-file-p file) ; tramp file
- (setq ad-return-value
- (save-match-data
- (tramp-handle-vc-user-login-name uid)))) ; get the owner name
- ad-do-it))) ; else call the original
+;; The following defadvice is no longer necessary after changes in VC
+;; on 2006-01-25, Andre.
-(add-hook 'tramp-unload-hook
- '(lambda () (ad-unadvise 'vc-user-login-name)))
+(unless (fboundp 'process-file)
+ (defadvice vc-user-login-name
+ (around tramp-vc-user-login-name activate)
+ "Support for files on remote machines accessed by TRAMP."
+ ;; We rely on the fact that `file' is bound when this is called.
+ ;; This appears to be the case everywhere in vc.el and vc-hooks.el
+ ;; as of Emacs 20.5.
+ ;;
+ ;; With Emacs 22, the definition of `vc-user-login-name' has been
+ ;; changed. It doesn't need to be adviced any longer.
+ (let ((file (when (boundp 'file)
+ (symbol-value 'file)))) ;pacify byte-compiler
+ (or (and (stringp file)
+ (tramp-tramp-file-p file) ; tramp file
+ (setq ad-return-value
+ (save-match-data
+ (tramp-handle-vc-user-login-name uid)))) ; get the owner name
+ ad-do-it))) ; else call the original
+
+ (add-hook 'tramp-unload-hook
+ '(lambda () (ad-unadvise 'vc-user-login-name))))
;; Determine the name of the user owning a file.
1.32 +41 -30 XEmacs/packages/xemacs-packages/tramp/lisp/tramp.el
Index: tramp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/tramp.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- tramp.el 2006/02/12 20:29:37 1.31
+++ tramp.el 2006/04/17 13:11:42 1.32
＠＠ -1737,7 +1737,7 ＠＠ on the remote host.")
(defvar tramp-perl-encode
"%s -e '
# This script contributed by Juanma Barranquero <lektu(a)terra.es>.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006 Free Software Foundation, Inc.
use strict;
my %%trans = do {
＠＠ -1779,7 +1779,7 ＠＠ This string is passed to `format', so pe
(defvar tramp-perl-decode
"%s -e '
# This script contributed by Juanma Barranquero <lektu(a)terra.es>.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006 Free Software Foundation, Inc.
use strict;
my %%trans = do {
＠＠ -3584,6 +3584,10 ＠＠ the result will be a local, non-Tramp, f
"Global variable keeping asynchronous process object.
Used in `tramp-handle-shell-command'")
+(defvar tramp-display-shell-command-buffer t
+ "Whether to display output buffer of `shell-command'.
+This is necessary for handling DISPLAY of `process-file'.")
+
(defun tramp-handle-shell-command (command &optional output-buffer error-buffer)
"Like `shell-command' for tramp files.
This will break if COMMAND prints a newline, followed by the value of
＠＠ -3692,7 +3696,8 ＠＠ This will break if COMMAND prints a newl
(skip-chars-forward "^ ")
(setq status (read (current-buffer)))))
(unless (zerop (buffer-size))
- (display-buffer output-buffer))
+ (when tramp-display-shell-command-buffer
+ (display-buffer output-buffer)))
status))
;; The following is only executed if something strange was
;; happening. Emit a helpful message and do it anyway.
＠＠ -3707,11 +3712,10 ＠＠ This will break if COMMAND prints a newl
(when (and (numberp buffer) (zerop buffer))
(error "Implementation does not handle immediate return"))
(when (consp buffer) (error "Implementation does not handle error files"))
- (shell-command
- (mapconcat 'tramp-shell-quote-argument
- (cons program args)
- " ")
- buffer))
+ (let ((tramp-display-shell-command-buffer display))
+ (shell-command
+ (mapconcat 'tramp-shell-quote-argument (cons program args) " ")
+ buffer)))
;; File Editing.
＠＠ -4340,6 +4344,7 ＠＠ Falls back to normal file name handler i
;;;###autoload
(add-to-list 'file-name-handler-alist
(cons tramp-file-name-regexp 'tramp-file-name-handler))
+;;;###autoload
(add-to-list 'file-name-handler-alist
(cons tramp-completion-file-name-regexp
'tramp-completion-file-name-handler))
＠＠ -4454,24 +4459,28 ＠＠ necessary anymore."
file)
(member (match-string 1 file) (mapcar 'car tramp-methods)))
((or (equal last-input-event 'tab)
- ;; Emacs
- (and (integerp last-input-event)
- (not (event-modifiers last-input-event))
- (or (char-equal last-input-event ?\?)
- (char-equal last-input-event ?\t) ; handled by 'tab already?
- (char-equal last-input-event ?\ )))
+ ;; Emacs
+ (and (integerp last-input-event)
+ (or
+ ;; ?\t has event-modifier 'control
+ (char-equal last-input-event ?\t)
+ (and (not (event-modifiers last-input-event))
+ (or (char-equal last-input-event ?\?)
+ (char-equal last-input-event ?\ )))))
;; XEmacs
(and (featurep 'xemacs)
- (not (event-modifiers last-input-event))
- (or (char-equal
- (funcall (symbol-function 'event-to-character)
- last-input-event) ?\?)
- (char-equal
- (funcall (symbol-function 'event-to-character)
- last-input-event) ?\t)
- (char-equal
- (funcall (symbol-function 'event-to-character)
- last-input-event) ?\ ))))
+ (or
+ ;; ?\t has event-modifier 'control
+ (char-equal
+ (funcall (symbol-function 'event-to-character)
+ last-input-event) ?\t)
+ (and (not (event-modifiers last-input-event))
+ (or (char-equal
+ (funcall (symbol-function 'event-to-character)
+ last-input-event) ?\?)
+ (char-equal
+ (funcall (symbol-function 'event-to-character)
+ last-input-event) ?\ ))))))
t)))
(defun tramp-completion-handle-file-exists-p (filename)
＠＠ -6484,7 +6493,8 ＠＠ connection if a previous connection has
p (processp p) (memq (process-status p) '(run open)))
(tramp-send-command
multi-method method user host "echo are you awake" nil t)
- (unless (tramp-wait-for-output 10)
+ (unless (and (memq (process-status p) '(run open))
+ (tramp-wait-for-output 10))
(delete-process p)
(setq p nil))
(erase-buffer)))
＠＠ -6768,13 +6778,14 ＠＠ If `tramp-discard-garbage' is nil, just
"Convert file-attributes ATTR generated by perl script or ls.
Convert file mode bits to string and set virtual device number.
Return ATTR."
+ ;; Convert file mode bits to string.
(unless (stringp (nth 8 attr))
- ;; Convert file mode bits to string.
(setcar (nthcdr 8 attr) (tramp-file-mode-from-int (nth 8 attr))))
- ;; Set file's gid change bit.
- (setcar (nthcdr 9 attr)
- (not (= (nth 3 attr)
- (tramp-get-remote-gid multi-method method user host))))
+ ;; Set file's gid change bit. Possible only when id-format is 'integer.
+ (when (numberp (nth 3 attr))
+ (setcar (nthcdr 9 attr)
+ (not (= (nth 3 attr)
+ (tramp-get-remote-gid multi-method method user host)))))
;; Set virtual device number.
(setcar (nthcdr 11 attr)
(tramp-get-device multi-method method user host))
1.13 +2 -2 XEmacs/packages/xemacs-packages/tramp/lisp/trampver.el
Index: trampver.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/trampver.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- trampver.el 2006/01/22 22:10:50 1.12
+++ trampver.el 2006/04/17 13:11:42 1.13
＠＠ -2,7 +2,7 ＠＠
;;; trampver.el --- Transparent Remote Access, Multiple Protocol
;;; lisp/trampver.el. Generated from trampver.el.in by configure.
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kai Gro,A_(Bjohann <kai.grossjohann(a)gmx.net>
;; Keywords: comm, processes
＠＠ -30,7 +30,7 ＠＠
;; are auto-frobbed from configure.ac, so you should edit that file and run
;; "autoconf && ./configure" to change them.
-(defconst tramp-version "2.0.52"
+(defconst tramp-version "2.0.53"
"This version of Tramp.")
(defconst tramp-bug-report-address "tramp-devel(a)gnu.org"
1.30 +10 -0 XEmacs/packages/xemacs-packages/tramp/texi/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/texi/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ChangeLog 2006/01/22 22:10:57 1.29
+++ ChangeLog 2006/04/17 13:11:44 1.30
＠＠ -1,3 +1,13 ＠＠
+2006-04-17 Michael Albinus <michael.albinus(a)gmx.de>
+
+ Version 2.0.53 released.
+
+2006-03-14 Michael Albinus <michael.albinus(a)gmx.de>
+
+ * Makefile.in: Implement DESTDIR support.
+
+ * trampinst.texi (Installation parameters): Mention DESTDIR support.
+
2006-01-22 Michael Albinus <michael.albinus(a)gmx.de>
Version 2.0.52 released.
1.13 +1 -1 XEmacs/packages/xemacs-packages/tramp/texi/trampver.texi
Index: trampver.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/texi/trampver.texi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- trampver.texi 2006/01/22 22:10:57 1.12
+++ trampver.texi 2006/04/17 13:11:44 1.13
＠＠ -4,7 +4,7 ＠＠
＠c In the Tramp CVS, the version number is auto-frobbed from
＠c configure.ac, so you should edit that file and run
＠c "autoconf && ./configure" to change the version number.
-＠set trampver 2.0.52
+＠set trampver 2.0.53
＠c Other flags from configuration
＠set prefix /usr/local
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/04/16 23:51:10
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1502 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1501
retrieving revision 1.1502
diff -u -p -r1.1501 -r1.1502
--- version.sh 2006/04/15 21:51:05 1.1501
+++ version.sh 2006/04/16 21:51:09 1.1502
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20060415)"
+xemacs_extra_name="(+CVS-20060416)"
xemacs_release_date="2006-04-01"
- 1 participants
- 0 comments
CVS update by aidan xemacs/lisp ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/04/16 19:09:31
Modified: xemacs/lisp cmdloop.el
Log:
cmdloop.el typo fix, following my last change to it: "Any input that not a
digit" -> "Any input that is not a digit".
Revision Changes Path
1.21 +2 -2 XEmacs/xemacs/lisp/cmdloop.el
Index: cmdloop.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cmdloop.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- cmdloop.el 2006/04/15 14:44:34 1.20
+++ cmdloop.el 2006/04/16 17:09:30 1.21
＠＠ -548,8 +548,8 ＠＠ Legitimate radix values are 8, 10 and 16
Also, if the first character read is a digit of base (the value of)
`read-quoted-char-radix', we read as many of such digits as are
typed and return a character with the corresponding Unicode code
-point. Any input that not a digit (in the base used) terminates the
-sequence. If the terminator is RET, it is discarded; any other
+point. Any input that is not a digit (in the base used) terminates
+the sequence. If the terminator is RET, it is discarded; any other
terminator is used itself as input.
The optional argument PROMPT specifies a string to use to prompt the user.
- 1 participants
- 0 comments
CVS update by aidan xemacs/src ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/04/16 17:54:23
Modified: xemacs/src ChangeLog data.c
Log:
Docstring improvements for basic Lisp functions, CL.
Revision Changes Path
1.736 +11 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.735
retrieving revision 1.736
diff -u -p -r1.735 -r1.736
--- ChangeLog 2006/04/15 14:44:34 1.735
+++ ChangeLog 2006/04/16 15:54:16 1.736
＠＠ -1,3 +1,14 ＠＠
+2006-04-16 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl.el (incf):
+ * cl.el (decf):
+ * cl.el (pop):
+ * cl.el (push):
+ * cl.el (pushnew):
+ Docstring clarifications; drop non-standard formatting for incf,
+ decf, pop, move to GNU's parameter names for push, pushnew since
+ they make it much easier to remember the right order.
+
2006-04-15 Aidan Kehoe <kehoea(a)parhasard.net>
* cmdloop.el (read-quoted-char): Use unicode-to-char instead of
1.16 +16 -15 XEmacs/xemacs/lisp/cl.el
Index: cl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cl.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cl.el 2005/01/26 09:53:32 1.15
+++ cl.el 2006/04/16 15:54:16 1.16
＠＠ -132,7 +132,7 ＠＠ Floating-point numbers of equal value ar
;;; can safely be used in .emacs files.
(defmacro incf (place &optional x)
- "(incf PLACE [X]): increment PLACE by X (1 by default).
+ "Increment PLACE by X (1 by default).
PLACE may be a symbol, or any generalized variable allowed by `setf'.
The return value is the incremented value of PLACE."
(if (symbolp place)
＠＠ -142,7 +142,7 ＠＠ The return value is the incremented valu
(list 'callf '+ place (or x 1))))
(defmacro decf (place &optional x)
- "(decf PLACE [X]): decrement PLACE by X (1 by default).
+ "Decrement PLACE by X (1 by default).
PLACE may be a symbol, or any generalized variable allowed by `setf'.
The return value is the decremented value of PLACE."
(if (symbolp place)
＠＠ -150,7 +150,7 ＠＠ The return value is the decremented valu
(list 'callf '- place (or x 1))))
(defmacro pop (place)
- "(pop PLACE): remove and return the head of the list stored in PLACE.
+ "Remove and return the head of the list stored in PLACE.
Analogous to (prog1 (car PLACE) (setf PLACE (cdr PLACE))), though more
careful about evaluating each argument only once and in the right order.
PLACE may be a symbol, or any generalized variable allowed by `setf'."
＠＠ -158,21 +158,22 ＠＠ PLACE may be a symbol, or any generalize
`(car (prog1 ,place (setq ,place (cdr ,place))))
(cl-do-pop place)))
-(defmacro push (x place)
- "(push X PLACE): insert X at the head of the list stored in PLACE.
-Analogous to (setf PLACE (cons X PLACE)), though more careful about
-evaluating each argument only once and in the right order. PLACE may
+(defmacro push (newelt listname)
+ "Add NEWELT to the list stored in LISTNAME.
+Analogous to (setf LISTNAME (cons NEWELT LISTNAME)), though more careful about
+evaluating each argument only once and in the right order. LISTNAME may
be a symbol, or any generalized variable allowed by `setf'."
- (if (symbolp place) `(setq ,place (cons ,x ,place))
- (list 'callf2 'cons x place)))
+ (if (symbolp listname) `(setq ,listname (cons ,newelt ,listname))
+ (list 'callf2 'cons newelt listname)))
-(defmacro pushnew (x place &rest keys)
- "(pushnew X PLACE): insert X at the head of the list if not already there.
-Like (push X PLACE), except that the list is unmodified if X is `eql' to
-an element already on the list.
+(defmacro pushnew (newelt listname &rest keys)
+ "Add NEWELT to the list stored in LISTNAME, unless it's already there.
+Like (push NEWELT LISTNAME), except that the list is unmodified if NEWELT is
+`eql' to an element already on the list.
Keywords supported: :test :test-not :key"
- (if (symbolp place) (list 'setq place (list* 'adjoin x place keys))
- (list* 'callf2 'adjoin x place keys)))
+ (if (symbolp listname) (list 'setq listname
+ (list* 'adjoin newelt listname keys))
+ (list* 'callf2 'adjoin newelt listname keys)))
(defun cl-set-elt (seq n val)
(if (listp seq) (setcar (nthcdr n seq) val) (aset seq n val)))
1.943 +17 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.942
retrieving revision 1.943
diff -u -p -r1.942 -r1.943
--- ChangeLog 2006/04/10 15:16:45 1.942
+++ ChangeLog 2006/04/16 15:54:20 1.943
＠＠ -1,3 +1,20 ＠＠
+2006-04-16 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * data.c (Fconsp):
+ * data.c (Fsymbolp):
+ * data.c (Fcar):
+ * data.c (Flistp):
+ * data.c (Fsetcar):
+ * data.c (Fsetcdr):
+ * data.c (Flss):
+ * data.c (Fgtr):
+ Short docstring clarifications to make life easier for people who
+ are learning Lisp; explain what a cons is in the consp docstring,
+ what a symbol is in the symbolp docstring, and so forth. Thank you
+ Alan Mackenzie on emacs-devel.
+ Expand on "monotonically increasing" and "monotonically
+ decreasing" in the Flss and Fgtr docstrings.
+
2006-04-10 Jerry James <james(a)xemacs.org>
* alsaplay.c: Support pre-1.0.10 versions of the ALSA library.
1.66 +44 -14 XEmacs/xemacs/src/data.c
Index: data.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/data.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- data.c 2005/10/24 10:07:35 1.65
+++ data.c 2006/04/16 15:54:21 1.66
＠＠ -216,6 +216,11 ＠＠ Return t if OBJECT is nil.
DEFUN ("consp", Fconsp, 1, 1, 0, /*
Return t if OBJECT is a cons cell. `nil' is not a cons cell.
+
+A cons cell is a Lisp object (an area in memory) comprising two pointers
+called the CAR and the CDR. Each of these pointers can point to any other
+Lisp object. The common Lisp data type, the list, is a specially-structured
+series of cons cells.
*/
(object))
{
＠＠ -232,6 +237,10 ＠＠ Return t if OBJECT is not a cons cell.
DEFUN ("listp", Flistp, 1, 1, 0, /*
Return t if OBJECT is a list. `nil' is a list.
+
+A list is implemented as a series of cons cells structured such that the CDR
+of each cell either points to another cons cell or to `nil', the special
+Lisp value for both Boolean false and the empty list.
*/
(object))
{
＠＠ -256,6 +265,9 ＠＠ Return t if OBJECT is an acyclic, nil-te
DEFUN ("symbolp", Fsymbolp, 1, 1, 0, /*
Return t if OBJECT is a symbol.
+
+A symbol is a Lisp object with a name. It can optionally have any and all of
+a value, a property list and an associated function.
*/
(object))
{
＠＠ -600,19 +612,21 ＠＠ Return a symbol representing the type of
/* Extract and set components of lists */
DEFUN ("car", Fcar, 1, 1, 0, /*
-Return the car of LIST. If arg is nil, return nil.
-Error if arg is not nil and not a cons cell. See also `car-safe'.
+Return the car of CONS. If CONS is nil, return nil.
+The car of a list or a dotted pair is its first element.
+
+Error if CONS is not nil and not a cons cell. See also `car-safe'.
*/
- (list))
+ (cons))
{
while (1)
{
- if (CONSP (list))
- return XCAR (list);
- else if (NILP (list))
+ if (CONSP (cons))
+ return XCAR (cons);
+ else if (NILP (cons))
return Qnil;
else
- list = wrong_type_argument (Qlistp, list);
+ cons = wrong_type_argument (Qlistp, cons);
}
}
＠＠ -625,19 +639,22 ＠＠ Return the car of OBJECT if it is a cons
}
DEFUN ("cdr", Fcdr, 1, 1, 0, /*
-Return the cdr of LIST. If arg is nil, return nil.
+Return the cdr of CONS. If CONS is nil, return nil.
+The cdr of a list is the list without its first element. The cdr of a
+dotted pair (A . B) is the second element, B.
+
Error if arg is not nil and not a cons cell. See also `cdr-safe'.
*/
- (list))
+ (cons))
{
while (1)
{
- if (CONSP (list))
- return XCDR (list);
- else if (NILP (list))
+ if (CONSP (cons))
+ return XCDR (cons);
+ else if (NILP (cons))
return Qnil;
else
- list = wrong_type_argument (Qlistp, list);
+ cons = wrong_type_argument (Qlistp, cons);
}
}
＠＠ -651,6 +668,7 ＠＠ Return the cdr of OBJECT if it is a cons
DEFUN ("setcar", Fsetcar, 2, 2, 0, /*
Set the car of CONS-CELL to be NEWCAR. Return NEWCAR.
+The car of a list or a dotted pair is its first element.
*/
(cons_cell, newcar))
{
＠＠ -663,6 +681,8 ＠＠ Set the car of CONS-CELL to be NEWCAR.
DEFUN ("setcdr", Fsetcdr, 2, 2, 0, /*
Set the cdr of CONS-CELL to be NEWCDR. Return NEWCDR.
+The cdr of a list is the list without its first element. The cdr of a
+dotted pair (A . B) is the second element, B.
*/
(cons_cell, newcdr))
{
＠＠ -986,7 +1006,12 ＠＠ The arguments may be numbers, characters
DEFUN ("<", Flss, 1, MANY, 0, /*
Return t if the sequence of arguments is monotonically increasing.
-The arguments may be numbers, characters or markers.
+
+(That is, if there is a second argument, it must be numerically greater than
+the first. If there is a third, it must be numerically greater than the
+second, and so on.) At least one argument is required.
+
+The arguments may be numbers, characters or markers.
*/
(int nargs, Lisp_Object *args))
{
＠＠ -995,6 +1020,11 ＠＠ The arguments may be numbers, characters
DEFUN (">", Fgtr, 1, MANY, 0, /*
Return t if the sequence of arguments is monotonically decreasing.
+
+(That is, if there is a second argument, it must be numerically less than
+the first. If there is a third, it must be numerically less than the
+second, and so forth.) At least one argument is required.
+
The arguments may be numbers, characters or markers.
*/
(int nargs, Lisp_Object *args))
- 1 participants
- 0 comments
CVS update by scop packages/unsupported/scop ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: scop
Date: 06/04/16 16:20:37
Modified: packages/unsupported/scop STATUS
Log:
Update generic-modes status (no changes).
Revision Changes Path
1.59 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- STATUS 2006/04/16 14:19:42 1.58
+++ STATUS 2006/04/16 14:20:37 1.59
＠＠ -13,7 +13,7 ＠＠ ede: Emacs Development Environment, <htt
- Compiles, I have no idea whether it works or not.
generic-modes: generic.el and generic-x.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2006-03-25.
+- Up to date with GNU Emacs CVS HEAD as of 2006-04-16.
- Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
vc: vc*.el and a few other related files from GNU Emacs
- 1 participants
- 0 comments
CVS update by scop packages/unsupported/scop/vc ...
18 years, 8 months
CVS Monitor
CVS Monitor
User: scop
Date: 06/04/16 16:19:45
Modified: packages/unsupported/scop/vc ChangeLog vc-xemacs.el vc.el
Log:
Sync vc with upstream.
Revision Changes Path
1.58 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- STATUS 2006/03/25 09:55:10 1.57
+++ STATUS 2006/04/16 14:19:42 1.58
＠＠ -17,5 +17,5 ＠＠ generic-modes: generic.el and generic-x.
- Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
vc: vc*.el and a few other related files from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2006-02-11.
+- Up to date with GNU Emacs CVS HEAD as of 2006-04-16.
- Compiles, something even works.
1.42 +7 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ChangeLog 2006/02/10 23:25:42 1.41
+++ ChangeLog 2006/04/16 14:19:44 1.42
＠＠ -1,3 +1,10 ＠＠
+2006-04-16 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc.el: Sync with upstream.
+
+ * vc-xemacs.el (line-number-at-pos): Sync compat implementation
+ with XEmacs 21.5.
+
2006-02-11 Ville Skyttä <scop(a)xemacs.org>
* *.el: Sync with upstream.
1.6 +3 -3 XEmacs/packages/unsupported/scop/vc/vc-xemacs.el
Index: vc-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-xemacs.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vc-xemacs.el 2005/12/05 11:26:29 1.5
+++ vc-xemacs.el 2006/04/16 14:19:45 1.6
＠＠ -46,14 +46,14 ＠＠
nil)
file)))
-;; These two are present in XEmacs >= 21.5
+;; These three are present in XEmacs >= 21.5
(unless (fboundp 'line-end-position)
(defalias 'line-end-position 'point-at-eol))
(unless (fboundp 'line-beginning-position)
(defalias 'line-beginning-position 'point-at-bol))
-
(unless (fboundp 'line-number-at-pos)
- (defalias 'line-number-at-pos 'line-number))
+ (defun line-number-at-pos (&optional pos)
+ (line-number pos t)))
(unless (fboundp 'subst-char-in-string)
(defun subst-char-in-string (fromchar tochar string &optional inplace)
1.24 +90 -43 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- vc.el 2006/02/10 23:25:43 1.23
+++ vc.el 2006/04/16 14:19:45 1.24
＠＠ -588,9 +588,9 ＠＠ See `run-hooks'."
:group 'vc
:version "21.1")
-(defcustom vc-annotate-display-mode nil
+(defcustom vc-annotate-display-mode 'fullscale
"Which mode to color the output of \\[vc-annotate] with by default."
-:type '(choice (const :tag "Default" nil)
+:type '(choice (const :tag "By Color Map Range" nil)
(const :tag "Scale to Oldest" scale)
(const :tag "Scale Oldest->Newest" fullscale)
(number :tag "Specify Fractional Number of Days"
＠＠ -621,30 +621,66 ＠＠ version control backend imposes itself."
;; Annotate customization
(defcustom vc-annotate-color-map
- '(( 20. . "#FFCC00")
- ( 40. . "#FF6666")
- ( 60. . "#FF6600")
- ( 80. . "#FF3300")
- (100. . "#FF00FF")
- (120. . "#FF0000")
- (140. . "#CCCC00")
- (160. . "#CC00CC")
- (180. . "#BC8F8F")
- (200. . "#99CC00")
- (220. . "#999900")
- (240. . "#7AC5CD")
- (260. . "#66CC00")
- (280. . "#33CC33")
- (300. . "#00CCFF")
- (320. . "#00CC99")
- (340. . "#0099FF"))
+ ;; XEmacs change: disabled, at least tty-display-color-p and tty-color-alist
+ ;; don't exist in XEmacs
+ (if (and nil (tty-display-color-p) (<= (display-color-cells) 8))
+ ;; A custom sorted TTY colormap
+ (let* ((colors
+ (sort
+ (delq nil
+ (mapcar (lambda (x)
+ (if (not (or
+ (string-equal (car x) "white")
+ (string-equal (car x) "black") ))
+ (car x)))
+ (tty-color-alist)))
+ (lambda (a b)
+ (cond
+ ((or (string-equal a "red") (string-equal b "blue")) t)
+ ((or (string-equal b "red") (string-equal a "blue")) nil)
+ ((string-equal a "yellow") t)
+ ((string-equal b "yellow") nil)
+ ((string-equal a "cyan") t)
+ ((string-equal b "cyan") nil)
+ ((string-equal a "green") t)
+ ((string-equal b "green") nil)
+ ((string-equal a "magenta") t)
+ ((string-equal b "magenta") nil)
+ (t (string< a b))))))
+ (date 20.)
+ (delta (/ (- 360. date) (1- (length colors)))))
+ (mapcar (lambda (x)
+ (prog1
+ (cons date x)
+ (setq date (+ date delta)))) colors))
+ ;; Normal colormap: hue stepped from 0-240deg, value=1., saturation=0.75
+ '(( 20. . "#FF3F3F")
+ ( 40. . "#FF6C3F")
+ ( 60. . "#FF993F")
+ ( 80. . "#FFC63F")
+ (100. . "#FFF33F")
+ (120. . "#DDFF3F")
+ (140. . "#B0FF3F")
+ (160. . "#83FF3F")
+ (180. . "#56FF3F")
+ (200. . "#3FFF56")
+ (220. . "#3FFF83")
+ (240. . "#3FFFB0")
+ (260. . "#3FFFDD")
+ (280. . "#3FF3FF")
+ (300. . "#3FC6FF")
+ (320. . "#3F99FF")
+ (340. . "#3F6CFF")
+ (360. . "#3F3FFF")))
"Association list of age versus color, for \\[vc-annotate].
-Ages are given in units of fractional days. Default is eighteen steps
-using a twenty day increment."
+Ages are given in units of fractional days. Default is eighteen
+steps using a twenty day increment, from red to blue. For TTY
+displays with 8 or fewer colors, the default is red to blue with
+all other colors between (excluding black and white)."
:type 'alist
:group 'vc)
-(defcustom vc-annotate-very-old-color "#0046FF"
+(defcustom vc-annotate-very-old-color "#3F3FFF"
"Color for lines older than the current color range in \\[vc-annotate]]."
:type 'string
:group 'vc)
＠＠ -856,7 +892,7 ＠＠ However, before executing BODY, find FIL
(if vc-dired-mode
(set-buffer (find-file-noselect (dired-get-filename)))
(while vc-parent-buffer
- (pop-to-buffer vc-parent-buffer))
+ (set-buffer vc-parent-buffer))
(if (not buffer-file-name)
(error "Buffer %s is not associated with a file" (buffer-name))
(if (not (vc-backend buffer-file-name))
＠＠ -2987,7 +3023,7 ＠＠ cover the range from the oldest annotati
(easy-menu-define vc-annotate-mode-menu vc-annotate-mode-map
"VC Annotate Display Menu"
`("VC-Annotate"
- ["Default" (unless (null vc-annotate-display-mode)
+ ["By Color Map Range" (unless (null vc-annotate-display-mode)
(setq vc-annotate-display-mode nil)
(vc-annotate-display-select))
:style toggle :selected (null vc-annotate-display-mode)]
＠＠ -3029,11 +3065,7 ＠＠ BUFFER. `vc-annotate-display-mode' spec
use; you may override this using the second optional arg MODE."
(interactive)
(if mode (setq vc-annotate-display-mode mode))
- (when buffer
- (set-buffer buffer)
- (display-buffer buffer))
- (if (not vc-annotate-parent-rev)
- (vc-annotate-mode))
+ (pop-to-buffer (or buffer (current-buffer)))
(cond ((null vc-annotate-display-mode)
;; The ratio is global, thus relative to the global color-map.
(kill-local-variable 'vc-annotate-color-map)
＠＠ -3093,7 +3125,11 ＠＠ colors. `vc-annotate-background' specifi
(vc-ensure-vc-buffer)
(setq vc-annotate-display-mode display-mode) ;Not sure why. --Stef
(let* ((temp-buffer-name (format "*Annotate %s (rev %s)*" (buffer-name) rev))
- (temp-buffer-show-function 'vc-annotate-display-select))
+ (temp-buffer-show-function 'vc-annotate-display-select)
+ ;; If BUF is specified, we presume the caller maintains current line,
+ ;; so we don't need to do it here. This implementation may give
+ ;; strange results occasionally in the case of REV != WORKFILE-REV.
+ (current-line (unless buf (line-number-at-pos))))
(message "Annotating...")
;; If BUF is specified it tells in which buffer we should put the
;; annotations. This is used when switching annotations to another
＠＠ -3103,15 +3139,21 ＠＠ colors. `vc-annotate-background' specifi
;; In case it had to be uniquified.
(setq temp-buffer-name (buffer-name))))
(with-output-to-temp-buffer temp-buffer-name
- (vc-call annotate-command file (get-buffer temp-buffer-name) rev))
- (with-current-buffer temp-buffer-name
- (set (make-local-variable 'vc-annotate-backend) (vc-backend file))
- (set (make-local-variable 'vc-annotate-parent-file) file)
- (set (make-local-variable 'vc-annotate-parent-rev) rev)
- (set (make-local-variable 'vc-annotate-parent-display-mode)
- display-mode))
-
- (message "Annotating... done")))
+ (vc-call annotate-command file (get-buffer temp-buffer-name) rev)
+ ;; we must setup the mode first, and then set our local
+ ;; variables before the show-function is called at the exit of
+ ;; with-output-to-temp-buffer
+ (with-current-buffer temp-buffer-name
+ (if (not (equal major-mode 'vc-annotate-mode))
+ (vc-annotate-mode))
+ (set (make-local-variable 'vc-annotate-backend) (vc-backend file))
+ (set (make-local-variable 'vc-annotate-parent-file) file)
+ (set (make-local-variable 'vc-annotate-parent-rev) rev)
+ (set (make-local-variable 'vc-annotate-parent-display-mode)
+ display-mode)))
+ (when current-line
+ (goto-line current-line temp-buffer-name))
+ (message "Annotating... done")))
(defun vc-annotate-prev-version (prefix)
"Visit the annotation of the version previous to this one.
＠＠ -3207,7 +3249,8 ＠＠ string, then it describes a revision num
revision."
(if (not (equal major-mode 'vc-annotate-mode))
(message "Cannot be invoked outside of a vc annotate buffer")
- (let* ((oldline (line-number-at-pos))
+ (let* ((buf (current-buffer))
+ (oldline (line-number-at-pos))
(revspeccopy revspec)
(newrev nil))
(cond
＠＠ -3234,11 +3277,11 ＠＠ revision."
(when newrev
(vc-annotate vc-annotate-parent-file newrev
vc-annotate-parent-display-mode
- (current-buffer))
+ buf)
(goto-line (min oldline (progn (goto-char (point-max))
;; XEmacs: previous-line needs 1 arg
(previous-line 1)
- (line-number-at-pos))))))))
+ (line-number-at-pos))) buf)))))
(defun vc-annotate-compcar (threshold a-list)
"Test successive cons cells of A-LIST against THRESHOLD.
＠＠ -3292,7 +3335,11 ＠＠ The annotations are relative to the curr
(let* ((color (or (vc-annotate-compcar difference vc-annotate-color-map)
(cons nil vc-annotate-very-old-color)))
;; substring from index 1 to remove any leading `#' in the name
- (face-name (concat "vc-annotate-face-" (substring (cdr color) 1)))
+ (face-name (concat "vc-annotate-face-"
+ (if (string-equal
+ (substring (cdr color) 0 1) "#")
+ (substring (cdr color) 1)
+ (cdr color))))
;; Make the face if not done.
(face (or (intern-soft face-name)
(let ((tmp-face (make-face (intern face-name))))
- 1 participants
- 0 comments