Merge from trunk

7 files changed, 63 insertions, 38 deletions

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index f55629b3ea1..50f20cea779 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -122,8 +122,7 @@ when editing big diffs)."
     ("\C-m" . diff-goto-source)
     ([mouse-2] . diff-goto-source)
     ;; From XEmacs' diff-mode.
-    ;; Standard M-w is useful, so don't change M-W.
-    ;;("W" . widen)
+    ("W" . widen)
     ;;("." . diff-goto-source)          ;display-buffer
     ;;("f" . diff-goto-source)          ;find-file
     ("o" . diff-goto-source)            ;other-window
@@ -135,17 +134,21 @@ when editing big diffs)."
     ;; Not useful if you have to metafy them.
     ;;(" " . scroll-up)
     ;;("\177" . scroll-down)
-    ;; Standard M-a is useful, so don't change M-A.
-    ;;("A" . diff-ediff-patch)
-    ;; Standard M-r is useful, so don't change M-r or M-R.
-    ;;("r" . diff-restrict-view)
-    ;;("R" . diff-reverse-direction)
-    )
+    ("A" . diff-ediff-patch)
+    ("r" . diff-restrict-view)
+    ("R" . diff-reverse-direction))
   "Basic keymap for `diff-mode', bound to various prefix keys."
   :inherit special-mode-map)
 
 (easy-mmode-defmap diff-mode-map
-  `(("\e" . ,diff-mode-shared-map)
+  `(("\e" . ,(let ((map (make-sparse-keymap)))
+               ;; We want to inherit most bindings from diff-mode-shared-map,
+               ;; but not all since they may hide useful M-<foo> global
+               ;; bindings when editing.
+               (set-keymap-parent map diff-mode-shared-map)
+               (dolist (key '("A" "r" "R" "g" "q" "W"))
+                 (define-key map key nil))
+               map))
     ;; From compilation-minor-mode.
     ("\C-c\C-c" . diff-goto-source)
     ;; By analogy with the global C-x 4 a binding.
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 601b6b1e597..5435a840ac9 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -3176,21 +3176,26 @@ See also `auto-save-file-name-p'."
 
 ;; Metacharacters that have to be protected from the shell when executing
 ;; a diff/diff3 command.
-(defcustom emerge-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
-  "Characters that must be quoted with \\ when used in a shell command line.
+(defcustom emerge-metachars
+  (if (memq system-type '(ms-dos windows-nt))
+      "[ \t\"<>|?*^&=]"
+    "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]")
+  "Characters that must be quoted when used in a shell command line.
 More precisely, a [...] regexp to match any one such character."
   :type 'regexp
   :group 'emerge)
 
 ;; Quote metacharacters (using \) when executing a diff/diff3 command.
 (defun emerge-protect-metachars (s)
-  (let ((limit 0))
-    (while (string-match emerge-metachars s limit)
-      (setq s (concat (substring s 0 (match-beginning 0))
-                      "\\"
-                      (substring s (match-beginning 0))))
-      (setq limit (1+ (match-end 0)))))
-  s)
+  (if (memq system-type '(ms-dos windows-nt))
+      (shell-quote-argument s)
+    (let ((limit 0))
+      (while (string-match emerge-metachars s limit)
+        (setq s (concat (substring s 0 (match-beginning 0))
+                        "\\"
+                        (substring s (match-beginning 0))))
+        (setq limit (1+ (match-end 0)))))
+    s))
 
 (provide 'emerge)
 
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index a0a16601ed7..21cb86a9840 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -435,8 +435,13 @@ If any error occurred in running `bzr status', then return nil."
 (defun vc-bzr-state (file)
   (lexical-let ((result (vc-bzr-status file)))
     (when (consp result)
-      (when (cdr result)
-        (message "Warnings in `bzr' output: %s" (cdr result)))
+      (let ((warnings (cdr result)))
+        (when warnings
+          ;; bzr 2.3.0 returns info about shelves, which is not really a warning
+          (when (string-match "[1-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings)
+            (setq warnings (replace-match "" nil nil warnings)))
+          (unless (string= warnings "")
+            (message "Warnings in `bzr' output: %s" warnings))))
       (cdr (assq (car result)
                  '((added . added)
                    (kindchanged . edited)
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index d4970207b94..01b6f2fc26e 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -104,7 +104,7 @@ See `run-hooks'."
         ;; We pass a filename to create-file-buffer because it is what
         ;; the function expects, and also what uniquify needs (if active)
         (with-current-buffer (create-file-buffer (expand-file-name bname dir))
-          (cd dir)
+          (setq default-directory dir)
           (vc-setup-buffer (current-buffer))
           ;; Reset the vc-parent-buffer-name so that it does not appear
           ;; in the mode-line.
@@ -1002,7 +1002,7 @@ specific headers."
             (generate-new-buffer (format " *VC-%s* tmp status" backend))))
     (lexical-let ((buffer (current-buffer)))
       (with-current-buffer vc-dir-process-buffer
-        (cd def-dir)
+        (setq default-directory def-dir)
         (erase-buffer)
         (vc-call-backend
          backend 'dir-status-files def-dir files default-state
@@ -1067,7 +1067,7 @@ Throw an error if another update process is in progress."
       (ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) "")
       (lexical-let ((buffer (current-buffer)))
         (with-current-buffer vc-dir-process-buffer
-          (cd def-dir)
+          (setq default-directory def-dir)
           (erase-buffer)
           (vc-call-backend
            backend 'dir-status def-dir
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 3b4d0e5f421..711a573ba99 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -119,6 +119,12 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :version "23.1"
   :group 'vc)
 
+(defcustom vc-git-program "git"
+  "Name of the Git executable (excluding any arguments)."
+  :version "24.1"
+  :type 'string
+  :group 'vc)
+
 (defcustom vc-git-root-log-format
   '("%d%h..: %an %ad %s"
     ;; The first shy group matches the characters drawn by --graph.
@@ -554,7 +560,7 @@ or an empty string if none."
   "Return the existing branches, as a list of strings.
 The car of the list is the current branch."
   (with-temp-buffer
-    (call-process "git" nil t nil "branch")
+    (call-process vc-git-program nil t nil "branch")
     (goto-char (point-min))
     (let (current-branch branches)
       (while (not (eobp))
@@ -633,13 +639,13 @@ for the Git command to run."
   (let* ((root (vc-git-root default-directory))
          (buffer (format "*vc-git : %s*" (expand-file-name root)))
          (command "pull")
-         (git-program "git")
+         (git-program vc-git-program)
          args)
     ;; If necessary, prompt for the exact command.
     (when prompt
       (setq args (split-string
                   (read-shell-command "Git pull command: "
-                                      "git pull"
+                                      (format "%s pull" git-program)
                                       'vc-git-history)
                   " " t))
       (setq git-program (car  args)
@@ -663,7 +669,7 @@ This prompts for a branch to merge from."
                                branches
                              (cons "FETCH_HEAD" branches))
                            nil t)))
-    (apply 'vc-do-async-command buffer root "git" "merge"
+    (apply 'vc-do-async-command buffer root vc-git-program "merge"
            (list merge-source))
     (vc-set-async-update buffer)))
 
@@ -1083,8 +1089,10 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
 
 (defun vc-git-command (buffer okstatus file-or-list &rest flags)
   "A wrapper around `vc-do-command' for use in vc-git.el.
-The difference to vc-do-command is that this function always invokes `git'."
-  (apply 'vc-do-command (or buffer "*vc*") okstatus "git" file-or-list flags))
+The difference to vc-do-command is that this function always invokes
+`vc-git-program'."
+  (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
+         file-or-list flags))
 
 (defun vc-git--empty-db-p ()
   "Check if the git db is empty (no commit done yet)."
@@ -1095,7 +1103,7 @@ The difference to vc-do-command is that this function always invokes `git'."
   ;; We don't need to care the arguments.  If there is a file name, it
   ;; is always a relative one.  This works also for remote
   ;; directories.
-  (apply 'process-file "git" nil buffer nil command args))
+  (apply 'process-file vc-git-program nil buffer nil command args))
 
 (defun vc-git--out-ok (command &rest args)
   (zerop (apply 'vc-git--call '(t nil) command args)))
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index d283c39362a..0516abbf024 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -529,9 +529,9 @@ REV is the revision to check out into WORKFILE."
       (insert (propertize
                (format "   (%s %s)"
                        (case (vc-hg-extra-fileinfo->rename-state extra)
-                         ('copied "copied from")
-                         ('renamed-from "renamed from")
-                         ('renamed-to "renamed to"))
+                         (copied "copied from")
+                         (renamed-from "renamed from")
+                         (renamed-to "renamed to"))
                        (vc-hg-extra-fileinfo->extra-name extra))
                'face 'font-lock-comment-face)))))
 
@@ -663,14 +663,15 @@ then attempts to update the working directory."
       (let* ((root (vc-hg-root default-directory))
              (buffer (format "*vc-hg : %s*" (expand-file-name root)))
              (command "pull")
-             (hg-program "hg")
+             (hg-program vc-hg-program)
              ;; Fixme: before updating the working copy to the latest
              ;; state, should check if it's visiting an old revision.
              (args '("-u")))
         ;; If necessary, prompt for the exact command.
         (when prompt
           (setq args (split-string
-                      (read-shell-command "Run Hg (like this): " "hg pull -u"
+                      (read-shell-command "Run Hg (like this): "
+                                          (format "%s pull -u" hg-program)
                                           'vc-hg-history)
                       " " t))
           (setq hg-program (car  args)
@@ -685,7 +686,7 @@ then attempts to update the working directory."
 This runs the command \"hg merge\"."
   (let* ((root (vc-hg-root default-directory))
          (buffer (format "*vc-hg : %s*" (expand-file-name root))))
-    (apply 'vc-do-async-command buffer root "hg" '("merge"))
+    (apply 'vc-do-async-command buffer root vc-hg-program '("merge"))
     (vc-set-async-update buffer)))
 
 ;;; Internal functions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 200291bd925..7f55ffdbdad 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1115,9 +1115,12 @@ merge in the changes into your working copy."
         (dolist (file files)
           (unless (file-writable-p file)
             ;; Make the file+buffer read-write.
-            (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue?" file))
+            (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file))
               (error "Aborted"))
-            (set-file-modes file (logior (file-modes file) 128))
+            ;; Maybe we somehow lost permissions on the directory.
+            (condition-case nil
+                (set-file-modes file (logior (file-modes file) 128))
+              (error (error "Unable to make file writable")))
             (let ((visited (get-file-buffer file)))
               (when visited
                 (with-current-buffer visited