Mercurial > emacs
comparison lisp/smerge-mode.el @ 30358:636fe93e755c
(smerge-mode-menu): Fill it out.
author | Dave Love <fx@gnu.org> |
---|---|
date | Fri, 21 Jul 2000 13:52:19 +0000 |
parents | 6c4e371d4efd |
children | f7b06560383b |
comparison
equal
deleted
inserted
replaced
30357:2696b797cd2f | 30358:636fe93e755c |
---|---|
2 | 2 |
3 ;; Copyright (C) 1999 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1999 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
6 ;; Keywords: merge diff3 cvs conflict | 6 ;; Keywords: merge diff3 cvs conflict |
7 ;; Revision: $Id: smerge-mode.el,v 1.2 2000/03/22 00:54:55 monnier Exp $ | 7 ;; Revision: $Id: smerge-mode.el,v 1.3 2000/05/25 18:08:26 fx Exp $ |
8 | 8 |
9 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |
10 | 10 |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | 11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
12 ;; it under the terms of the GNU General Public License as published by | 12 ;; it under the terms of the GNU General Public License as published by |
124 "Keymap for `smerge-mode'.") | 124 "Keymap for `smerge-mode'.") |
125 | 125 |
126 (easy-menu-define smerge-mode-menu smerge-mode-map | 126 (easy-menu-define smerge-mode-menu smerge-mode-map |
127 "Menu for `smerge-mode'." | 127 "Menu for `smerge-mode'." |
128 '("SMerge" | 128 '("SMerge" |
129 ["Invoke Ediff" smerge-ediff t] | 129 ["Next" smerge-next :help "Go to next conflict"] |
130 ["Previous" smerge-prev :help "Go to previous'th conflict"] | |
131 ["Keep All" smerge-keep-all :help "Keep all three versions"] | |
132 ["Revert to Base" smerge-keep-base :help "Revert to base version"] | |
133 ["Keep Other" smerge-keep-other :help "Keep `other' version"] | |
134 ["Keep Yours" smerge-keep-mine :help "Keep your version"] | |
135 ["Keep Current" smerge-keep-current | |
136 :help "Use current (at point) version"] | |
137 "--" | |
138 ["Diff Base/Mine" smerge-diff-base-mine | |
139 :help "Diff `base' and `mine' for current conflict"] | |
140 ["Diff Base/Other" smerge-diff-base-other | |
141 :help "Diff `base' and `other' for current conflict"] | |
142 ["Diff Mine/Other" smerge-diff-mine-other | |
143 :help "Diff `mine' and `other' for current conflict"] | |
144 "--" | |
145 ["Invoke Ediff" smerge-ediff | |
146 :help "Use Ediff to resolve the conflicts"] | |
130 )) | 147 )) |
131 | 148 |
132 (defconst smerge-font-lock-keywords | 149 (defconst smerge-font-lock-keywords |
133 '((smerge-find-conflict | 150 '((smerge-find-conflict |
134 (1 smerge-mine-face prepend) | 151 (1 smerge-mine-face prepend) |
442 | 459 |
443 (provide 'smerge-mode) | 460 (provide 'smerge-mode) |
444 | 461 |
445 ;;; Change Log: | 462 ;;; Change Log: |
446 ;; $Log: smerge-mode.el,v $ | 463 ;; $Log: smerge-mode.el,v $ |
464 ;; Revision 1.3 2000/05/25 18:08:26 fx | |
465 ;; (smerge-diff-switches): Don't use list* in defcustom. | |
466 ;; | |
447 ;; Revision 1.2 2000/03/22 00:54:55 monnier | 467 ;; Revision 1.2 2000/03/22 00:54:55 monnier |
448 ;; (smerge-auto-leave): New function and variable. | 468 ;; (smerge-auto-leave): New function and variable. |
449 ;; (smerge-basic-map): Rename from smerge-basic-keymap. | 469 ;; (smerge-basic-map): Rename from smerge-basic-keymap. |
450 ;; Change the bindings for smerge-diff-*. | 470 ;; Change the bindings for smerge-diff-*. |
451 ;; (smerge-*-map): Use easy-mmode-defmap. | 471 ;; (smerge-*-map): Use easy-mmode-defmap. |