diff options
| author | Stefan Monnier | 2001-07-12 20:28:45 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2001-07-12 20:28:45 +0000 |
| commit | 176c92e68fcb0d692cb085f641d0fd6a3833c4ab (patch) | |
| tree | 5618a4527d0fccb977bcd69185d5b75c6bfa2873 /src | |
| parent | 1c56232f0d2082cafc8f95b822c0114dfaaf67d6 (diff) | |
| download | emacs-176c92e68fcb0d692cb085f641d0fd6a3833c4ab.tar.gz emacs-176c92e68fcb0d692cb085f641d0fd6a3833c4ab.zip | |
(Ffind_coding_systems_region_internal): If safe_codings
is t, don't try to append anything to it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/coding.c | 4 |
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 @@ | |||
| 1 | 2001-07-12 Stefan Monnier <monnier@cs.yale.edu> | ||
| 2 | |||
| 3 | * coding.c (Ffind_coding_systems_region_internal): If safe_codings | ||
| 4 | is t, don't try to append anything to it. | ||
| 5 | |||
| 1 | 2001-07-12 Eli Zaretskii <eliz@is.elta.co.il> | 6 | 2001-07-12 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 7 | ||
| 3 | * dired.c (file_name_completion): Pass dp->d_name to | 8 | * dired.c (file_name_completion): Pass dp->d_name to |
| @@ -13,9 +18,8 @@ | |||
| 13 | the event after checking it with x_handle_property_notify. | 18 | the event after checking it with x_handle_property_notify. |
| 14 | 19 | ||
| 15 | * xselect.c (TRACE0, TRACE1, TRACE2): New macros, defined | 20 | * xselect.c (TRACE0, TRACE1, TRACE2): New macros, defined |
| 16 | depending on TRACE_SELECTION. Replace fprintfs in #if 0 with | 21 | depending on TRACE_SELECTION. Replace fprintfs in #if 0 with |
| 17 | TRACE macros to facilitate debugging. Add additional trace | 22 | TRACE macros to facilitate debugging. Add additional trace statements. |
| 18 | statements. | ||
| 19 | (toplevel): Add prototypes for file-local functions. | 23 | (toplevel): Add prototypes for file-local functions. |
| 20 | (x_atom_to_symbol): Remove DPYINFO parameter. | 24 | (x_atom_to_symbol): Remove DPYINFO parameter. |
| 21 | 25 | ||
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", | |||
| 6409 | safe_codings = find_safe_codings (p2, p2end, safe_codings, work_table, | 6409 | safe_codings = find_safe_codings (p2, p2end, safe_codings, work_table, |
| 6410 | &single_byte_char_found); | 6410 | &single_byte_char_found); |
| 6411 | 6411 | ||
| 6412 | if (!single_byte_char_found) | 6412 | if (EQ (safe_codings, Qt)) |
| 6413 | ; /* Nothing to be done. */ | ||
| 6414 | else if (!single_byte_char_found) | ||
| 6413 | { | 6415 | { |
| 6414 | /* Append generic coding systems. */ | 6416 | /* Append generic coding systems. */ |
| 6415 | Lisp_Object args[2]; | 6417 | Lisp_Object args[2]; |