Simplify ‘delete-trailing-whitespace’ by not treating \n as whitespace

[gnu-emacs] / lisp / international / titdic-cnv.el

diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 7d7619df70e7932d4a7de673de405b59322dac33..61f440d5d86086b02cde6e890ca3732fbc9315ee 100644 (file)
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -1,6 +1,6 @@
 ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
 
-;; Copyright (C) 1997-1998, 2000-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2016 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -86,7 +86,7 @@
   '(("chinese-4corner" "\e$(0(?-F\e(B")
     ("chinese-array30" "\e$(0#R#O\e(B")
     ("chinese-ccdospy" "\e$AKuF4\e(B"
-     "Pinyin base input method for Chinese charset GB2312 \(`chinese-gb2312').
+     "Pinyin base input method for Chinese charset GB2312 (`chinese-gb2312').
 
 Pinyin is the standard Roman transliteration method for Chinese.
 For the detail of Pinyin system, see the documentation of the input
@@ -272,14 +272,12 @@ SPC, 6, 3, 4, or 7 specifying a tone (SPC:\e$(0?v(N\e(B, 6:\e$(0Dm(N\e(B, 3:\e$(0&9Vy
 
     (princ ";; Quail package `")
     (princ package)
-    (princ (format "' -*- coding:%s -*-\n" coding-system-for-write))
-    (princ ";;   Generated by the command `titdic-convert'\n;;\tDate: ")
-    (princ (current-time-string))
-    (princ "\n;;\tOriginal TIT dictionary file: ")
+    (princ "\n")
+    (princ (substitute-command-keys
+           ";;   Generated by the command `titdic-convert'\n"))
+    (princ ";;\tOriginal TIT dictionary file: ")
     (princ (file-name-nondirectory filename))
-    (princ "\n\n;;; Comment:\n\n")
-    (princ ";; Byte-compile this file again after any modification.\n\n")
-    (princ ";;; Start of the header of original TIT dictionary.\n\n")
+    (princ "\n\n")
 
     (while (not (eobp))
       (let ((ch (following-char))
@@ -519,7 +517,13 @@ the generated Quail package is saved."
          (widen)
 
          ;; Process the body part
-         (tit-process-body))))))
+         (tit-process-body)
+
+         (princ ";; Local Variables:\n")
+         (princ ";; version-control: never\n")
+         (princ ";; no-update-autoloads: t\n")
+         (princ (format ";; coding: %s\n" coding-system-for-write))
+         (princ ";; End:\n"))))))
 
 ;;;###autoload
 (defun batch-titdic-convert (&optional force)
@@ -559,9 +563,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
            (message "Converting %s to quail-package..." file)
            (titdic-convert file targetdir))
          (setq files (cdr files)))
-       (setq command-line-args-left (cdr command-line-args-left)))
-      (message "Byte-compile the created files by:")
-      (message "  %% emacs -batch -f batch-byte-compile XXX.el")))
+       (setq command-line-args-left (cdr command-line-args-left)))))
   (kill-emacs 0))
 
 \f
@@ -1149,10 +1151,9 @@ the generated Quail package is saved."
        (setq coding-system-for-write
              (coding-system-change-eol-conversion coding 'unix))
        (with-temp-file (expand-file-name quailfile dirname)
-         (insert (format ";; Quail package `%s' -*- coding:%s -*-\n"
-                          name coding))
-         (insert ";;   Generated by the command `miscdic-convert'\n")
-         (insert ";;   Date: " (current-time-string) "\n")
+         (insert (format-message ";; Quail package `%s'\n" name))
+         (insert (format-message
+                  ";;   Generated by the command `miscdic-convert'\n"))
          (insert ";;   Source dictionary file: " dicfile "\n")
          (insert ";;   Copyright notice of the source file\n")
          (insert ";;------------------------------------------------------\n")
@@ -1170,7 +1171,13 @@ the generated Quail package is saved."
                  (coding-system-change-eol-conversion coding 'unix))
                 (dicbuf (find-file-noselect filename)))
            (funcall converter dicbuf name title)
-           (kill-buffer dicbuf)))
+           (kill-buffer dicbuf))
+         (insert ";; Local Variables:\n"
+                 ";; version-control: never\n"
+                 ";; no-update-autoloads: t\n"
+                 (format ";; coding: %s\n" coding)
+                 ";; End:\n\n"
+                 ";;; " quailfile " ends here\n"))
        (message "Converting %s to %s...done" dicfile quailfile))
       (setq tail (cdr tail)))))
 
@@ -1200,4 +1207,7 @@ to store generated Quail packages."
        (miscdic-convert filename dir))))
   (kill-emacs 0))
 
+;; Prevent "Local Variables" above confusing Emacs.
+\f
+
 ;;; titdic-cnv.el ends here