Mercurial > emacs
comparison lisp/ediff-util.el @ 53865:6a6dc234f296
(ediff-toggle-read-only): Remove extra format
string argument.
(ediff-toggle-regexp-match): Likewise.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 08 Feb 2004 22:38:28 +0000 |
| parents | d08ef8842be1 |
| children | e83349d94786 |
comparison
equal
deleted
inserted
replaced
| 53864:8589159e3bd8 | 53865:6a6dc234f296 |
|---|---|
| 1 ;;; ediff-util.el --- the core commands and utilities of ediff | 1 ;;; ediff-util.el --- the core commands and utilities of ediff |
| 2 | 2 |
| 3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc. |
| 4 | 4 |
| 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | 6 |
| 7 ;; This file is part of GNU Emacs. | 7 ;; This file is part of GNU Emacs. |
| 8 | 8 |
| 1078 ;; Signal a warning in this case. | 1078 ;; Signal a warning in this case. |
| 1079 (if (and file (not buffer-read-only) | 1079 (if (and file (not buffer-read-only) |
| 1080 (eq this-command 'ediff-toggle-read-only) | 1080 (eq this-command 'ediff-toggle-read-only) |
| 1081 (file-exists-p file) | 1081 (file-exists-p file) |
| 1082 (not (file-writable-p file))) | 1082 (not (file-writable-p file))) |
| 1083 (message "Warning: file %s is read-only" | 1083 (progn |
| 1084 (ediff-abbreviate-file-name file) (beep 1))) | 1084 (beep 1) |
| 1085 (message "Warning: file %s is read-only" | |
| 1086 (ediff-abbreviate-file-name file)))) | |
| 1085 )))) | 1087 )))) |
| 1086 | 1088 |
| 1087 ;; checkout if visited file is checked in | 1089 ;; checkout if visited file is checked in |
| 1088 (defun ediff-maybe-checkout (buf) | 1090 (defun ediff-maybe-checkout (buf) |
| 1089 (let ((file (expand-file-name (buffer-file-name buf))) | 1091 (let ((file (expand-file-name (buffer-file-name buf))) |
| 2231 alt-msg-connective "BOTH" | 2233 alt-msg-connective "BOTH" |
| 2232 alt-connective 'and)) | 2234 alt-connective 'and)) |
| 2233 (if (y-or-n-p | 2235 (if (y-or-n-p |
| 2234 (format | 2236 (format |
| 2235 "Ignore regions that match %s regexps, OK? " | 2237 "Ignore regions that match %s regexps, OK? " |
| 2236 msg-connective alt-msg-connective)) | 2238 msg-connective)) |
| 2237 (message "Will ignore regions that match %s regexps" msg-connective) | 2239 (message "Will ignore regions that match %s regexps" msg-connective) |
| 2238 (setq ediff-hide-regexp-connective alt-connective) | 2240 (setq ediff-hide-regexp-connective alt-connective) |
| 2239 (message "Will ignore regions that match %s regexps" | 2241 (message "Will ignore regions that match %s regexps" |
| 2240 alt-msg-connective)) | 2242 alt-msg-connective)) |
| 2241 | 2243 |
| 2270 alt-msg-connective "BOTH" | 2272 alt-msg-connective "BOTH" |
| 2271 alt-connective 'and)) | 2273 alt-connective 'and)) |
| 2272 (if (y-or-n-p | 2274 (if (y-or-n-p |
| 2273 (format | 2275 (format |
| 2274 "Focus on regions that match %s regexps, OK? " | 2276 "Focus on regions that match %s regexps, OK? " |
| 2275 msg-connective alt-msg-connective)) | 2277 msg-connective)) |
| 2276 (message "Will focus on regions that match %s regexps" | 2278 (message "Will focus on regions that match %s regexps" |
| 2277 msg-connective) | 2279 msg-connective) |
| 2278 (setq ediff-focus-regexp-connective alt-connective) | 2280 (setq ediff-focus-regexp-connective alt-connective) |
| 2279 (message "Will focus on regions that match %s regexps" | 2281 (message "Will focus on regions that match %s regexps" |
| 2280 alt-msg-connective)) | 2282 alt-msg-connective)) |