diff options
author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/international/ja-dic-cnv.el | |
parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'lisp/international/ja-dic-cnv.el')
-rw-r--r-- | lisp/international/ja-dic-cnv.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el index 711b1342d7f..f6aa892aafe 100644 --- a/lisp/international/ja-dic-cnv.el +++ b/lisp/international/ja-dic-cnv.el @@ -1,7 +1,7 @@ ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006 +;; 2005, 2006, 2007 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 @@ -366,7 +366,7 @@ The name of generated file is specified by the variable `ja-dic-filename'." ";;\tGenerated by the command `skkdic-convert'\n" ";;\tDate: " (current-time-string) "\n" ";;\tOriginal SKK dictionary file: " - (file-name-nondirectory filename) + (file-relative-name (expand-file-name filename) dirname) "\n\n" ";; This file is part of GNU Emacs.\n\n" ";;; Commentary:\n\n" |