(U+6215): Apply new conventions for glyph granularity.

[chise/xemacs-chise.git.1] / lisp / coding.el

diff --git a/lisp/coding.el b/lisp/coding.el
index d47e0a3..d00f7b4 100644 (file)
--- a/lisp/coding.el
+++ b/lisp/coding.el
@@ -21,7 +21,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING.  If not, write to the 
+;; along with XEmacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
@@ -38,9 +38,9 @@
 
 ;; override the default value defined in loaddefs.el.
 (setq-default modeline-format
-  (cons (purecopy "")
-       (cons 'modeline-multibyte-status
-             (cdr modeline-format))))
+             (cons ""
+                   (cons 'modeline-multibyte-status
+                         (cdr modeline-format))))
 
 (defun modify-coding-system-alist (target-type regexp coding-system)
   "Modify one of look up tables for finding a coding system on I/O operation.
@@ -50,7 +50,7 @@ There are three of such tables, `file-coding-system-alist',
 TARGET-TYPE specifies which of them to modify.
 If it is `file', it affects `file-coding-system-alist' (which see).
 If it is `process', it affects `process-coding-system-alist' (which see).
-If it is `network', it affects `network-codign-system-alist' (which see).
+If it is `network', it affects `network-coding-system-alist' (which see).
 
 REGEXP is a regular expression matching a target of I/O operation.
 The target is a file name if TARGET-TYPE is `file', a program name if
@@ -104,6 +104,9 @@ or a function symbol which, when called, returns such a cons cell."
   (interactive "zkeyboard-coding-system: ")
   (get-coding-system coding-system) ; correctness check
   (setq keyboard-coding-system coding-system)
+  (if (eq (device-type) 'tty)
+      (set-console-tty-input-coding-system
+       (device-console) keyboard-coding-system))
   (redraw-modeline t))
 
 (defsubst terminal-coding-system ()
@@ -117,7 +120,8 @@ or a function symbol which, when called, returns such a cons cell."
   (setq terminal-coding-system coding-system)
   ; #### should this affect all current tty consoles ?
   (if (eq (device-type) 'tty)
-      (set-console-tty-coding-system (device-console) terminal-coding-system))
+      (set-console-tty-output-coding-system
+       (device-console) terminal-coding-system))
   (redraw-modeline t))
 
 (defun set-pathname-coding-system (coding-system)
@@ -182,9 +186,9 @@ Does not modify STR.  Returns the encoded string on successful conversion."
   "Return the base coding system of CODING-SYSTEM."
   (if (not (coding-system-eol-type coding-system))
       coding-system
-    (find-coding-system 
+    (find-coding-system
      (intern
-      (substring 
+      (substring
        (symbol-name (coding-system-name coding-system))
        0
        (string-match "-unix$\\|-dos$\\|-mac$"
@@ -197,11 +201,41 @@ Does not modify STR.  Returns the encoded string on successful conversion."
  "Automatic conversion."
  '(mnemonic "Auto"))
 
-;; these are so that gnus and friends work when not mule
-(or (featurep 'mule)
-    (progn
-      (copy-coding-system 'undecided 'iso-8859-1)
-      (copy-coding-system 'undecided 'iso-8859-2)))
+;;; Make certain variables equivalent to coding-system aliases
+(defun dontusethis-set-value-file-name-coding-system-handler (sym args fun harg handlers)
+  (define-coding-system-alias 'file-name (or (car args) 'binary)))
+
+(dontusethis-set-symbol-value-handler
+ 'file-name-coding-system
+ 'set-value
+ 'dontusethis-set-value-file-name-coding-system-handler)
+
+(defun dontusethis-set-value-terminal-coding-system-handler (sym args fun harg handlers)
+  (define-coding-system-alias 'terminal (or (car args) 'binary)))
+
+(dontusethis-set-symbol-value-handler
+ 'terminal-coding-system
+ 'set-value
+ 'dontusethis-set-value-terminal-coding-system-handler)
+
+(defun dontusethis-set-value-keyboard-coding-system-handler (sym args fun harg handlers)
+  (define-coding-system-alias 'keyboard (or (car args) 'binary)))
+
+(dontusethis-set-symbol-value-handler
+ 'keyboard-coding-system
+ 'set-value
+ 'dontusethis-set-value-keyboard-coding-system-handler)
+
+(unless (boundp 'file-name-coding-system)
+  (setq file-name-coding-system nil))
+
+(when (not (featurep 'mule))
+  ;; these are so that gnus and friends work when not mule
+  (copy-coding-system 'undecided 'iso-8859-1)
+  (copy-coding-system 'undecided 'iso-8859-2)
+
+  (define-coding-system-alias 'ctext 'binary))
+
 
 ;; compatibility for old XEmacsen (don't use it)
 (copy-coding-system 'undecided 'automatic-conversion)