aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-10-19 01:25:38 +0000
committerStefan Monnier2008-10-19 01:25:38 +0000
commit4f5a643807ba3f3b2dc611acdadb796e5fa19c86 (patch)
tree99ec992cb22e98314364784f4a1aea45b9defe43
parentf06763be7a315dc308a8313fe604aca2848759bc (diff)
downloademacs-old-branches/EMACS_22_BASE.tar.gz
emacs-old-branches/EMACS_22_BASE.zip
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/mule-conf.el10
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46fb08a0e53..fa39b17cadb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-10-19 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * international/mule-conf.el: Fix last change.
4
12008-10-17 Stefan Monnier <monnier@iro.umontreal.ca> 52008-10-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * international/mule-conf.el (emacs-internal): New coding system alias. 7 * international/mule-conf.el (emacs-internal): New coding system alias.
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 3f9a5cc27d1..b945744ee8b 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -316,11 +316,6 @@ character."
316 316
317(define-coding-system-alias 'binary 'no-conversion) 317(define-coding-system-alias 'binary 'no-conversion)
318 318
319;; The encoding used internally. This encoding is meant to be able to save
320;; any multibyte buffer without losing information. It can change between
321;; Emacs releases, tho, so should only be used for internal files.
322(define-coding-system-alias 'emacs-internal 'emacs-mule-unix)
323
324(put 'undecided 'coding-system 319(put 'undecided 'coding-system
325 (vector t ?- "No conversion on encoding, automatic conversion on decoding" 320 (vector t ?- "No conversion on encoding, automatic conversion on decoding"
326 (list 'alias-coding-systems '(undecided) 321 (list 'alias-coding-systems '(undecided)
@@ -349,6 +344,11 @@ byte."
349 '((safe-charsets . t) 344 '((safe-charsets . t)
350 (composition . t))) 345 (composition . t)))
351 346
347;; The encoding used internally. This encoding is meant to be able to save
348;; any multibyte buffer without losing information. It can change between
349;; Emacs releases, tho, so should only be used for internal files.
350(define-coding-system-alias 'emacs-internal 'emacs-mule-unix)
351
352(make-coding-system 352(make-coding-system
353 'raw-text 5 ?t 353 'raw-text 5 ?t
354 "Raw text, which means text contains random 8-bit codes. 354 "Raw text, which means text contains random 8-bit codes.