Mercurial > emacs

comparison lisp/ediff-util.el @ 38422:7a94f1c588c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some fixes to follow coding conventions.
author Pavel Janík <Pavel@Janik.cz>
date Mon, 16 Jul 2001 07:46:48 +0000
parents f6386773ce30
children 10482dd382e7
comparison
equal deleted inserted replaced
38421:207796d8dffc 38422:7a94f1c588c4
18 18
19 ;; You should have received a copy of the GNU General Public License 19 ;; You should have received a copy of the GNU General Public License
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA. 22 ;; Boston, MA 02111-1307, USA.
23
24 ;;; Commentary:
23 25
24 ;;; Code: 26 ;;; Code:
25 27
26 (provide 'ediff-util) 28 (provide 'ediff-util)
27 29
267 (setq merge-buffer-file 269 (setq merge-buffer-file
268 (ediff-convert-standard-filename 270 (ediff-convert-standard-filename
269 (expand-file-name merge-buffer-file))) 271 (expand-file-name merge-buffer-file)))
270 ;; check the directory exists 272 ;; check the directory exists
271 (or (file-exists-p (file-name-directory merge-buffer-file)) 273 (or (file-exists-p (file-name-directory merge-buffer-file))
272 (error "Directory %s given as place to save the merge doesn't exist." 274 (error "Directory %s given as place to save the merge doesn't exist"
273 (abbreviate-file-name 275 (abbreviate-file-name
274 (file-name-directory merge-buffer-file)))) 276 (file-name-directory merge-buffer-file))))
275 (if (and (file-exists-p merge-buffer-file) 277 (if (and (file-exists-p merge-buffer-file)
276 (file-directory-p merge-buffer-file)) 278 (file-directory-p merge-buffer-file))
277 (error "The merge buffer file %s must not be a directory" 279 (error "The merge buffer file %s must not be a directory"