diff options
| author | Andreas Schwab <[email protected]> | 2004-02-08 22:38:28 +0000 |
|---|---|---|
| committer | Andreas Schwab <[email protected]> | 2004-02-08 22:38:28 +0000 |
| commit | e314af72c88228cbc5ca6974029292f99676ce69 (patch) | |
| tree | accba9b7eceadc483836a96d384fb8b4cadf53c4 /lisp/ediff-util.el | |
| parent | d71eb4d4f260f1cef4d4baef4a97cd80b1bfda4b (diff) | |
(ediff-toggle-read-only): Remove extra format
string argument.
(ediff-toggle-regexp-match): Likewise.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index d69997394e..9550e65c2e 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1,6 +1,6 @@ ;;; ediff-util.el --- the core commands and utilities of ediff -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> @@ -1080,8 +1080,10 @@ of the current buffer." (eq this-command 'ediff-toggle-read-only) (file-exists-p file) (not (file-writable-p file))) - (message "Warning: file %s is read-only" - (ediff-abbreviate-file-name file) (beep 1))) + (progn + (beep 1) + (message "Warning: file %s is read-only" + (ediff-abbreviate-file-name file)))) )))) ;; checkout if visited file is checked in @@ -2233,7 +2235,7 @@ a regular expression typed in by the user." (if (y-or-n-p (format "Ignore regions that match %s regexps, OK? " - msg-connective alt-msg-connective)) + msg-connective)) (message "Will ignore regions that match %s regexps" msg-connective) (setq ediff-hide-regexp-connective alt-connective) (message "Will ignore regions that match %s regexps" @@ -2272,7 +2274,7 @@ a regular expression typed in by the user." (if (y-or-n-p (format "Focus on regions that match %s regexps, OK? " - msg-connective alt-msg-connective)) + msg-connective)) (message "Will focus on regions that match %s regexps" msg-connective) (setq ediff-focus-regexp-connective alt-connective) |