aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2005-07-07 06:23:10 +0000
committerKenichi Handa2005-07-07 06:23:10 +0000
commit43b557d50704df1dc45cc201a5596c05b62a6178 (patch)
treeb3ed4e841ba44525170360de169aec082a58d0fe
parent4a6cbbc4168e473cde0a3230afbbcc7612b56889 (diff)
downloademacs-43b557d50704df1dc45cc201a5596c05b62a6178.tar.gz
emacs-43b557d50704df1dc45cc201a5596c05b62a6178.zip
(make-coding-system): Describe
`ascii-incompatible' property in the docstring. (set-file-name-coding-system): Signal an error if coding-system is ascii-incompatible. (set-keyboard-coding-system): Likewise.
-rw-r--r--lisp/ChangeLog16
-rw-r--r--lisp/international/mule.el12
2 files changed, 28 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a3ce31d8cd..a40afc7733a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
12005-07-07 Kenichi Handa <handa@m17n.org>
2
3 * international/mule.el (make-coding-system): Describe
4 `ascii-incompatible' property in the docstring.
5 (set-file-name-coding-system): Signal an error if coding-system is
6 ascii-incompatible.
7 (set-keyboard-coding-system): Likewise.
8
9 * international/mule-cmds.el (set-default-coding-systems): Don't
10 set default-file-name-coding-system and
11 default-keyboard-coding-system if coding-system is
12 ASCII-incompatible.
13
14 * international/utf-16.el: Declare that all UTF-16-based coding
15 systems ASCII-incompatible.
16
12005-07-07 Nick Roberts <nickrob@snap.net.nz> 172005-07-07 Nick Roberts <nickrob@snap.net.nz>
2 18
3 * progmodes/gud.el: Require font-lock for displaying errors. 19 * progmodes/gud.el: Require font-lock for displaying errors.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index cf5c2c75a6a..741a6c7eff5 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -839,6 +839,12 @@ following properties are recognized:
839 If the value is non-nil, the coding system preserves composition 839 If the value is non-nil, the coding system preserves composition
840 information. 840 information.
841 841
842 o ascii-incompatible
843
844 If the value is non-nil, the coding system is not compatible
845 with ASCII, which means it encodes or decodes ASCII character
846 string to the different byte sequence.
847
842These properties are set in PLIST, a property list. This function 848These properties are set in PLIST, a property list. This function
843also sets properties `coding-category' and `alias-coding-systems' 849also sets properties `coding-category' and `alias-coding-systems'
844automatically. 850automatically.
@@ -1191,6 +1197,9 @@ It actually just set the variable `file-name-coding-system' (which
1191see) to CODING-SYSTEM." 1197see) to CODING-SYSTEM."
1192 (interactive "zCoding system for file names (default, nil): ") 1198 (interactive "zCoding system for file names (default, nil): ")
1193 (check-coding-system coding-system) 1199 (check-coding-system coding-system)
1200 (if (and coding-system
1201 (coding-system-get coding-system 'ascii-incompatible))
1202 (error "%s is not ASCII-compatible" coding-system))
1194 (setq file-name-coding-system coding-system)) 1203 (setq file-name-coding-system coding-system))
1195 1204
1196(defvar default-terminal-coding-system nil 1205(defvar default-terminal-coding-system nil
@@ -1247,6 +1256,9 @@ or by the previous use of this command."
1247 (setq coding-system default-keyboard-coding-system)) 1256 (setq coding-system default-keyboard-coding-system))
1248 (if coding-system 1257 (if coding-system
1249 (setq default-keyboard-coding-system coding-system)) 1258 (setq default-keyboard-coding-system coding-system))
1259 (if (and coding-system
1260 (coding-system-get coding-system 'ascii-incompatible))
1261 (error "%s is not ASCII-compatible" coding-system))
1250 (set-keyboard-coding-system-internal coding-system) 1262 (set-keyboard-coding-system-internal coding-system)
1251 (setq keyboard-coding-system coding-system) 1263 (setq keyboard-coding-system coding-system)
1252 (encoded-kbd-mode (if coding-system 1 0))) 1264 (encoded-kbd-mode (if coding-system 1 0)))