[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115725: Change some `error's to `user-error's.
From: |
Xue Fuqiao |
Subject: |
[Emacs-diffs] trunk r115725: Change some `error's to `user-error's. |
Date: |
Tue, 24 Dec 2013 04:41:23 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115725
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-24 12:41:18 +0800
message:
Change some `error's to `user-error's.
* admin/admin.el (add-release-logs):
(set-version-in-file, set-version, set-copyright):
Use `user-error'.
modified:
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
admin/admin.el admin.el-20091113204419-o5vbwnq5f7feedwu-2254
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2013-12-22 18:24:23 +0000
+++ b/admin/ChangeLog 2013-12-24 04:41:18 +0000
@@ -1,3 +1,9 @@
+2013-12-24 Xue Fuqiao <address@hidden>
+
+ * admin.el (add-release-logs):
+ (set-version-in-file, set-version, set-copyright):
+ Use `user-error'.
+
2013-12-22 Eli Zaretskii <address@hidden>
* unidata/unidata-gen.el (unidata-split-name): Don't give any NAME
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2013-08-27 17:19:04 +0000
+++ b/admin/admin.el 2013-12-24 04:41:18 +0000
@@ -21,7 +21,7 @@
;; add-release-logs Add ``Version X released'' change log entries.
;; set-version Change Emacs version number in source tree.
-;; set-copyright Change emacs short copyright string (eg as
+;; set-copyright Change Emacs short copyright string (eg as
;; printed by --version) in source tree.
;;; Code:
@@ -46,7 +46,7 @@
(funcall add-log-time-format))))))
(setq root (expand-file-name root))
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
- (error "%s doesn't seem to be the root of an Emacs source tree" root))
+ (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
(require 'add-log)
(or date (setq date (let ((add-log-time-zone-rule t))
(funcall add-log-time-format))))
@@ -62,10 +62,11 @@
(insert entry))))
(defun set-version-in-file (root file version rx)
+ "Subroutine of `set-version'."
(find-file (expand-file-name file root))
(goto-char (point-min))
- (unless (re-search-forward rx nil t)
- (error "Version not found in %s" file))
+ (unless (re-search-forward rx nil :noerror)
+ (user-error "Version not found in %s" file))
(replace-match (format "%s" version) nil nil nil 1))
(defun set-version (root version)
@@ -73,7 +74,7 @@
Root must be the root of an Emacs source tree."
(interactive "DEmacs root directory: \nsVersion number: ")
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
- (error "%s doesn't seem to be the root of an Emacs source tree" root))
+ (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
(set-version-in-file root "README" version
(rx (and "version" (1+ space)
(submatch (1+ (in "0-9."))))))
@@ -167,7 +168,7 @@
(format "Copyright (C) %s Free Software Foundation, Inc."
(format-time-string "%Y")))))
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
- (error "%s doesn't seem to be the root of an Emacs source tree" root))
+ (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
(set-version-in-file root "configure.ac" copyright
(rx (and bol "copyright" (0+ (not (in ?\")))
?\" (submatch (1+ (not (in ?\")))) ?\")))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115725: Change some `error's to `user-error's.,
Xue Fuqiao <=