# HG changeset patch # User Vadim Gelfer # Date 1150689882 25200 # Node ID aa16b42628b843b46fff960d15bd212b4a6d799a # Parent ff83112332f9dfd5fb331dd190e62249c7c3cd84# Parent b5902db74ba3a90be91ef8b780d35f23772f90b0 merge with crew. diff --git a/contrib/mercurial.el b/contrib/mercurial.el --- a/contrib/mercurial.el +++ b/contrib/mercurial.el @@ -380,7 +380,7 @@ Handle frickin' frackin' gratuitous even (save-excursion (while hg-prev-buffer (set-buffer hg-prev-buffer)) - (let ((path (or default (buffer-file-name)))) + (let ((path (or default (buffer-file-name) default-directory))) (if (or (not path) current-prefix-arg) (expand-file-name (eval (list* 'read-file-name @@ -712,7 +712,8 @@ code by typing `M-x find-library mercuri (let ((pos (point))) (insert (documentation 'hg-mode)) (goto-char pos) - (kill-line)))) + (end-of-line 1) + (delete-region pos (point))))) (defun hg-add (path) "Add PATH to the Mercurial repository on the next commit. @@ -976,8 +977,8 @@ With a prefix argument, prompt for the p (defun hg-log-mode () "Mode for viewing a Mercurial change log." (goto-char (point-min)) - (when (looking-at "^searching for changes") - (kill-entire-line)) + (when (looking-at "^searching for changes.*$") + (delete-region (match-beginning 0) (match-end 0))) (run-hooks 'hg-log-mode-hook)) (defun hg-log (path &optional rev1 rev2 log-limit) @@ -1102,7 +1103,11 @@ prompts for a path to check." (interactive (list (hg-read-file-name))) (if (or path (not hg-root)) (let ((root (do ((prev nil dir) - (dir (file-name-directory (or path buffer-file-name "")) + (dir (file-name-directory + (or + path + buffer-file-name + (expand-file-name default-directory))) (file-name-directory (directory-file-name dir)))) ((equal prev dir)) (when (file-directory-p (concat dir ".hg"))