(write-abbrev-file): Simplify, and put a coding cookie

in the file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c052e0806b61592c43e580fce3f3f31fd2f7979d..6dd1382975c9871bfce89d1795d5e5cc1c565a7b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-23  Dave Love  <fx@gnu.org>
+
+       * abbrev.el (write-abbrev-file): Simplify, and put a coding cookie
+       in the file.
+
 2003-01-23  Masatake YAMATO  <jet@gyve.org>
 
        * progmodes/asm-mode.el (asm-mode): Added syntax table entries for

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index a73c8e0fe8d9aeb7edba1bca50ff944b8eb6eef4..8d9b76251283b18da59a5948256099080ff41a08 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -212,15 +212,11 @@ The argument FILE is the file name to write."
                    abbrev-file-name)))
   (or (and file (> (length file) 0))
       (setq file abbrev-file-name))
-  (save-excursion
-   (set-buffer (get-buffer-create " write-abbrev-file"))
-   (erase-buffer)
-   (let ((tables abbrev-table-name-list))
-     (while tables
-       (insert-abbrev-table-description (car tables) nil)
-       (setq tables (cdr tables))))
-   (write-region (point-min) (point-max) file)
-   (erase-buffer)))
+  (let ((coding-system-for-write 'emacs-mule))
+    (with-temp-file file
+      (insert ";;-*-coding: emacs-mule;-*-\n")
+      (dolist (table abbrev-table-name-list)
+       (insert-abbrev-table-description table nil)))))
 \f
 (defun add-mode-abbrev (arg)
   "Define mode-specific abbrev for last word(s) before point.