diff options
| author | Miles Bader | 2006-07-19 00:42:56 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-07-19 00:42:56 +0000 |
| commit | 63db3c1b3ffa669435b10aa362115ef664990ab2 (patch) | |
| tree | a62f68b147d4265ce993136af897d4f348570594 /src/coding.c | |
| parent | 2988d6b36d310ba98ea1fed570142f436804fc18 (diff) | |
| parent | 83676aa2e399363120942ef5ea19f8af6b75e8e8 (diff) | |
| download | emacs-63db3c1b3ffa669435b10aa362115ef664990ab2.tar.gz emacs-63db3c1b3ffa669435b10aa362115ef664990ab2.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 343-356)
- Update from CVS
- Update for ERC 5.1.3.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 113-115)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 023dc95c35e..cb6df79fca0 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7170,8 +7170,7 @@ function `define-coding-system'. */) | |||
| 7170 | } | 7170 | } |
| 7171 | if (!NILP (Fcoding_system_p (coding_system))) | 7171 | if (!NILP (Fcoding_system_p (coding_system))) |
| 7172 | return coding_system; | 7172 | return coding_system; |
| 7173 | while (1) | 7173 | xsignal1 (Qcoding_system_error, coding_system); |
| 7174 | Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil)); | ||
| 7175 | } | 7174 | } |
| 7176 | 7175 | ||
| 7177 | 7176 | ||