8 files changed, 13 insertions, 58 deletions

diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 6049f480461..a18b4c77539 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -193,21 +193,6 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
                           :tag "Other"
                           (symbol :tag "Icon item")))))
 
-;; (defun gmm-color-cells (&optional display)
-;;   "Return the number of color cells supported by DISPLAY.
-;; Compatibility function."
-;;   ;; `display-color-cells' doesn't return more than 256 even if color depth is
-;;   ;; > 8 in Emacs 21.
-;;   ;;
-;;   ;; Feel free to add proper XEmacs support.
-;;   (let* ((cells (and (fboundp 'display-color-cells)
-;;                   (display-color-cells display)))
-;;       (plane (and (fboundp 'x-display-planes)
-;;                   (ash 1 (x-display-planes))))
-;;       (none -1))
-;;     (max (if (integerp cells) cells none)
-;;       (if (integerp plane) plane none))))
-
 (defcustom gmm-tool-bar-style
   (if (and (boundp 'tool-bar-mode)
            tool-bar-mode
@@ -338,7 +323,7 @@ compatibility with versions of Emacs that lack the variable
     (let ((img image)
           (dir (or
                 ;; Images in image-load-path.
-                (gmm-image-search-load-path image) ;; "gmm-" prefix!
+                (image-search-load-path image)
                 ;; Images in load-path.
                 (locate-library image)))
           parent)
@@ -405,30 +390,6 @@ If mode is nil, use `major-mode' of the current buffer."
                  (string-match "^\\(.+\\)-mode$" mode)
                  (match-string 1 mode))))))
 
-(defun gmm-write-region (start end filename &optional append visit
-                               lockname mustbenew)
-  "Compatibility function for `write-region'.
-
-In XEmacs, the seventh argument of `write-region' specifies the
-coding-system."
-  (if (and mustbenew (featurep 'xemacs))
-      (if (file-exists-p filename)
-          (signal 'file-already-exists (list "File exists" filename))
-        (write-region start end filename append visit lockname))
-    (write-region start end filename append visit lockname mustbenew)))
-
-;; `interactive-p' is obsolete since Emacs 23.2.
-(defmacro gmm-called-interactively-p (kind)
-  (condition-case nil
-      (progn
-        (eval '(called-interactively-p 'any))
-        ;; Emacs >=23.2
-        `(called-interactively-p ,kind))
-    ;; Emacs <23.2
-    (wrong-number-of-arguments '(called-interactively-p))
-    ;; XEmacs
-    (void-function '(interactive-p))))
-
 ;; `labels' is obsolete since Emacs 24.3.
 (defmacro gmm-labels (bindings &rest body)
   "Make temporary function bindings.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index ac967d25c40..ce26b00a51c 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2718,7 +2718,7 @@ If READ-CHARSET, ask for a coding system."
       (while (re-search-forward
               "\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
         (replace-match "\\1\\3" t)))
-    (when (gmm-called-interactively-p 'any)
+    (when (called-interactively-p 'any)
       (gnus-treat-article nil))))
 
 (defun article-wash-html ()
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index 0cdbff09937..66ee7c6daac 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -367,7 +367,7 @@ The leftmost column displays a D if the bookmark is flagged for
 deletion, or > if it is flagged for displaying."
   (interactive)
   (gnus-bookmark-maybe-load-default-file)
-  (if (gmm-called-interactively-p 'any)
+  (if (called-interactively-p 'any)
       (switch-to-buffer (get-buffer-create "*Gnus Bookmark List*"))
     (set-buffer (get-buffer-create "*Gnus Bookmark List*")))
   (let ((inhibit-read-only t)
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 74e2b827c60..f49eb0d85eb 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1036,7 +1036,7 @@ only the last one's marks are returned."
   (let* ((article (last articles))
          (id (gnus-registry-fetch-message-id-fast article))
          (marks (when id (gnus-registry-get-id-key id 'mark))))
-    (when (gmm-called-interactively-p 'any)
+    (when (called-interactively-p 'any)
       (gnus-message 1 "Marks are %S" marks))
     marks))
 
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index f1b3bd4c331..3255aa9a8a4 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1167,7 +1167,7 @@ articles in the topic and its subtopics."
       (remove-hook 'gnus-check-bogus-groups-hook 'gnus-topic-clean-alist)
       (setq gnus-group-prepare-function 'gnus-group-prepare-flat)
       (setq gnus-group-sort-alist-function 'gnus-group-sort-flat))
-    (when (gmm-called-interactively-p 'any)
+    (when (called-interactively-p 'any)
       (gnus-group-list-groups))))
 
 (defun gnus-topic-select-group (&optional all)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 6ee5264a4e7..3c3105649ed 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3201,7 +3201,7 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
 (defun message-goto-body ()
   "Move point to the beginning of the message body."
   (interactive)
-  (when (and (gmm-called-interactively-p 'any)
+  (when (and (called-interactively-p 'any)
              (looking-at "[ \t]*\n"))
     (expand-abbrev))
   (push-mark)
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 106d010a3dc..b8da19d9413 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1371,8 +1371,6 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'."
            inhibit-file-name-handlers)))
     (write-region start end filename append visit lockname)))
 
-(autoload 'gmm-write-region "gmm-utils")
-
 ;; It is not a MIME function, but some MIME functions use it.
 (if (and (fboundp 'make-temp-file)
          (ignore-errors
@@ -1417,11 +1415,7 @@ If SUFFIX is non-nil, add that at the end of the file name."
                              (setq file (concat file suffix)))
                          (if dir-flag
                              (make-directory file)
-                           ;; NOTE: This is unsafe if Emacs 20
-                           ;; users and XEmacs users don't use
-                           ;; a secure temp directory.
-                           (gmm-write-region "" nil file nil 'silent
-                                             nil 'excl))
+                           (write-region "" nil file nil 'silent nil 'excl))
                          nil)
                      (file-already-exists t)
                      ;; The XEmacs version of `make-directory' issues
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 3d8926b6925..70a3dd99be7 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -537,8 +537,8 @@ by nnmaildir-request-article.")
         (prin1 (vector storage-version num msgid nov) (current-buffer))
         (setq file (concat novfile ":"))
         (nnmaildir--unlink file)
-        (gmm-write-region (point-min) (point-max) file nil 'no-message nil
-                          'excl))
+        (write-region (point-min) (point-max) file nil 'no-message nil
+                      'excl))
       (rename-file file novfile 'replace)
       (setf (nnmaildir--art-msgid article) msgid)
       nov)))
@@ -1396,8 +1396,8 @@ by nnmaildir-request-article.")
               (concat "File exists: " tmpfile))
         (throw 'return nil))
       (with-current-buffer buffer
-        (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                          'excl))
+        (write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                      'excl))
       (unix-sync) ;; no fsync :(
       (rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace)
       t)))
@@ -1490,8 +1490,8 @@ by nnmaildir-request-article.")
                                   (throw 'return nil))))
       (condition-case nil (add-name-to-file nnmaildir--file tmpfile)
         (error
-         (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                           'excl)
+         (write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                       'excl)
          (when (fboundp 'unix-sync)
            (unix-sync)))) ;; no fsync :(
       (nnheader-cancel-timer 24h)