aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorKaroly Lorentey2006-07-29 09:59:12 +0000
committerKaroly Lorentey2006-07-29 09:59:12 +0000
commit251bc578cc636223d618d06cf2a2bb7d07db9cce (patch)
tree58e1c6b0a35bb4a77e6cb77876e4bc6a9d3f2ab2 /src/coding.c
parent99715bbc447eb633e45ffa23b87284771ce3ac74 (diff)
parent0ed0527cb02180a50f6744086ce3a487740c73e4 (diff)
downloademacs-251bc578cc636223d618d06cf2a2bb7d07db9cce.tar.gz
emacs-251bc578cc636223d618d06cf2a2bb7d07db9cce.zip
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-351 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-352 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-353 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-354 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-355 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-356 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-357 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-358 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-359 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-360 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-361 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-362 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-363 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-364 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-365 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-366 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-367 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-368 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-369 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-370 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-115 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-116 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-117 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-118 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-119 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-120 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-573
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c
index e35cb5ddc09..5b067b9dd2f 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6068,7 +6068,7 @@ set_conversion_work_buffer (multibyte)
6068 /* As we are already in the work buffer, we must generate a new 6068 /* As we are already in the work buffer, we must generate a new
6069 buffer for the work. */ 6069 buffer for the work. */
6070 Lisp_Object name; 6070 Lisp_Object name;
6071 6071
6072 name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil); 6072 name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil);
6073 buffer = buffer_to_kill = Fget_buffer_create (name); 6073 buffer = buffer_to_kill = Fget_buffer_create (name);
6074 buf = XBUFFER (buffer); 6074 buf = XBUFFER (buffer);
@@ -6591,8 +6591,7 @@ The value of this property should be a vector of length 5. */)
6591 } 6591 }
6592 if (!NILP (Fcoding_system_p (coding_system))) 6592 if (!NILP (Fcoding_system_p (coding_system)))
6593 return coding_system; 6593 return coding_system;
6594 while (1) 6594 xsignal1 (Qcoding_system_error, coding_system);
6595 Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil));
6596} 6595}
6597 6596
6598Lisp_Object 6597Lisp_Object
@@ -7631,11 +7630,13 @@ This function is internal use only. */)
7631 Lisp_Object safe_chars, slot; 7630 Lisp_Object safe_chars, slot;
7632 7631
7633 if (NILP (Fcheck_coding_system (coding_system))) 7632 if (NILP (Fcheck_coding_system (coding_system)))
7634 Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil)); 7633 xsignal1 (Qcoding_system_error, coding_system);
7634
7635 safe_chars = coding_safe_chars (coding_system); 7635 safe_chars = coding_safe_chars (coding_system);
7636 if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars)) 7636 if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars))
7637 error ("No valid safe-chars property for %s", 7637 error ("No valid safe-chars property for %s",
7638 SDATA (SYMBOL_NAME (coding_system))); 7638 SDATA (SYMBOL_NAME (coding_system)));
7639
7639 if (EQ (safe_chars, Qt)) 7640 if (EQ (safe_chars, Qt))
7640 { 7641 {
7641 if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars)))) 7642 if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars))))