Mercurial > emacs
comparison lisp/smerge-mode.el @ 83116:6ae3d2810507
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-262
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264
Update from CVS: lispref/display.texi: emacs -> Emacs.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-266
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-267
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-156
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 01 May 2004 19:23:22 +0000 |
| parents | 9cb7ecf775c9 04a44f089cc1 |
| children | 360860a0006f |
comparison
equal
deleted
inserted
replaced
| 83115:141388e31bb7 | 83116:6ae3d2810507 |
|---|---|
| 63 string)) | 63 string)) |
| 64 | 64 |
| 65 (defcustom smerge-diff-switches | 65 (defcustom smerge-diff-switches |
| 66 (append '("-d" "-b") | 66 (append '("-d" "-b") |
| 67 (if (listp diff-switches) diff-switches (list diff-switches))) | 67 (if (listp diff-switches) diff-switches (list diff-switches))) |
| 68 "*A list of strings specifying switches to be be passed to diff. | 68 "*A list of strings specifying switches to be passed to diff. |
| 69 Used in `smerge-diff-base-mine' and related functions." | 69 Used in `smerge-diff-base-mine' and related functions." |
| 70 :group 'smerge | 70 :group 'smerge |
| 71 :type '(repeat string)) | 71 :type '(repeat string)) |
| 72 | 72 |
| 73 (defcustom smerge-auto-leave t | 73 (defcustom smerge-auto-leave t |
| 322 o) | 322 o) |
| 323 (if (<= i 0) | 323 (if (<= i 0) |
| 324 ;; Out of range | 324 ;; Out of range |
| 325 (popup-menu smerge-mode-menu) | 325 (popup-menu smerge-mode-menu) |
| 326 ;; Install overlay. | 326 ;; Install overlay. |
| 327 (setq o (make-overlay (match-beginning i) (match-end i))) | 327 (setq o (make-overlay (match-beginning i) (match-end i))) |
| 328 (unwind-protect | 328 (unwind-protect |
| 329 (progn | 329 (progn |
| 330 (overlay-put o 'face 'highlight) | 330 (overlay-put o 'face 'highlight) |
| 331 (sit-for 0) ;Display the new highlighting. | 331 (sit-for 0) ;Display the new highlighting. |
| 332 (popup-menu smerge-context-menu)) | 332 (popup-menu smerge-context-menu)) |
| 510 (inhibit-modification-hooks t) | 510 (inhibit-modification-hooks t) |
| 511 (m (buffer-modified-p))) | 511 (m (buffer-modified-p))) |
| 512 (unwind-protect | 512 (unwind-protect |
| 513 (add-text-properties start end smerge-text-properties) | 513 (add-text-properties start end smerge-text-properties) |
| 514 (restore-buffer-modified-p m))) | 514 (restore-buffer-modified-p m))) |
| 515 | 515 |
| 516 (store-match-data (list start end | 516 (store-match-data (list start end |
| 517 mine-start mine-end | 517 mine-start mine-end |
| 518 base-start base-end | 518 base-start base-end |
| 519 other-start other-end | 519 other-start other-end |
| 520 (when base-start (1- base-start)) base-start | 520 (when base-start (1- base-start)) base-start |