summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2001-07-12 20:28:45 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2001-07-12 20:28:45 +0000
commit176c92e68fcb0d692cb085f641d0fd6a3833c4ab (patch)
tree5618a4527d0fccb977bcd69185d5b75c6bfa2873
parent1c56232f0d2082cafc8f95b822c0114dfaaf67d6 (diff)
downloademacs-176c92e68fcb0d692cb085f641d0fd6a3833c4ab.tar.gz
(Ffind_coding_systems_region_internal): If safe_codings
is t, don't try to append anything to it.
-rw-r--r--src/ChangeLog10
-rw-r--r--src/coding.c4
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 77f7b87175b..0174ffd8d80 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-12 Stefan Monnier <monnier@cs.yale.edu>
+
+ * coding.c (Ffind_coding_systems_region_internal): If safe_codings
+ is t, don't try to append anything to it.
+
2001-07-12 Eli Zaretskii <eliz@is.elta.co.il>
* dired.c (file_name_completion): Pass dp->d_name to
@@ -13,9 +18,8 @@
the event after checking it with x_handle_property_notify.
* xselect.c (TRACE0, TRACE1, TRACE2): New macros, defined
- depending on TRACE_SELECTION. Replace fprintfs in #if 0 with
- TRACE macros to facilitate debugging. Add additional trace
- statements.
+ depending on TRACE_SELECTION. Replace fprintfs in #if 0 with
+ TRACE macros to facilitate debugging. Add additional trace statements.
(toplevel): Add prototypes for file-local functions.
(x_atom_to_symbol): Remove DPYINFO parameter.
diff --git a/src/coding.c b/src/coding.c
index 07233ee4d7e..34773217cc7 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6409,7 +6409,9 @@ DEFUN ("find-coding-systems-region-internal",
safe_codings = find_safe_codings (p2, p2end, safe_codings, work_table,
&single_byte_char_found);
- if (!single_byte_char_found)
+ if (EQ (safe_codings, Qt))
+ ; /* Nothing to be done. */
+ else if (!single_byte_char_found)
{
/* Append generic coding systems. */
Lisp_Object args[2];