From e2396d80cbf7e9d20c05eff44c1c8f04ecb9341c Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 25 Jan 2010 01:04:59 -0800 Subject: [PATCH 1/3] (vc-annotate-revision-at-line): Compare file names too. --- lisp/ChangeLog | 3 +++ lisp/vc-annotate.el | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e86aa2a94a..6af0ffdf5a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-01-25 Dan Nicolaescu + * vc-annotate.el (vc-annotate-revision-at-line): Compare file + names too. + * vc-bzr.el (vc-bzr-print-log): Use the more compact --line option for the short log. (vc-bzr-log-view-mode): Adjust regexp for the above change. diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el index 9f8daad0fde..71839443553 100644 --- a/lisp/vc-annotate.el +++ b/lisp/vc-annotate.el @@ -447,7 +447,8 @@ Return a cons (REV . FILENAME)." (let ((rev-at-line (vc-annotate-extract-revision-at-line))) (if (not rev-at-line) (message "Cannot extract revision number from the current line") - (if (equal (car rev-at-line) vc-annotate-parent-rev) + (if (and (equal (car rev-at-line) vc-annotate-parent-rev) + (string= (cdr rev-at-line) vc-annotate-parent-file)) (message "Already at revision %s" rev-at-line) (vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line))))))) From 361bbf574b7ae0e0a3975307b8f00c355870a3e0 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 25 Jan 2010 13:49:23 -0500 Subject: [PATCH 2/3] Fix erc reconnection via non-default connectors (Bug#4958). * erc-backend.el (erc-session-connector): New var. (erc-server-reconnect): Use it to reconnect via old connector (Bug#4958). * erc.el (erc-determine-parameters): Save erc-server-connect-function to erc-session-connector. --- lisp/erc/ChangeLog | 9 +++++++++ lisp/erc/erc-backend.el | 10 ++++++++-- lisp/erc/erc.el | 4 +++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 0ba18b68cfb..8daf590ee89 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,12 @@ +2010-01-25 Vivek Dasmohapatra + + * erc-backend.el (erc-session-connector): New var. + (erc-server-reconnect): Use it to reconnect via old + connector (Bug#4958). + + * erc.el (erc-determine-parameters): Save + erc-server-connect-function to erc-session-connector. + 2009-11-03 Stefan Monnier * erc.el (erc-display-line-1, erc-process-away): diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 1ab9467ab3a..8b533b4c255 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -130,6 +130,10 @@ Use `erc-current-nick' to access this.") "The server name used to connect to for this session.") (make-variable-buffer-local 'erc-session-server) +(defvar erc-session-connector nil + "The function used to connect to this session (nil for the default).") +(make-variable-buffer-local 'erc-session-connector) + (defvar erc-session-port nil "The port used to connect to.") (make-variable-buffer-local 'erc-session-port) @@ -538,8 +542,10 @@ Make sure you are in an ERC buffer when running this." (erc-set-active-buffer (current-buffer)) (setq erc-server-last-sent-time 0) (setq erc-server-lines-sent 0) - (erc-open erc-session-server erc-session-port erc-server-current-nick - erc-session-user-full-name t erc-session-password)))) + (let ((erc-server-connect-function (or erc-session-connector + 'open-network-stream))) + (erc-open erc-session-server erc-session-port erc-server-current-nick + erc-session-user-full-name t erc-session-password))))) (defun erc-server-filter-function (process string) "The process filter for the ERC server." diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index d2445414c83..b76f486f155 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -5654,11 +5654,13 @@ user input." "Determine the connection and authentication parameters. Sets the buffer local variables: +- `erc-session-connector' - `erc-session-server' - `erc-session-port' - `erc-session-full-name' - `erc-server-current-nick'" - (setq erc-session-server (erc-compute-server server) + (setq erc-session-connector erc-server-connect-function + erc-session-server (erc-compute-server server) erc-session-port (or port erc-default-port) erc-session-user-full-name (erc-compute-full-name name)) (erc-set-current-nick (erc-compute-nick nick))) From 368d3208cfceb42b5ee07c61b4aa5b7d09c9f2bf Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 25 Jan 2010 23:22:25 -0800 Subject: [PATCH 3/3] (vc-path): Mark as obsolete. --- lisp/ChangeLog | 4 ++++ lisp/vc-hooks.el | 2 ++ 2 files changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6af0ffdf5a3..5097af5c1ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-01-26 Dan Nicolaescu + + * vc-hooks.el (vc-path): Mark as obsolete. + 2010-01-25 Dan Nicolaescu * vc-annotate.el (vc-annotate-revision-at-line): Compare file diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 60e3619c4b8..b46561428ee 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -89,6 +89,8 @@ An empty list disables VC altogether." :type '(repeat directory) :group 'vc) +(make-obsolete 'vc-path "should not be necessary anymore." "23.2") + (defcustom vc-make-backup-files nil "If non-nil, backups of registered files are made as with other files. If nil (the default), files covered by version control don't get backups."