[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el |
Date: |
Tue, 04 Feb 2003 07:05:03 -0500 |
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.20 emacs/lisp/smerge-mode.el:1.21
*** emacs/lisp/smerge-mode.el:1.20 Thu Oct 10 13:30:20 2002
--- emacs/lisp/smerge-mode.el Tue Feb 4 07:05:02 2003
***************
*** 4,10 ****
;; Author: Stefan Monnier <address@hidden>
;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.20 2002/10/10 17:30:20 monnier Exp $
;; This file is part of GNU Emacs.
--- 4,10 ----
;; Author: Stefan Monnier <address@hidden>
;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.21 2003/02/04 12:05:02 lektu Exp $
;; This file is part of GNU Emacs.
***************
*** 203,209 ****
(save-excursion (goto-char (point-min))
(not (re-search-forward smerge-begin-re nil t))))
(smerge-mode -1)))
!
(defun smerge-keep-all ()
"Keep all three versions.
--- 203,209 ----
(save-excursion (goto-char (point-min))
(not (re-search-forward smerge-begin-re nil t))))
(smerge-mode -1)))
!
(defun smerge-keep-all ()
"Keep all three versions.
***************
*** 337,343 ****
(_ (re-search-forward smerge-end-re))
(_ (assert (< orig-point (match-end 0))))
!
(other-end (match-beginning 0))
(end (match-end 0))
--- 337,343 ----
(_ (re-search-forward smerge-end-re))
(_ (assert (< orig-point (match-end 0))))
!
(other-end (match-beginning 0))
(end (match-end 0))
***************
*** 370,376 ****
(setq base-end mine-end)
(setq mine-start other-start)
(setq mine-end other-end)))
!
(store-match-data (list start end
mine-start mine-end
base-start base-end
--- 370,376 ----
(setq base-end mine-end)
(setq mine-start other-start)
(setq mine-end other-end)))
!
(store-match-data (list start end
mine-start mine-end
base-start base-end
***************
*** 469,475 ****
(buffer-enable-undo)
(set-buffer-modified-p nil)
(funcall mode))
!
(when base
(setq base (generate-new-buffer
(or name-base (concat "*" filename " BASE*"))))
--- 469,475 ----
(buffer-enable-undo)
(set-buffer-modified-p nil)
(funcall mode))
!
(when base
(setq base (generate-new-buffer
(or name-base (concat "*" filename " BASE*"))))
***************
*** 482,488 ****
(buffer-enable-undo)
(set-buffer-modified-p nil)
(funcall mode)))
!
;; the rest of the code is inspired from vc.el
;; Fire up ediff.
(set-buffer
--- 482,488 ----
(buffer-enable-undo)
(set-buffer-modified-p nil)
(funcall mode)))
!
;; the rest of the code is inspired from vc.el
;; Fire up ediff.
(set-buffer
***************
*** 491,497 ****
;; nil 'ediff-merge-revisions-with-ancestor buffer-file-name)
(ediff-merge-buffers mine other)))
;; nil 'ediff-merge-revisions buffer-file-name)))
!
;; Ediff is now set up, and we are in the control buffer.
;; Do a few further adjustments and take precautions for exit.
(set (make-local-variable 'smerge-ediff-windows) config)
--- 491,497 ----
;; nil 'ediff-merge-revisions-with-ancestor buffer-file-name)
(ediff-merge-buffers mine other)))
;; nil 'ediff-merge-revisions buffer-file-name)))
!
;; Ediff is now set up, and we are in the control buffer.
;; Do a few further adjustments and take precautions for exit.
(set (make-local-variable 'smerge-ediff-windows) config)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,
Juanma Barranquero <=