X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7c420169baa7c50428589cca7f8eda71b462eb15..73d213f2816876fe9c6c429e75a3be5454a42b34:/lisp/international/kkc.el diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el index 976b0a6d16..8c9a373c63 100644 --- a/lisp/international/kkc.el +++ b/lisp/international/kkc.el @@ -1,9 +1,8 @@ ;;; kkc.el --- Kana Kanji converter -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2016 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 @@ -41,7 +40,7 @@ "String denoting KKC input method. This string is shown at mode line when users are in KKC mode.") -(defvar kkc-init-file-name (convert-standard-filename "~/.kkcrc") +(defvar kkc-init-file-name (locate-user-emacs-file "kkcrc" ".kkcrc") "Name of a file which contains user's initial setup code for KKC.") ;; A flag to control a file specified by `kkc-init-file-name'. @@ -208,9 +207,9 @@ area while indicating the current selection by `'." kkc-current-conversions-width nil kkc-current-conversions (cons 0 nil))))))) -(put 'kkc-error 'error-conditions '(kkc-error error)) +(define-error 'kkc-error nil) (defun kkc-error (&rest args) - (signal 'kkc-error (apply 'format args))) + (signal 'kkc-error (apply #'format-message args))) (defvar kkc-converting nil) @@ -658,5 +657,4 @@ and change the current conversion to the last one in the group." ;; (provide 'kkc) -;; arch-tag: 3cbfd56e-74e6-4f60-bb46-ba7c2d366fbf ;;; kkc.el ends here