From 40b0e87a71aa2c0b396f2173b7ddd2708947ce39 Mon Sep 17 00:00:00 2001 From: Deepak Goel Date: Thu, 6 Dec 2007 18:43:43 +0000 Subject: [PATCH] Fix buggy `error' calls in textmode/ --- lisp/ChangeLog | 6 ++++++ lisp/textmodes/ispell.el | 2 +- lisp/textmodes/org.el | 2 +- lisp/textmodes/reftex.el | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5ad97fe4571..c5e0ebd2512 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2007-12-06 D. Goel + * textmodes/reftex.el (reftex-TeX-master-file): Ditto. + + * textmodes/org.el (org-paste-subtree): Ditto. + + * textmodes/ispell.el (ispell-process-line): Ditto. + * progmodes/vhdl-mode.el (vhdl-template-modify): Ditto. * progmodes/idlw-shell.el (idlwave-shell-send-command): Ditto. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 7fb6aed139a..b4ee00ae031 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -3063,7 +3063,7 @@ Returns the sum SHIFT due to changes in word replacements." ;; `query-replace' makes multiple corrections on the starting line. (or (ispell-looking-at (car poss)) ;; This occurs due to filter pipe problems - (error (concat "Ispell misalignment: word " + (error "%s" (concat "Ispell misalignment: word " "`%s' point %d; probably incompatible versions") (car poss) (marker-position word-start))) ;; ispell-cmd-loop can go recursive & change buffer diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 0535f679c40..5e2a9c0148e 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -6076,7 +6076,7 @@ If you want to insert the tree as is, just use \\[yank]. If optional TREE is given, use this text instead of the kill ring." (interactive "P") (unless (org-kill-is-subtree-p tree) - (error + (error "%s" (substitute-command-keys "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway"))) (let* ((txt (or tree (and kill-ring (current-kill 0)))) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 5383d88c386..47482916efb 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -705,7 +705,7 @@ on the menu bar. ((fboundp 'TeX-master-file) ; AUCTeX is loaded. Use its mechanism. (condition-case nil (TeX-master-file t) - (error (buffer-file-name)))) + (error "%s" (buffer-file-name)))) ((fboundp 'tex-main-file) (tex-main-file)) ; Emacs LaTeX mode ((boundp 'TeX-master) ; The variable is defined - lets use it. (cond -- 2.39.2