P4CONFIG与emacs

Question

我想看看如何设置perforce的示例,使用配置文件功能,其中emacs用作差异和合并程序(P4DIFF和P4MERGE设置).如果这是在Windows上更好.

在使用emacsclientw时,我也在努力让P4EDITOR正常工作,特别是指定了备用编辑器功能.

任何提示,建议,示例配置都是非常受欢迎的.

Answer 1

这是我以前使用的另一种技巧.它为emacs添加了一些命令行选项,以便您可以在新的emacs实例中进行差异和合并(再次使用ediff).

;; -diff
(defun command-line-diff (switch)
  (let ((file1 (pop command-line-args-left))
        (file2 (pop command-line-args-left)))
    (ediff file1 file2)))
(add-to-list 'command-switch-alist '("-diff" . command-line-diff))

;; -merge
(defun command-line-merge (switch)
  (let ((base (pop command-line-args-left))
        (sccs (pop command-line-args-left))
        (mine (pop command-line-args-left))
        (merg (pop command-line-args-left)))
   (ediff-merge-with-ancestor sccs mine base () merg)))
(add-to-list 'command-switch-alist '("-merge" . command-line-merge))

只需将其放在.emacs文件中即可.然后你可以设置你的P4DIFF程序emacs -diff和你的P4MERGE程序emacs -merge.