Re: ediff-revision drives me nuts - I keep editing the latest revision
- First Post
- Replies
- Stats
-
Go to
- ----- 2024 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2003 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2002 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2001 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2000 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 1999 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 1998 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
I don't think this is the right solution.
It is the job of the job of the vc package to make those buffers read-only
(who would want to modify an old version? At least, this should be made
somewhat difficult.)
This is what cvs does, and this is what vc should do as well.
I use the vc mode stuff with CVS inside XEmacs all the time. I
typically
compare the current file with the latest revision using ediff-revision.
When you quit it leaves point in the 'a' window. I understand the
consistency in the various ediff commands all operating that way, but I
can't tell you how many times I have failed to remember to change buffers
after a comparision and merrily began editing the file ediff-revision
checked out of CVS.
I think it would be extremely helpful if ediff-revision always made the 'a'
buffer read-only to avoid this problem. In fact, if the user asks to
compare two different versions from the repository, I think both buffers
should be made read-only.
I modified ediff-vc-internal in my init.el file. This patch seems to do
what I want:
*** /tmp/skipm/ediff-vers.el Tue Mar 20 15:39:14 2007
--- /tmp/skipm/init.el Tue Mar 20 15:39:14 2007
***************
*** 11,22 ****
(save-excursion
(vc-version-other-window rev1)
(setq rev1buf (current-buffer)
! file1 (buffer-file-name)))
(save-excursion
(or (string= rev2 "") ; use current buffer
(vc-version-other-window rev2))
(setq rev2buf (current-buffer)
! file2 (buffer-file-name)))
(setq startup-hooks
(cons `(lambda ()
(delete-file ,file1)
--- 11,25 ----
(save-excursion
(vc-version-other-window rev1)
(setq rev1buf (current-buffer)
! file1 (buffer-file-name))
! (toggle-read-only))
(save-excursion
(or (string= rev2 "") ; use current buffer
(vc-version-other-window rev2))
(setq rev2buf (current-buffer)
! file2 (buffer-file-name))
! (and (not (string= rev2 ""))
! (toggle-read-only)))
(setq startup-hooks
(cons `(lambda ()
(delete-file ,file1)
--
Skip Montanaro - skip(a)pobox.com - http://www.webfast.com/~skip/
"The hippies and the hipsters did some great stuff in the sixties,
but the geeks pulled their weight too." -- Billy Bragg
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
Skip Montanaro
Friday, 23 March
Fri, 23 Mar
12:06 p.m.
New subject: ediff-revision drives me nuts - I keep editing the latest revision
Michael Kifer <kifer <at> cs.sunysb.edu> writes:
I don't think this is the right solution.
Okay, this works for me as well. Add an optional read-only attribute to
vc-version-other-window (normally ignored) and pass t from ediff-vc-internal.
Skip
*** /tmp/skipm/vc.el Fri Mar 23 07:03:42 2007
--- /tmp/skipm/init.el Fri Mar 23 07:03:42 2007
***************
*** 1,8 ****
! (defun vc-version-other-window (rev)
"Visit version REV of the current buffer in another window.
If the current buffer is named `F', the version is named `F.~REV~'.
If `F.~REV~' already exists, it is used instead of being re-created."
! (interactive "sVersion to visit (default is latest version): ")
(if vc-dired-mode
(set-buffer (find-file-noselect (dired-get-filename))))
(while vc-parent-buffer
--- 1,8 ----
! (defun vc-version-other-window (rev &optional read-only)
"Visit version REV of the current buffer in another window.
If the current buffer is named `F', the version is named `F.~REV~'.
If `F.~REV~' already exists, it is used instead of being re-created."
! (interactive "sVersion to visit (default is latest version): \ni")
(if vc-dired-mode
(set-buffer (find-file-noselect (dired-get-filename))))
(while vc-parent-buffer
***************
*** 14,18 ****
(filename (concat buffer-file-name ".~" version "~")))
(or (file-exists-p filename)
(vc-backend-checkout buffer-file-name nil version filename))
! (find-file-other-window filename))
(vc-registration-error buffer-file-name)))
--- 14,19 ----
(filename (concat buffer-file-name ".~" version "~")))
(or (file-exists-p filename)
(vc-backend-checkout buffer-file-name nil version filename))
! (find-file-other-window filename)
! (setq buffer-read-only read-only))
(vc-registration-error buffer-file-name)))
*** /tmp/skipm/ediff-vers.el Fri Mar 23 07:04:37 2007
--- /tmp/skipm/init.el Fri Mar 23 07:04:37 2007
***************
*** 9,20 ****
(setq rev1 (ediff-vc-latest-version (buffer-file-name))))
(save-window-excursion
(save-excursion
! (vc-version-other-window rev1)
(setq rev1buf (current-buffer)
file1 (buffer-file-name)))
(save-excursion
(or (string= rev2 "") ; use current buffer
! (vc-version-other-window rev2))
(setq rev2buf (current-buffer)
file2 (buffer-file-name)))
(setq startup-hooks
--- 9,20 ----
(setq rev1 (ediff-vc-latest-version (buffer-file-name))))
(save-window-excursion
(save-excursion
! (vc-version-other-window rev1 t)
(setq rev1buf (current-buffer)
file1 (buffer-file-name)))
(save-excursion
(or (string= rev2 "") ; use current buffer
! (vc-version-other-window rev2 t))
(setq rev2buf (current-buffer)
file2 (buffer-file-name)))
(setq startup-hooks
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
6454
days inactive
6455
days old
1 comments
2 participants
tags (0)
participants (2)
-
Michael Kifer -
Skip Montanaro