Mercurial > hg > xemacs-beta
view lisp/mule/canna-leim.el @ 5852:e9bb3688e654
Fix some bugs in #'substitute, #'nsubstitute.
src/ChangeLog addition:
2015-03-04 Aidan Kehoe <kehoea@parhasard.net>
* sequence.c (count_with_tail):
Accept COUNT from #'substitute, #'nsubstitute too.
* sequence.c (FdeleteX):
Only remove COUNT from the arguments if FROM-END is non-nil.
* sequence.c (Fnsubstitute):
Remove COUNT from the arguments if specified and FROM-END is
non-nil.
* sequence.c (Fsubstitute):
Remove COUNT from the arguments if specified and FROM-END is
non-nil. Do this before calling count_with_tail(). When we
encounter the cons return by count_with_tail(), use the
replacement object.
tests/ChangeLog addition:
2015-03-04 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Add some tests for #'substitute.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 04 Mar 2015 15:54:00 +0000 |
parents | b9167d522a9a |
children |
line wrap: on
line source
;;; canna-leim.el --- Canna-related code for LEIM -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1997 Stephen Turnbull <turnbull@sk.tsukuba.ac.jp> ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; ;; Shamelessly ripped off from ;; ;; skk-leim.el --- SKK related code for LEIM ;; Copyright (C) 1997 ;; Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp> ;; ;; Author: Stephen Turnbull <turnbull@sk.tsukuba.ac.jp> ;; Version: canna-leim.el,v 1.2 1997/10/27 10:08:49 steve Exp ;; Keywords: japanese, input method, LEIM ;; Last Modified: 1997/10/27 10:08:49 ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; TODO ;; ;; Add pointers to Canna documentation in LEIM format (globally-declare-boundp 'canna:*japanese-mode*) (globally-declare-fboundp '(canna canna-toggle-japanese-mode)) ;; use (locate-file "canna_api" module-load-path module-extensions) ;; to locate the module without loading it. ;; then we could autoload canna-activate and dump and/or autoload: ;; (and (locate-file "canna_api" module-load-path module-extensions) ;; (locate-library "canna") ;; (register-input-method 'japanese-canna "Japanese" 'canna-activate nil ;; "Canna - a kana to kanji conversion program")) (defun canna-activate (&optional name) ;; XEmacs 21.5.10 and later have 3-argument require. (unless (require 'CANNA "canna_api" 'no-error) (error 'file-error "No Canna API support!? See M-x describe-installation & C-h v module-load-path.")) (unless (require 'canna nil 'no-error) (error 'file-error "Canna LISP support not found. Is the mule-base package missing?")) (setq inactivate-current-input-method-function 'canna-inactivate) (unless (featurep 'leim-canna-initialized) (canna) (provide 'leim-canna-initialized)) (canna-toggle-japanese-mode)) (defun canna-inactivate () (cond (canna:*japanese-mode* (canna-toggle-japanese-mode)))) (register-input-method 'japanese-canna "Japanese" 'canna-activate nil "Canna - a kana to kanji conversion program" ) (provide 'canna-leim) ;;; canna-leim.el ends here