Remove some unused ps-def definitions.

* lisp/ps-def.el (leading-code-private-22, charset-bytes, charset-id)
(charset-width, find-charset-region, chars-in-region, forward-point)
(encode-coding-string, coding-system-p, ccl-execute-on-string)
(define-ccl-program, multibyte-string-p, string-make-multibyte):
Remove compatibility cruft (none of these are used by ps*.el).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2a75cdc227308264858d3b5163f78ec10a47a52..c4e1ab16ce15054483c6ba0bcbc6063dbed1d350 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-03  Glenn Morris  <rgm@gnu.org>
+
+       * ps-def.el (leading-code-private-22, charset-bytes, charset-id)
+       (charset-width, find-charset-region, chars-in-region, forward-point)
+       (encode-coding-string, coding-system-p, ccl-execute-on-string)
+       (define-ccl-program, multibyte-string-p, string-make-multibyte):
+       Remove compatibility cruft (none of these are used by ps*.el).
+
 2010-10-03  Kevin Rodgers  <kevin.d.rodgers@gmail.com>
 
        * subr.el (booleanp): Return t instead of a list (Bug#7086).

diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index a9151683c1be395cdac8c2da67459b330e78a019..9122b8fdc9a13fa8caed65f69ee8fb94ac04f47e 100644 (file)
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -50,90 +50,25 @@
 (cond
  ((featurep 'xemacs)                   ; XEmacs
 
-
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; ps-bdf
 
   (defvar installation-directory nil)
   (defvar coding-system-for-read)
 
-
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; ps-mule
 
-  (defvar leading-code-private-22 157)
-
-  (or (fboundp 'charset-bytes)
-      (defun charset-bytes (charset) 1)) ; ascii
-
   (or (fboundp 'charset-dimension)
       (defun charset-dimension (charset) 1)) ; ascii
 
-  (or (fboundp 'charset-id)
-      (defun charset-id (charset) 0))  ; ascii
-
-  (or (fboundp 'charset-width)
-      (defun charset-width (charset) 1)) ; ascii
-
-  (or (fboundp 'find-charset-region)
-      (defun find-charset-region (beg end &optional table)
-       (list 'ascii)))
-
   (or (fboundp 'char-width)
       (defun char-width (char) 1))     ; ascii
 
-  (or (fboundp 'chars-in-region)
-      (defun chars-in-region (beg end)
-       (- (max beg end) (min beg end))))
-
-  (or (fboundp 'forward-point)
-      (defun forward-point (arg)
-       (save-excursion
-         (let ((count (abs arg))
-               (step  (if (zerop arg)
-                          0
-                        (/ arg arg))))
-           (while (and (> count 0)
-                       (< (point-min) (point)) (< (point) (point-max)))
-             (forward-char step)
-             (setq count (1- count)))
-           (+ (point) (* count step))))))
-
-  (or (fboundp 'encode-coding-string)
-      (defun encode-coding-string (string coding-system &optional nocopy)
-       (if nocopy
-           string
-         (copy-sequence string))))
-
-  (or (fboundp 'coding-system-p)
-      (defun coding-system-p (obj) nil))
-
-  (or (fboundp 'ccl-execute-on-string)
-      (defun ccl-execute-on-string (ccl-prog status str
-                                            &optional contin unibyte-p)
-       str))
-
-  (or (fboundp 'define-ccl-program)
-      (defmacro define-ccl-program (name ccl-program &optional doc)
-       `(defconst ,name nil ,doc)))
-
-  (or (fboundp 'multibyte-string-p)
-      (defun multibyte-string-p (str)
-       (let ((len (length str))
-             (i 0)
-             multibyte)
-         (while (and (< i len) (not (setq multibyte (> (aref str i) 255))))
-           (setq i (1+ i)))
-         multibyte)))
-
-  (or (fboundp 'string-make-multibyte)
-      (defalias 'string-make-multibyte 'copy-sequence))
-
   (or (fboundp 'encode-char)
       (defun encode-char (ch ccs)
        ch))
 
-
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; ps-print