aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2003-01-10 23:30:52 +0000
committerDave Love2003-01-10 23:30:52 +0000
commit31d98fa0b4c8a23d2fc37333b5067fa3c643ef9b (patch)
tree6bfd4205835262fca6822c0922de9280bd82ac2e
parent365aee82386ed9d174d71448a7a2f4a936a4c379 (diff)
downloademacs-31d98fa0b4c8a23d2fc37333b5067fa3c643ef9b.tar.gz
emacs-31d98fa0b4c8a23d2fc37333b5067fa3c643ef9b.zip
(cp-make-coding-system): Fix last
change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/code-pages.el9
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 504e061643c..9cf56e55285 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-01-10 Dave Love <fx@gnu.org>
2
3 * international/code-pages.el (cp-make-coding-system): Fix last
4 change.
5
12003-01-10 Kai Gro,A_(Bjohann <kai.grossjohann@uni-duisburg.de> 62003-01-10 Kai Gro,A_(Bjohann <kai.grossjohann@uni-duisburg.de>
2 7
3 * dired.el (dired-garbage-files-regexp): Use \\' instead of $ and 8 * dired.el (dired-garbage-files-regexp): Use \\' instead of $ and
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index eeed98a49d1..3af57bc775b 100644
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -107,7 +107,7 @@ CS is a base coding system or alias."
107 (remq cs (aref char-coding-system-table k))))) 107 (remq cs (aref char-coding-system-table k)))))
108 chars)))) 108 chars))))
109 109
110;; Fix things that have been, or might be done by codepage.el. 110;; Fix things that have been, or might be, done by codepage.el.
111(eval-after-load "codepage" 111(eval-after-load "codepage"
112 '(progn 112 '(progn
113 113
@@ -188,9 +188,10 @@ corresponding args of `make-coding-system'. If MNEMONIC isn't given,
188 ((loop 188 ((loop
189 (read-multibyte-character r0 r1) 189 (read-multibyte-character r0 r1)
190 (translate-character ,encoder r0 r1) 190 (translate-character ,encoder r0 r1)
191 (if (r0 != ,(charset-id 'eight-bit-graphic)) 191 (if (r0 != ,(charset-id 'ascii))
192 (if (r0 != ,(charset-id 'eight-bit-control)) 192 (if (r0 != ,(charset-id 'eight-bit-graphic))
193 (r1 = ??))) 193 (if (r0 != ,(charset-id 'eight-bit-control))
194 (r1 = ??))))
194 (write-repeat r1))))))) 195 (write-repeat r1)))))))
195 `(let ((translation-table (cp-make-translation-table ,v)) 196 `(let ((translation-table (cp-make-translation-table ,v))
196 (codes (cp-valid-codes ,v))) 197 (codes (cp-valid-codes ,v)))