From cbcf358d296d86e15b842bb3b70af2deb36b8edc Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Thu, 21 Jun 2012 13:01:54 -0400 Subject: [PATCH] misc/emacs: Replace replace-{string|regexp} for XEmacs compatible code Use code to be used in lisp programs as suggested in the doc strings for replace-{string|regexp}. Bonus: This code works for XEmacs. R=golang-dev, sameer, jmeurin CC=golang-dev https://golang.org/cl/6296073 --- misc/emacs/go-mode.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/misc/emacs/go-mode.el b/misc/emacs/go-mode.el index 214c196850..e293fe056c 100644 --- a/misc/emacs/go-mode.el +++ b/misc/emacs/go-mode.el @@ -819,8 +819,9 @@ Replace the current buffer on success; display errors on failure." (require 'diff-mode) ;; apply all the patch hunks (with-current-buffer patchbuf - (replace-regexp "^--- /tmp/gofmt[0-9]*" (concat "--- " filename) - nil (point-min) (point-max)) + (goto-char (point-min)) + (if (re-search-forward "^--- \\(/tmp/gofmt[0-9]*\\)" nil t) + (replace-match filename nil nil nil 1)) (condition-case nil (while t (diff-hunk-next) @@ -831,9 +832,10 @@ Replace the current buffer on success; display errors on failure." (defun gofmt-process-errors (filename errbuf) ;; Convert the gofmt stderr to something understood by the compilation mode. (with-current-buffer errbuf - (beginning-of-buffer) + (goto-char (point-min)) (insert "gofmt errors:\n") - (replace-string gofmt-stdin-tag (file-name-nondirectory filename) nil (point-min) (point-max)) + (if (search-forward gofmt-stdin-tag nil t) + (replace-match (file-name-nondirectory filename) nil t)) (display-buffer errbuf) (compilation-mode))) -- 2.48.1