From 3dd2acc9d3896088517f1f9472ca66ebc7784601 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 7 Sep 2008 20:24:24 +0000 Subject: [PATCH] * vc-svn.el (vc-svn-root): * vc-sccs.el (vc-sccs-root): * vc-rcs.el (vc-rcs-root): * vc-cvs.el (vc-cvs-root): Delete. * vc-hooks.el (vc-find-root): Remove `invert' argument. --- lisp/ChangeLog | 46 ++++++++++++++++++++++++++-------------------- lisp/vc-cvs.el | 3 --- lisp/vc-hooks.el | 13 +++---------- lisp/vc-rcs.el | 3 --- lisp/vc-sccs.el | 3 --- lisp/vc-svn.el | 3 --- lisp/vc.el | 6 ------ 7 files changed, 29 insertions(+), 48 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26c839aabcf..735af08a6b6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2008-09-07 Stefan Monnier + + * vc-svn.el (vc-svn-root): + * vc-sccs.el (vc-sccs-root): + * vc-rcs.el (vc-rcs-root): + * vc-cvs.el (vc-cvs-root): Delete. + * vc-hooks.el (vc-find-root): Remove `invert' argument. + 2008-09-07 Nikolaj Schumacher (tiny change) * progmodes/flymake.el (flymake-parse-err-lines): Filter out @@ -5,9 +13,9 @@ 2008-09-07 Dan Nicolaescu - * vc-bzr.el (vc-bzr-extra-fileinfo): New defstruct. - (vc-bzr-status-printer): New function. - (vc-bzr-after-dir-status): Deal with renamed files. + * vc-bzr.el (vc-bzr-extra-fileinfo): New defstruct. + (vc-bzr-status-printer): New function. + (vc-bzr-after-dir-status): Deal with renamed files. 2008-09-07 Johan Euphrosine (tiny change) @@ -31,7 +39,7 @@ (proced-sorting-schemes-alist, proced-sorting-scheme) (proced-header-alist, proced-sorting-schemes-re) (proced-skip-regexp, proced-next-line, proced-previous-line) - (proced-listing-type, proced-sorting-scheme-p): Removed. + (proced-listing-type, proced-sorting-scheme-p): Remove. (proced-grammar-alist, proced-custom-attributes) (proced-format-alist, proced-format, proced-filter-alist) (proced-filter, proced-sort, proced-goal-attribute) @@ -55,15 +63,14 @@ Simplify. (proced-omit-processes): Use use-region-p. (proced-sort-pcpu, proced-sort-pmem, proced-sort-pid) - (proced-sort-start, proced-sort-time, proced-sort-user): Use - proced-sort-interactive. + (proced-sort-start, proced-sort-time, proced-sort-user): + Use proced-sort-interactive. (proced-sort): Make it a function that performs the actual sort. (proced-update): New arg revert. Use proced-process-alist, proced-filter, proced-sort, proced-format, and proced-grammar-alist. Preserve position of point based on fields. Make header line and fields clickable. - (proced-send-signal): Use proced-pid-at-point and - proced-process-alist. + (proced-send-signal): Use proced-pid-at-point and proced-process-alist. (proced-why): Use save-selected-window. (proced-log): Use buffer-read-only. @@ -118,25 +125,24 @@ (verilog-submit-bug-report): Update author support URLs. (verilog-delete-auto, verilog-auto-inout-module) (verilog-auto-inout-comp, verilog-auto): Add AUTOINOUTCOMP for - creating complemented testbench modules. Suggested by Yishay - Belkind. - (verilog-auto-inst-port, verilog-simplify-range-expression): When - verilog-auto-inst-param-value is set, don't require a + creating complemented testbench modules. Suggested by Yishay Belkind. + (verilog-auto-inst-port, verilog-simplify-range-expression): + When verilog-auto-inst-param-value is set, don't require a AUTO_TEMPLATE to expand parameter substitutions. Suggested by Yishay Belkind. (verilog-auto-inst-param-value): Add safe variable. - (verilog-re-search-forward, verilog-re-search-backward): Fix - returning wrong search results on Emacs 22.1. + (verilog-re-search-forward, verilog-re-search-backward): + Fix returning wrong search results on Emacs 22.1. (verilog-modi-cache-results, verilog-auto): Fix warning message about "toggling font-lock-mode." (verilog-auto): Fix losing font-lock on errors. (verilog-auto-inst-param-value, verilog-mode-version) (verilog-mode-version-date, verilog-read-inst-param-value) (verilog-auto-inst, verilog-auto-inst-param) - (verilog-auto-inst-port, verilog-simplify-range-expression): Allow - parameters to be replaced with their values, on the expansion of - an AUTOINST with Verilog 2001 style parameter settings. Suggested - by David Rogoff. + (verilog-auto-inst-port, verilog-simplify-range-expression): + Allow parameters to be replaced with their values, on the expansion of + an AUTOINST with Verilog 2001 style parameter settings. + Suggested by David Rogoff. 2008-09-05 Michael McNamara @@ -154,8 +160,8 @@ 2008-09-05 Vinicius Jose Latorre - * whitespace.el (whitespace-kill-buffer-hook, whitespace-action): Don't - clean up a buffer when killing it. + * whitespace.el (whitespace-kill-buffer-hook, whitespace-action): + Don't clean up a buffer when killing it. 2008-09-05 Vinicius Jose Latorre diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index eeb4ef08e1a..23dc61b01de 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -691,9 +691,6 @@ If UPDATE is non-nil, then update (resynch) any affected buffers." ;;; Internal functions ;;; -(defun vc-cvs-root (dir) - (vc-find-root dir "CVS" t)) - (defun vc-cvs-command (buffer okstatus files &rest flags) "A wrapper around `vc-do-command' for use in vc-cvs.el. The difference to vc-do-command is that this function always invokes `cvs', diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 91cb4c0cd32..8d17eeac699 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -321,12 +321,10 @@ non-nil if FILE exists and its contents were successfully inserted." (set-buffer-modified-p nil) t)) -(defun vc-find-root (file witness &optional invert) +(defun vc-find-root (file witness) "Find the root of a checked out project. The function walks up the directory tree from FILE looking for WITNESS. -If WITNESS if not found, return nil, otherwise return the root. -Optional arg INVERT non-nil reverses the sense of the check; -the root is the last directory for which WITNESS *is* found." +If WITNESS if not found, return nil, otherwise return the root." ;; Represent /home/luser/foo as ~/foo so that we don't try to look for ;; witnesses in /home or in /. (setq file (abbreviate-file-name file)) @@ -349,16 +347,11 @@ the root is the last directory for which WITNESS *is* found." (and prev-user (not (equal user prev-user)))) (string-match vc-ignore-dir-regexp file))) (setq try (file-exists-p (expand-file-name witness file))) - (cond ((and invert (not try)) (setq root prev-file)) - ((and (not invert) try) (setq root file)) + (cond (try (setq root file)) ((equal file (setq prev-file file file (file-name-directory (directory-file-name file)))) (setq file nil)))) - ;; Handle the case where ~/WITNESS exists and the original FILE is "~". - ;; (This occurs, for example, when placing dotfiles under RCS.) - (when (and (not root) invert prev-file) - (setq root prev-file)) root)) ;; Access functions to file properties diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 06e06c503f3..14d65da2a5a 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -835,9 +835,6 @@ systime, or nil if there is none. Also, reposition point." ;;; Internal functions ;;; -(defun vc-rcs-root (dir) - (vc-find-root dir "RCS" t)) - (defun vc-rcs-workfile-is-newer (file) "Return non-nil if FILE is newer than its RCS master. This likely means that FILE has been changed with respect diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index 5cf19064b59..b8957b94c38 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el @@ -398,9 +398,6 @@ revert all subfiles." ;;; Internal functions ;;; -(defun vc-sccs-root (dir) - (vc-find-root dir "SCCS" t)) - ;; This function is wrapped with `progn' so that the autoload cookie ;; copies the whole function itself into loaddefs.el rather than just placing ;; a (autoload 'vc-sccs-search-project-dir "vc-sccs") which would not diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 854e66e3d1d..caf5ec15dcb 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -533,9 +533,6 @@ NAME is assumed to be a URL." :type 'string :group 'vc) -(defun vc-svn-root (dir) - (vc-find-root dir vc-svn-admin-directory t)) - (defun vc-svn-command (buffer okstatus file-or-list &rest flags) "A wrapper around `vc-do-command' for use in vc-svn.el. The difference to vc-do-command is that this function always invokes `svn', diff --git a/lisp/vc.el b/lisp/vc.el index 27f21ccc6f8..88d023a422f 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -458,12 +458,6 @@ ;; ;; MISCELLANEOUS ;; -;; - root (dir) -;; -;; Return DIR's "root" directory, that is, a parent directory of -;; DIR for which the same backend as used for DIR applies. If no -;; such parent exists, this function should return DIR. -;; ;; - make-version-backups-p (file) ;; ;; Return non-nil if unmodified repository revisions of FILE should be -- 2.39.5