From d7c707a76b510906a6ada293d3374e2a97e8cb41 Mon Sep 17 00:00:00 2001 From: ueno Date: Fri, 27 Sep 2002 07:08:21 +0000 Subject: [PATCH] Synch up with the trunk. --- .cvsignore | 1 - INSTALL | 39 ++++++--------------------------------- etc/.cvsignore | 1 + etc/Makefile.am | 11 ++++++----- etc/sample.dot.emacs.in | 5 ----- lisp/.cvsignore | 1 + lisp/ChangeLog | 20 ++++++++++++++++++++ lisp/liece-coding.el | 4 ++-- lisp/liece-ctcp.el | 11 ++++++----- lisp/liece-minibuf.el | 19 ++++++++++++------- lisp/liece-misc.el | 2 -- lisp/liece-modules.el | 6 +++--- 12 files changed, 57 insertions(+), 63 deletions(-) delete mode 100644 etc/sample.dot.emacs.in diff --git a/.cvsignore b/.cvsignore index 2056dde..c89a4cb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,4 +8,3 @@ configure config.log config.status config.cache -sample.dot.emacs diff --git a/INSTALL b/INSTALL index 05f7798..390d4f6 100644 --- a/INSTALL +++ b/INSTALL @@ -8,14 +8,12 @@ Liece works under following environment at least. - Emacs 20.7 - - XEmacs 21.4 or later + - XEmacs 21.1 or later This package uses following libraries. - APEL 10.2 or later (stands for - "A Portable Emacs Library") ftp://ftp.m17n.org/pub/mule/apel/ - - FLIM 1.12 or later - ftp://ftp.m17n.org/pub/mule/flim/ * Quick installation @@ -35,46 +33,21 @@ ** Setting up your ~/.emacs - If you are using Emacs or Mule, please add directory of APEL and - Liece to load-path. If you install by default setting you can write - subdirs.el for example: - - ex: - (normal-top-level-add-to-load-path '("apel" "liece")) - - If you are using Emacs 20.3 or XEmacs, prepare `subdirs.el' with - following contents, Emacs will find and append each substantial - directory to `load-path' automagically. + If you are using Emacs 20.7, prepare `subdirs.el' with following + contents, Emacs will find and append each substantial directory to + `load-path' automagically. ex: (normal-top-level-add-subdirs-to-load-path) - If you are using Emacs 19 or earlier version of Emacsen, - you have to write more complicated path-setting in your `~/.emacs'. - - ex: - (setq load-path - (append - (list "/usr/local/lib/mule/site-lisp/apel" - "/usr/local/lib/mule/site-lisp/liece") - load-path)) - - For more details, please read `README' file come along with APEL. - If you have never been using liece and/or its variants, add an autoload setting into your `~/.emacs'. ex: (autoload 'liece "liece" nil t) -** Setting up your ~/.liece - - If you have never run Liece, and quite unsure to configure startup - files in Emacs Lisp, please copy `sample.dot.liece' file in `doc' - directory to `~/.liece'. - - Please read ducuments under `doc' directory. - (`README-styles' to configure window splitting) + If you are using Emacs 20.7 and have never run Liece, run + `etc/gnu-emacs-user-config' to prepare initial settings. * Optional packages diff --git a/etc/.cvsignore b/etc/.cvsignore index 3dda729..19b9bcf 100644 --- a/etc/.cvsignore +++ b/etc/.cvsignore @@ -1,2 +1,3 @@ Makefile.in Makefile +gnu-emacs-user-config diff --git a/etc/Makefile.am b/etc/Makefile.am index ffb7083..5270e87 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,10 +1,11 @@ SUBDIRS = icons po styles -EXTRA_DIST = sample.dot.emacs.in -DISTCLEANFILES = sample.dot.emacs -pkgdata_DATA = sample.dot.emacs -sample.dot.emacs: sample.dot.emacs.in - sed -e 's!@pkgdatadir@!$(pkgdatadir)!g' $< > $@ +EXTRA_DIST = gnu-emacs-user-config.in +DISTCLEANFILES = gnu-emacs-user-config +pkgdata_DATA = gnu-emacs-user-config +gnu-emacs-user-config: gnu-emacs-user-config.in + sed 's!@pkgdatadir@!$(pkgdatadir)!g' $< > $@ + chmod +x $@ package: install-package: package diff --git a/etc/sample.dot.emacs.in b/etc/sample.dot.emacs.in deleted file mode 100644 index bb3872e..0000000 --- a/etc/sample.dot.emacs.in +++ /dev/null @@ -1,5 +0,0 @@ -;;; -*- emacs-lisp -*- - -(setq liece-intl-catalogue-directory "@pkgdatadir@/locale" - liece-window-style-directory "@pkgdatadir@/styles" - liece-icon-directory "@pkgdatadir@/icons") diff --git a/lisp/.cvsignore b/lisp/.cvsignore index 2c31d3a..c332026 100644 --- a/lisp/.cvsignore +++ b/lisp/.cvsignore @@ -1,2 +1,3 @@ Makefile.in +Makefile liece-setup.el diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f8bfc9..6b7038e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-09-26 Daiki Ueno + + * liece-minibuf.el (liece-minibuf-completing-read): Don't use the + 7th argument of completing-read. + 2002-09-24 Daiki Ueno * liece-handle.el (liece-handle-mode-message): Check chnlp before @@ -149,6 +154,21 @@ * liece-ctcp.el: Don't throw an error when liece-q-ccl is not found. +2002-04-08 Daiki Ueno + + * liece-misc.el: Don't require pccl and broken. + +2002-04-07 Daiki Ueno + + * liece-modules.el: Don't compile liece-q-ccl.el. + * liece-ctcp.el: Don't require liece-q-ccl.el. + +2002-03-24 Daiki Ueno + + * liece-coding.el (liece-mime-charset-for-write): Use + `mime-charset-to-coding-system' instead of `mime-charset-p'. + (liece-mime-charset-for-read): Ditto. + 2002-03-20 Daiki Ueno * gettext.el (bind-text-domain): Respect LC_ALL and LC_MESSAGES; diff --git a/lisp/liece-coding.el b/lisp/liece-coding.el index 2670cf6..76b5970 100644 --- a/lisp/liece-coding.el +++ b/lisp/liece-coding.el @@ -41,7 +41,7 @@ :group 'liece) (defcustom liece-mime-charset-for-write - (if (mime-charset-p 'iso-2022-jp-2) + (if (mime-charset-to-coding-system 'iso-2022-jp-2) 'iso-2022-jp-2 default-mime-charset-for-write) "Charset used in any transferred messages." @@ -49,7 +49,7 @@ :group 'liece-coding) (defcustom liece-mime-charset-for-read - (if (mime-charset-p 'x-ctext) + (if (mime-charset-to-coding-system 'x-ctext) 'x-ctext default-mime-charset) "Charset used in any transferred messages." diff --git a/lisp/liece-ctcp.el b/lisp/liece-ctcp.el index 63db6ab..61fe151 100644 --- a/lisp/liece-ctcp.el +++ b/lisp/liece-ctcp.el @@ -33,11 +33,12 @@ (require 'liece-handler) -(require 'pccl) - -(eval-and-compile - (or (broken-p 'ccl-usable) (require 'liece-q-ccl nil 'noerror) - (require 'liece-q-el))) +;; (require 'pccl) + +;; (if-broken ccl-usable +;; (require 'liece-q-el) +;; (require 'liece-q-ccl)) +(require 'liece-q-el) (require 'liece-x-face) diff --git a/lisp/liece-minibuf.el b/lisp/liece-minibuf.el index e5b0250..e4cb5a7 100644 --- a/lisp/liece-minibuf.el +++ b/lisp/liece-minibuf.el @@ -151,12 +151,17 @@ (mapconcat (function car) liece-supported-user-mode-alist "")))) (defun liece-minibuffer-completing-read - (prompt table &optional predicate require-match initial-input history default) - (completing-read - (if default - (format "%s(default %s) " prompt default) - prompt) - table predicate require-match initial-input history default)) + (prompt table &optional predicate require-match initial-input history + default) + (let ((result + (completing-read + (if default + (format "%s(default %s) " prompt default) + prompt) + table predicate require-match initial-input history))) + (if (and default (equal result "")) + default + result))) (defvar liece-minibuffer-completion-separator "," "Separator used for separating strings in `liece-minibuffer-completing-read-multiple'. @@ -225,7 +230,7 @@ PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HISTORY, DEFAULT." (let ((liece-minibuffer-completion-table table)) (split-string - (completing-read + (liece-minibuffer-completing-read prompt #'liece-minibuffer-completing-read-multiple-1 predicate require-match initial-input history default) liece-minibuffer-completion-separator))))) diff --git a/lisp/liece-misc.el b/lisp/liece-misc.el index de2de52..cf2f3e1 100644 --- a/lisp/liece-misc.el +++ b/lisp/liece-misc.el @@ -30,8 +30,6 @@ ;;; Code: (eval-and-compile - (require 'broken) - (require 'pccl) (require 'invisible) (require 'liece-inlines) (require 'liece-coding)) diff --git a/lisp/liece-modules.el b/lisp/liece-modules.el index a41cd08..0f9940d 100644 --- a/lisp/liece-modules.el +++ b/lisp/liece-modules.el @@ -71,9 +71,9 @@ (if (fboundp 'set-face-stipple) (push 'bitmap-stipple liece-modules-to-compile)) -(require 'pccl) -(unless-broken ccl-usable - (push 'liece-q-ccl liece-modules-to-compile)) +;; (require 'pccl) +;; (unless-broken ccl-usable +;; (push 'liece-q-ccl liece-modules-to-compile)) (setq liece-modules (cons 'liece-setup liece-modules-to-compile)) -- 1.7.10.4