[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 207e191: Fix (error ...) error
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-25 207e191: Fix (error ...) error |
Date: |
Fri, 08 Jan 2016 23:10:12 +0000 |
branch: emacs-25
commit 207e191f1b8042afe16f6c61440dacc79c7782b5
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Fix (error ...) error
Problem reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00561.html
* lisp/vc/add-log.el (change-log-goto-source): Fix typos
introduced in my Aug 28 change, where I got confused by the
two meanings of (error ...).
---
lisp/vc/add-log.el | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index a5fe956..45e8633 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -481,9 +481,10 @@ try to visit the file for the change under `point'
instead."
(apply 'change-log-goto-source-1
(append change-log-find-head change-log-find-tail))
(error
- "Cannot find more matches for tag `%s' in file `%s'"
- (car change-log-find-head)
- (nth 2 change-log-find-head))))
+ (format-message
+ "Cannot find more matches for tag `%s' in file `%s'"
+ (car change-log-find-head)
+ (nth 2 change-log-find-head)))))
(save-excursion
(let* ((at (point))
(tag-at (change-log-search-tag-name))
@@ -515,8 +516,9 @@ try to visit the file for the change under `point' instead."
(condition-case nil
(setq change-log-find-tail
(apply 'change-log-goto-source-1 change-log-find-head))
- (error "Cannot find matches for tag `%s' in file `%s'"
- tag file))))))))
+ (error
+ (format-message "Cannot find matches for tag `%s' in file `%s'"
+ tag file)))))))))
(defun change-log-next-error (&optional argp reset)
"Move to the Nth (default 1) next match in a ChangeLog buffer.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 207e191: Fix (error ...) error,
Paul Eggert <=