From 45fd3a00715e631c6ce2632e3241b7f0d9724f0a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 8 May 2007 04:26:41 +0000 Subject: [PATCH] Ensure that update-changelog issues an error when used with a backend that does not implement it. (vc-update-changelog-rcs2log): Rename from vc-default-update-changelog. Remove `backend' argument. Use expand-file-name. (vc-cvs-update-changelog, vc-rcs-update-changelog): New aliases. --- lisp/ChangeLog | 15 +++++++++++++-- lisp/vc.el | 10 ++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 61090012471..d51f6875343 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2007-05-08 Stefan Monnier + + * vc.el: Ensure that update-changelog issues an error when used with + a backend that does not implement it. + (vc-update-changelog-rcs2log): Rename from vc-default-update-changelog. + Remove `backend' argument. Use expand-file-name. + (vc-cvs-update-changelog, vc-rcs-update-changelog): New aliases. + + * progmodes/python.el (python-end-of-block): Revert last change. + (python-end-of-statement): Make sure we move *forward*. + 2007-05-08 David Reitter * progmodes/python.el (python-guess-indent): Check non-nullness @@ -13668,8 +13679,8 @@ 2006-01-29 Edward O'Connor - * emulation/viper.el (viper-major-mode-modifier-list): Add - insert-state and vi-state entries for erc-mode. + * emulation/viper.el (viper-major-mode-modifier-list): + Add insert-state and vi-state entries for erc-mode. (viper-go-away, viper-set-hooks): Add and remove viper-comint-mode-hook from erc-mode-hook as appropriate. diff --git a/lisp/vc.el b/lisp/vc.el index 450bfb3c938..a65e698669e 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -2909,7 +2909,11 @@ log entries should be gathered." (vc-call-backend (vc-responsible-backend default-directory) 'update-changelog args)) -(defun vc-default-update-changelog (backend files) +(defalias 'vc-cvs-update-changelog 'vc-update-changelog-rcs2log) +(defalias 'vc-rcs-update-changelog 'vc-update-changelog-rcs2log) +;; FIXME: This should probably be moved to vc-rcs.el and replaced in +;; vc-cvs.el by code using cvs2cl. +(defun vc-update-changelog-rcs2log (files) "Default implementation of update-changelog. Uses `rcs2log' which only works for RCS and CVS." ;; FIXME: We (c|sh)ould add support for cvs2cl @@ -2950,9 +2954,7 @@ Uses `rcs2log' which only works for RCS and CVS." (mapcar (lambda (f) (file-relative-name - (if (file-name-absolute-p f) - f - (concat odefault f)))) + (expand-file-name f odefault))) files))) "done" (pop-to-buffer (get-buffer-create "*vc*")) -- 2.39.2