Permalink
Browse files

Partly synch with the latest XEmacs package.

* pccl.el (ccl-usable): Make non-MULE XEmacs don't require `ccl'
 even if this file is mis-compiled for XEmacs with MULE.

* poem-ltn1.el (truncate-string): Act like the real `truncate-string':
 do not fail if the string is shorter than the max length.
  • Loading branch information...
1 parent fd70928 commit 9f579a7b06c734a9ecea330c755497a38f49d174 yamaoka committed May 14, 2002
Showing with 24 additions and 11 deletions.
  1. +10 −0 ChangeLog
  2. +11 −10 pccl.el
  3. +3 −1 poem-ltn1.el
View
@@ -1,3 +1,13 @@
+2002-05-14 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * pccl.el (ccl-usable): Make non-MULE XEmacs don't require `ccl'
+ even if this file is mis-compiled for XEmacs with MULE.
+
+2002-03-23 Nix <nix@esperi.demon.co.uk>
+
+ * poem-ltn1.el (truncate-string): Act like the real `truncate-string':
+ do not fail if the string is shorter than the max length.
+
2002-04-30 Katsumi Yamaoka <yamaoka@jpl.org>
* poem-xm.el (string-to-char-list): Revive it again.
View
21 pccl.el
@@ -34,19 +34,20 @@
(>= emacs-major-version 19))))
(unless-broken ccl-usable
- (require 'ccl)
(require 'advice)
(if (featurep 'mule)
- (if (featurep 'xemacs)
- (if (>= emacs-major-version 21)
- ;; for XEmacs 21 with mule
- (require 'pccl-20))
- (if (>= emacs-major-version 20)
- ;; for Emacs 20
- (require 'pccl-20)
- ;; for Mule 2.*
- (require 'pccl-om))))
+ (progn
+ (require 'ccl)
+ (if (featurep 'xemacs)
+ (if (>= emacs-major-version 21)
+ ;; for XEmacs 21 with mule
+ (require 'pccl-20))
+ (if (>= emacs-major-version 20)
+ ;; for Emacs 20
+ (require 'pccl-20)
+ ;; for Mule 2.*
+ (require 'pccl-om)))))
(static-if (or (featurep 'xemacs) (< emacs-major-version 21))
(defadvice define-ccl-program
View
@@ -131,7 +131,9 @@ Optional non-nil arg START-COLUMN specifies the starting column.
\[emu-latin1.el; MULE 2.3 emulating function]"
(or start-column
(setq start-column 0))
- (substring str start-column width))
+ (if (> (length str) width)
+ (substring str start-column width)
+ str))
(defalias 'looking-at-as-unibyte 'looking-at)

0 comments on commit 9f579a7

Please sign in to comment.