Remove CVS merge cookie left in.
[emacs.git] / lisp / inc-vers.el
blob0a4a43f0ea8847ae5b0d4d060449ce3387c21933
1 ;;; inc-vers.el --- load this to increment the recorded Emacs version number.
3 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
5 ;; Maintainer: FSF
6 ;; Keywords: internal
8 ;; This file is part of GNU Emacs.
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 2, or (at your option)
13 ;; any later version.
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
24 ;;; Code:
26 (insert-file-contents "../lisp/version.el")
28 (re-search-forward "emacs-version \"[^\"]*[0-9]+\"")
29 (forward-char -1)
30 (save-excursion
31 (save-restriction
32 (narrow-to-region (point)
33 (progn (skip-chars-backward "0-9") (point)))
34 (goto-char (point-min))
35 (let ((version (read (current-buffer))))
36 (delete-region (point-min) (point-max))
37 (prin1 (1+ version) (current-buffer)))))
38 (skip-chars-backward "^\"")
39 (message "New Emacs version will be %s"
40 (buffer-substring (point)
41 (progn (skip-chars-forward "^\"") (point))))
44 (if (and (file-accessible-directory-p "../lisp/")
45 (null (file-writable-p "../lisp/version.el")))
46 (delete-file "../lisp/version.el"))
47 (if (eq system-type 'ms-dos) (setq buffer-file-type t))
48 (write-region (point-min) (point-max) "../lisp/version.el" nil 'nomsg)
49 (erase-buffer)
50 (set-buffer-modified-p nil)
52 (kill-emacs)
54 ;;; inc-vers.el ends here