msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line.

[gnu-emacs] / lisp / international / kkc.el

diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index 4094538c9a00588687258d6e2e7a261da212b63e..976b0a6d16712dbb1711d4b69cecfb1ecaa7b7d5 100644 (file)
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -1,20 +1,20 @@
 ;;; kkc.el --- Kana Kanji converter    -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007, 2008, 2009, 2010
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
-;; Keywords: mule, multilingual, Japanese
+;; Keywords: i18n, mule, multilingual, Japanese
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs 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 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,9 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -43,7 +41,7 @@
   "String denoting KKC input method.
 This string is shown at mode line when users are in KKC mode.")
 
-(defvar kkc-init-file-name "~/.kkcrc"
+(defvar kkc-init-file-name (convert-standard-filename "~/.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'.
@@ -137,7 +135,7 @@ This string is shown at mode line when users are in KKC mode.")
 (defvar kkc-current-conversions-width nil)
 
 (defcustom kkc-show-conversion-list-count 4
-  "*Count of successive `kkc-next' or `kkc-prev' to show conversion list.
+  "Count of successive `kkc-next' or `kkc-prev' to show conversion list.
 When you type SPC or C-p successively this count while using the input
 method `japanese', the conversion candidates are shown in the echo
 area while indicating the current selection by `<N>'."
@@ -660,5 +658,5 @@ and change the current conversion to the last one in the group."
 ;;
 (provide 'kkc)
 
-;;; arch-tag: 3cbfd56e-74e6-4f60-bb46-ba7c2d366fbf
+;; arch-tag: 3cbfd56e-74e6-4f60-bb46-ba7c2d366fbf
 ;;; kkc.el ends here