aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Goel2007-12-06 18:43:43 +0000
committerDeepak Goel2007-12-06 18:43:43 +0000
commit40b0e87a71aa2c0b396f2173b7ddd2708947ce39 (patch)
tree828f286e2975b3fef5f98e089f89a4dcac8cdb39
parent768b14f8a010ac4a86ae9d9d6a80f06d429f4372 (diff)
downloademacs-40b0e87a71aa2c0b396f2173b7ddd2708947ce39.tar.gz
emacs-40b0e87a71aa2c0b396f2173b7ddd2708947ce39.zip
Fix buggy `error' calls in textmode/
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/textmodes/ispell.el2
-rw-r--r--lisp/textmodes/org.el2
-rw-r--r--lisp/textmodes/reftex.el2
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 @@
12007-12-06 D. Goel <deego3@gmail.com> 12007-12-06 D. Goel <deego3@gmail.com>
2 2
3 * textmodes/reftex.el (reftex-TeX-master-file): Ditto.
4
5 * textmodes/org.el (org-paste-subtree): Ditto.
6
7 * textmodes/ispell.el (ispell-process-line): Ditto.
8
3 * progmodes/vhdl-mode.el (vhdl-template-modify): Ditto. 9 * progmodes/vhdl-mode.el (vhdl-template-modify): Ditto.
4 10
5 * progmodes/idlw-shell.el (idlwave-shell-send-command): Ditto. 11 * 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."
3063 ;; `query-replace' makes multiple corrections on the starting line. 3063 ;; `query-replace' makes multiple corrections on the starting line.
3064 (or (ispell-looking-at (car poss)) 3064 (or (ispell-looking-at (car poss))
3065 ;; This occurs due to filter pipe problems 3065 ;; This occurs due to filter pipe problems
3066 (error (concat "Ispell misalignment: word " 3066 (error "%s" (concat "Ispell misalignment: word "
3067 "`%s' point %d; probably incompatible versions") 3067 "`%s' point %d; probably incompatible versions")
3068 (car poss) (marker-position word-start))) 3068 (car poss) (marker-position word-start)))
3069 ;; ispell-cmd-loop can go recursive & change buffer 3069 ;; 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].
6076If optional TREE is given, use this text instead of the kill ring." 6076If optional TREE is given, use this text instead of the kill ring."
6077 (interactive "P") 6077 (interactive "P")
6078 (unless (org-kill-is-subtree-p tree) 6078 (unless (org-kill-is-subtree-p tree)
6079 (error 6079 (error "%s"
6080 (substitute-command-keys 6080 (substitute-command-keys
6081 "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway"))) 6081 "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway")))
6082 (let* ((txt (or tree (and kill-ring (current-kill 0)))) 6082 (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.
705 ((fboundp 'TeX-master-file) ; AUCTeX is loaded. Use its mechanism. 705 ((fboundp 'TeX-master-file) ; AUCTeX is loaded. Use its mechanism.
706 (condition-case nil 706 (condition-case nil
707 (TeX-master-file t) 707 (TeX-master-file t)
708 (error (buffer-file-name)))) 708 (error "%s" (buffer-file-name))))
709 ((fboundp 'tex-main-file) (tex-main-file)) ; Emacs LaTeX mode 709 ((fboundp 'tex-main-file) (tex-main-file)) ; Emacs LaTeX mode
710 ((boundp 'TeX-master) ; The variable is defined - lets use it. 710 ((boundp 'TeX-master) ; The variable is defined - lets use it.
711 (cond 711 (cond