* nnheader.el (nnheader-find-file-noselect): Use

`find-file-noselect-as-coding-system' (renamed from
`find-file-noselect-as-specified-coding-system').

* gnus-score.el (gnus-score-load-score-alist): Use
`insert-file-contents-as-coding-system' (renamed from
`insert-file-contents-as-specified-coding-system').
* nnmail.el (nnmail-find-file): Ditto.
* nnheader.el (nnheader-insert-file-contents): Ditto.

* score-mode.el (gnus-score-edit-exit): Use `write-region-as-coding-system'
(renamed from `write-region-as-specified-coding-system').
* gnus-start.el (gnus-save-newsrc-file): Ditto.

* gnus-start.el (gnus-read-newsrc-el-file): Use
`insert-file-contents-as-coding-system' (renamed from
`insert-file-contents-as-specified-coding-system').

* gnus-score.el (gnus-score-save): Use `gnus-write-buffer-as-coding-system'
(renamed from `gnus-write-buffer-as-specified-coding-system').
* gnus-cache.el (gnus-cache-possibly-enter-article): Ditto.
(gnus-cache-save-buffers): Ditto.

* gnus-util.el (gnus-write-buffer-as-coding-system): Renamed from
'gnus-write-buffer-as-specified-coding-system'.

* nnmail.el (nnmail-write-region): Use `write-region-as-coding-system'
(renamed from `write-region-as-specified-coding-system').
* gnus-agent.el (gnus-agent-expire): Ditto.
(gnus-agent-fetch-headers): Ditto.
(gnus-agent-flush-cache): Ditto.
(gnus-agent-fetch-articles): Ditto.
(gnus-agent-save-history): Ditto.
(gnus-agent-save-groups): Ditto.
(gnus-agent-save-active): Ditto.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index e95246b..cd7c6c9 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -526,9 +526,9 @@ the actual number of articles toggled is returned."
     (let* ((gnus-command-method method)
           (file (gnus-agent-lib-file "active")))
       (gnus-make-directory (file-name-directory file))
-      (write-region-as-specified-coding-system
-       (point-min) (point-max) file nil 'silent
-       gnus-agent-file-coding-system)
+      (write-region-as-coding-system
+       (point-min) (point-max) file gnus-agent-file-coding-system
+       nil 'silent)
       (when (file-exists-p (gnus-agent-lib-file "groups"))
        (delete-file (gnus-agent-lib-file "groups"))))))
 
@@ -536,9 +536,9 @@ the actual number of articles toggled is returned."
   (let* ((gnus-command-method method)
         (file (gnus-agent-lib-file "groups")))
     (gnus-make-directory (file-name-directory file))
-    (write-region-as-specified-coding-system
-     (point-min) (point-max) file nil 'silent
-     gnus-agent-file-coding-system)
+    (write-region-as-coding-system
+     (point-min) (point-max) file gnus-agent-file-coding-system
+     nil 'silent)
     (when (file-exists-p (gnus-agent-lib-file "active"))
       (delete-file (gnus-agent-lib-file "active")))))
 
@@ -610,9 +610,9 @@ the actual number of articles toggled is returned."
   (save-excursion
     (set-buffer gnus-agent-current-history)
     (gnus-make-directory (file-name-directory gnus-agent-file-name))
-    (write-region-as-specified-coding-system
-     (1+ (point-min)) (point-max) gnus-agent-file-name nil 'silent
-     gnus-agent-file-coding-system)))
+    (write-region-as-coding-system
+     (1+ (point-min)) (point-max) gnus-agent-file-name
+     gnus-agent-file-coding-system nil 'silent)))
 
 (defun gnus-agent-close-history ()
   (when (gnus-buffer-live-p gnus-agent-current-history)
@@ -709,10 +709,10 @@ the actual number of articles toggled is returned."
            (if (not (re-search-forward "^Message-ID: *<\\([^>\n]+\\)>" nil t))
                (setq id "No-Message-ID-in-article")
              (setq id (buffer-substring (match-beginning 1) (match-end 1))))
-           (write-region-as-specified-coding-system
+           (write-region-as-coding-system
             (point-min) (point-max)
-            (concat dir (number-to-string (caar pos))) nil 'silent
-            gnus-agent-file-coding-system)
+            (concat dir (number-to-string (caar pos)))
+            gnus-agent-file-coding-system nil 'silent)
            (when (setq elem (assq (caar pos) gnus-agent-article-alist))
              (setcdr elem t))
            (gnus-agent-enter-history
@@ -752,11 +752,11 @@ the actual number of articles toggled is returned."
   (save-excursion
     (while gnus-agent-buffer-alist
       (set-buffer (cdar gnus-agent-buffer-alist))
-      (write-region-as-specified-coding-system
+      (write-region-as-coding-system
        (point-min) (point-max)
        (gnus-agent-article-name ".overview"
                                (caar gnus-agent-buffer-alist))
-       nil 'silent gnus-agent-file-coding-system)
+       gnus-agent-file-coding-system nil 'silent)
       (pop gnus-agent-buffer-alist))
     (while gnus-agent-group-alist
       (with-temp-file (caar gnus-agent-group-alist)
@@ -787,9 +787,9 @@ the actual number of articles toggled is returned."
        (copy-to-buffer gnus-agent-overview-buffer (point-min) (point-max))
        (when (file-exists-p file)
          (gnus-agent-braid-nov group articles file))
-       (write-region-as-specified-coding-system
-        (point-min) (point-max) file nil 'silent
-        gnus-agent-file-coding-system)
+       (write-region-as-coding-system
+        (point-min) (point-max) file gnus-agent-file-coding-system
+        nil 'silent)
        (gnus-agent-save-alist group articles nil)
        (gnus-agent-enter-history
         "last-header-fetched-for-session"
@@ -1401,9 +1401,9 @@ The following commands are available:
                 ;; Schedule the history line for nuking.
                 (push (cdr elem) histories)))
             (gnus-make-directory (file-name-directory nov-file))
-            (write-region-as-specified-coding-system
-             (point-min) (point-max) nov-file nil 'silent
-             gnus-agent-file-coding-system)
+            (write-region-as-coding-system
+             (point-min) (point-max) nov-file gnus-agent-file-coding-system
+             nil 'silent)
             ;; Delete the unwanted entries in the alist.
             (setq gnus-agent-article-alist
                   (sort gnus-agent-article-alist 'car-less-than-car))

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 3059362..4e41265 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -129,7 +129,7 @@ it's not cached."
          (set-buffer buffer)
          (if (> (buffer-size) 0)
              ;; Non-empty overview, write it to a file.
-             (gnus-write-buffer-as-specified-coding-system
+             (gnus-write-buffer-as-coding-system
               overview-file gnus-cache-overview-coding-system)
            ;; Empty overview file, remove it
            (when (file-exists-p overview-file)
@@ -183,7 +183,7 @@ it's not cached."
                  (gnus-article-decode-hook nil))
              (gnus-request-article-this-buffer number group))
            (when (> (buffer-size) 0)
-             (gnus-write-buffer-as-specified-coding-system
+             (gnus-write-buffer-as-coding-system
               file gnus-cache-write-file-coding-system)
              (gnus-cache-change-buffer group)
              (set-buffer (cdr gnus-cache-buffer))

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 4d54a3d..7011512 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -1236,7 +1236,7 @@ EXTRA is the possible non-standard header."
        (setq gnus-score-alist nil)
       ;; Read file.
       (with-temp-buffer
-       (insert-file-contents-as-specified-coding-system
+       (insert-file-contents-as-coding-system
         file score-mode-coding-system)
        (goto-char (point-min))
        ;; Only do the loading if the score file isn't empty.
@@ -1370,7 +1370,7 @@ EXTRA is the possible non-standard header."
              (delete-file file)
            ;; There are scores, so we write the file.
            (when (file-writable-p file)
-             (gnus-write-buffer-as-specified-coding-system
+             (gnus-write-buffer-as-coding-system
               file score-mode-coding-system)
              (when gnus-score-after-write-file-function
                (funcall gnus-score-after-write-file-function file)))))

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index a5d426d..c02bc59 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1923,7 +1923,7 @@ If FORCE is non-nil, the .newsrc file is read."
     (let (gnus-newsrc-assoc)
       (condition-case nil
          (with-temp-buffer
-           (insert-file-contents-as-specified-coding-system
+           (insert-file-contents-as-coding-system
             ding-file gnus-startup-file-coding-system)
            (eval-region (point-min) (point-max)))
        (error
@@ -2286,7 +2286,7 @@ If FORCE is non-nil, the .newsrc file is read."
          (gnus-message 5 "Saving %s.eld..." gnus-current-startup-file)
          (gnus-gnus-to-quick-newsrc-format)
          (gnus-run-hooks 'gnus-save-quick-newsrc-hook)
-         (write-region-as-specified-coding-system
+         (write-region-as-coding-system
           (point-min) (point-max) (buffer-file-name)
           gnus-startup-file-coding-system)
          (set-buffer-modified-p nil)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 4b63fec..9371650 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -560,13 +560,13 @@ Bind `print-quoted' and `print-readably' to t while printing."
   ;; Write the buffer.
   (write-region-as-binary (point-min) (point-max) file nil 'quietly))
 
-(defun gnus-write-buffer-as-specified-coding-system (file coding-system)
+(defun gnus-write-buffer-as-coding-system (file coding-system)
   "Write the current buffer's contents to FILE with code conversion."
   ;; Make sure the directory exists.
   (gnus-make-directory (file-name-directory file))
   ;; Write the buffer.
-  (write-region-as-specified-coding-system
-   (point-min) (point-max) file nil 'quietly coding-system))
+  (write-region-as-coding-system
+   (point-min) (point-max) file coding-system nil 'quietly))
 
 (defun gnus-delete-file (file)
   "Delete FILE if it exists."

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index e0b68e9..6bdc205 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -770,18 +770,18 @@ find-file-hooks, etc.
        (enable-local-variables nil)
         (after-insert-file-functions nil)
        (find-file-hooks nil))
-    (insert-file-contents-as-specified-coding-system
-     filename visit beg end replace nnheader-file-coding-system)))
+    (insert-file-contents-as-coding-system
+     filename nnheader-file-coding-system visit beg end replace)))
 
 (defun nnheader-find-file-noselect (&rest args)
   (let ((format-alist nil)
        (auto-mode-alist (nnheader-auto-mode-alist))
        (default-major-mode 'fundamental-mode)
        (enable-local-variables nil)
-        (after-insert-file-functions nil)
+       (after-insert-file-functions nil)
        (find-file-hooks nil))
-    (find-file-noselect-as-specified-coding-system
-     (car args) (append (cdr args) (list nnheader-file-coding-system)))))
+    (apply 'find-file-noselect-as-coding-system
+          (car args) nnheader-file-coding-system (cdr args))))
 
 (defun nnheader-auto-mode-alist ()
   "Return an `auto-mode-alist' with only the .gz (etc) thingies."

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index ecafebd..dabd72e 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -510,7 +510,7 @@ parameter.  It should return nil, `warn' or `delete'."
     (condition-case ()
        (let ((auto-mode-alist (nnheader-auto-mode-alist))
              (pathname-coding-system nnmail-file-coding-system))
-         (insert-file-contents-as-specified-coding-system
+         (insert-file-contents-as-coding-system
           file nnmail-file-coding-system)
          t)
       (file-error nil))))
@@ -1680,8 +1680,8 @@ If ARGS, PROMPT is used as an argument to `format'."
 (defun nnmail-write-region (start end filename &optional append visit lockname)
   "Do a `write-region', and then set the file modes."
   (let ((pathname-coding-system 'binary))
-    (write-region-as-specified-coding-system
-     start end filename append visit lockname nnmail-file-coding-system)
+    (write-region-as-coding-system
+     start end filename nnmail-file-coding-system append visit lockname)
     (set-file-modes filename nnmail-default-file-modes)))
 
 ;;;

diff --git a/lisp/score-mode.el b/lisp/score-mode.el
index 23612ce..4cd72d7 100644 (file)
--- a/lisp/score-mode.el
+++ b/lisp/score-mode.el
@@ -100,7 +100,7 @@ This mode is an extended emacs-lisp mode.
   (interactive)
   (unless (file-exists-p (file-name-directory (buffer-file-name)))
     (make-directory (file-name-directory (buffer-file-name)) t))
-  (write-region-as-specified-coding-system
+  (write-region-as-coding-system
    (point-min) (point-max) (buffer-file-name) score-mode-coding-system)
   (set-buffer-modified-p nil)
   (bury-buffer (current-buffer))