* mml.el (mml-mode): Replace gnus-add-minor-mode with

add-minor-mode.

* gnus-undo.el (gnus-undo-mode): do.

* gnus-topic.el (gnus-topic-mode): do.

* gnus-sum.el (gnus-dead-summary-mode): do.

* gnus-start.el (gnus-slave-mode): do.

* gnus-salt.el (gnus-binary-mode, gnus-pick-mode): do.

* gnus-ml.el (gnus-mailing-list-mode): do.

* gnus-gl.el (gnus-grouplens-mode): do.

* gnus-draft.el (gnus-draft-mode): do.

* gnus-dired.el (gnus-dired-mode): do.

* gnus-ems.el (gnus-add-minor-mode): Remove.

* gnus-ems.el (gnus-char-width): Remove.

* gnus-ems.el (gnus-char-width): Remove.

* smime.el (smime-point-at-eol): Replace with point-at-eol.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbd8573..160892f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,33 @@
 2004-01-05  Jesper Harder  <harder@ifa.au.dk>
 
+       * mml.el (mml-mode): Replace gnus-add-minor-mode with
+       add-minor-mode.
+
+       * gnus-undo.el (gnus-undo-mode): do.
+
+       * gnus-topic.el (gnus-topic-mode): do.
+
+       * gnus-sum.el (gnus-dead-summary-mode): do.
+
+       * gnus-start.el (gnus-slave-mode): do.
+
+       * gnus-salt.el (gnus-binary-mode, gnus-pick-mode): do.
+
+       * gnus-ml.el (gnus-mailing-list-mode): do.
+
+       * gnus-gl.el (gnus-grouplens-mode): do.
+
+       * gnus-draft.el (gnus-draft-mode): do.
+
+       * gnus-dired.el (gnus-dired-mode): do.
+
+       * gnus-ems.el (gnus-add-minor-mode): Remove.
+
+       * gnus-spec.el (gnus-correct-length, gnus-correct-substring):
+       Replace gnus-char-width with char-width.
+
+       * gnus-ems.el (gnus-char-width): Remove.
+
        * gnus-spec.el (gnus-correct-length, gnus-correct-substring):
        Replace gnus-char-width with char-width.
 

diff --git a/lisp/gnus-dired.el b/lisp/gnus-dired.el
index 1fa657f..3937874 100644 (file)
--- a/lisp/gnus-dired.el
+++ b/lisp/gnus-dired.el
@@ -72,7 +72,7 @@
         (if (null arg) (not gnus-dired-mode)
           (> (prefix-numeric-value arg) 0)))
     (when gnus-dired-mode
-      (gnus-add-minor-mode 'gnus-dired-mode "" gnus-dired-mode-map)
+      (add-minor-mode 'gnus-dired-mode "" gnus-dired-mode-map)
       (gnus-run-hooks 'gnus-dired-mode-hook))))
 
 ;;;###autoload

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 1a3a41c..b21393e 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -74,7 +74,7 @@
       ;; Set up the menu.
       (when (gnus-visual-p 'draft-menu 'menu)
        (gnus-draft-make-menu-bar))
-      (gnus-add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map)
+      (add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map)
       (mml-mode)
       (gnus-run-hooks 'gnus-draft-mode-hook))))
 

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 9b36a6d..c172d2c 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -153,16 +153,6 @@
   "Non-nil means the mark and region are currently active in this buffer."
   mark-active) ; aliased to region-exists-p in XEmacs.
 
-(if (fboundp 'add-minor-mode)
-    (defalias 'gnus-add-minor-mode 'add-minor-mode)
-  (defun gnus-add-minor-mode (mode name map &rest rest)
-    (set (make-local-variable mode) t)
-    (unless (assq mode minor-mode-alist)
-      (push `(,mode ,name) minor-mode-alist))
-    (unless (assq mode minor-mode-map-alist)
-      (push (cons mode map)
-           minor-mode-map-alist))))
-
 (defun gnus-x-splash ()
   "Show a splash screen using a pixmap in the current buffer."
   (let ((dir (nnheader-find-etc-directory "gnus"))

diff --git a/lisp/gnus-gl.el b/lisp/gnus-gl.el
index 08ce4d4..190de06 100644 (file)
--- a/lisp/gnus-gl.el
+++ b/lisp/gnus-gl.el
@@ -850,7 +850,7 @@ If prefix argument ALL is non-nil, all articles are marked as read."
       (when (and menu-bar-mode
                 (gnus-visual-p 'grouplens-menu 'menu))
        (gnus-grouplens-make-menu-bar))
-      (gnus-add-minor-mode
+      (add-minor-mode
        'gnus-grouplens-mode " GroupLens" gnus-grouplens-mode-map)
       (gnus-run-hooks 'gnus-grouplens-mode-hook))))
 

diff --git a/lisp/gnus-ml.el b/lisp/gnus-ml.el
index 978b2e3..b98a006 100644 (file)
--- a/lisp/gnus-ml.el
+++ b/lisp/gnus-ml.el
@@ -102,7 +102,7 @@ If FORCE is non-nil, replace the old ones."
       ;; Set up the menu.
       (when (gnus-visual-p 'mailing-list-menu 'menu)
        (gnus-mailing-list-make-menu-bar))
-      (gnus-add-minor-mode 'gnus-mailing-list-mode " Mailing-List" gnus-mailing-list-mode-map)
+      (add-minor-mode 'gnus-mailing-list-mode " Mailing-List" gnus-mailing-list-mode-map)
       (gnus-run-hooks 'gnus-mailing-list-mode-hook))))
 
 ;;; Commands

diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index 04de40f..075fc44 100644 (file)
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -128,7 +128,7 @@ It accepts the same format specs that `gnus-summary-line-format' does."
       ;; Set up the menu.
       (when (gnus-visual-p 'pick-menu 'menu)
        (gnus-pick-make-menu-bar))
-      (gnus-add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map
+      (add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map
                           nil 'gnus-pick-mode)
       (gnus-run-hooks 'gnus-pick-mode-hook))))
 
@@ -361,7 +361,7 @@ This must be bound to a button-down mouse event."
       ;; Set up the menu.
       (when (gnus-visual-p 'binary-menu 'menu)
        (gnus-binary-make-menu-bar))
-      (gnus-add-minor-mode 'gnus-binary-mode " Binary"
+      (add-minor-mode 'gnus-binary-mode " Binary"
                           gnus-binary-mode-map nil 'gnus-binary-mode)
       (gnus-run-hooks 'gnus-binary-mode-hook))))
 

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 405f04b..77d3bbf 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2793,7 +2793,7 @@ If FORCE is non-nil, the .newsrc file is read."
 
 (defun gnus-slave-mode ()
   "Minor mode for slave Gnusae."
-  (gnus-add-minor-mode 'gnus-slave-mode " Slave" (make-sparse-keymap))
+  (add-minor-mode 'gnus-slave-mode " Slave" (make-sparse-keymap))
   (gnus-run-hooks 'gnus-slave-mode-hook))
 
 (defun gnus-slave-save-newsrc ()

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3379a64..55782db 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6690,7 +6690,7 @@ The state which existed when entering the ephemeral is reset."
          (if (null arg) (not gnus-dead-summary-mode)
            (> (prefix-numeric-value arg) 0)))
     (when gnus-dead-summary-mode
-      (gnus-add-minor-mode
+      (add-minor-mode
        'gnus-dead-summary-mode " Dead" gnus-dead-summary-mode-map))))
 
 (defun gnus-deaden-summary ()

diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index da404a5..292f6c1 100644 (file)
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -1136,7 +1136,7 @@ articles in the topic and its subtopics."
       (when (gnus-visual-p 'topic-menu 'menu)
        (gnus-topic-make-menu-bar))
       (gnus-set-format 'topic t)
-      (gnus-add-minor-mode 'gnus-topic-mode " Topic"
+      (add-minor-mode 'gnus-topic-mode " Topic"
                           gnus-topic-mode-map nil (lambda (&rest junk)
                                                     (interactive)
                                                     (gnus-topic-mode nil t)))

diff --git a/lisp/gnus-undo.el b/lisp/gnus-undo.el
index f022926..816e575 100644 (file)
--- a/lisp/gnus-undo.el
+++ b/lisp/gnus-undo.el
@@ -113,7 +113,7 @@
     ;; Set up the menu.
     (when (gnus-visual-p 'undo-menu 'menu)
       (gnus-undo-make-menu-bar))
-    (gnus-add-minor-mode 'gnus-undo-mode "" gnus-undo-mode-map)
+    (add-minor-mode 'gnus-undo-mode "" gnus-undo-mode-map)
     (gnus-make-local-hook 'post-command-hook)
     (add-hook 'post-command-hook 'gnus-undo-boundary nil t)
     (gnus-run-hooks 'gnus-undo-mode-hook)))

diff --git a/lisp/mml.el b/lisp/mml.el
index fded446..570dcc9 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -34,7 +34,6 @@
 (eval-and-compile
   (autoload 'message-make-message-id "message")
   (autoload 'gnus-setup-posting-charset "gnus-msg")
-  (autoload 'gnus-add-minor-mode "gnus-ems")
   (autoload 'gnus-make-local-hook "gnus-util")
   (autoload 'message-fetch-field "message")
   (autoload 'fill-flowed-encode "flow-fill")
@@ -892,7 +891,7 @@ See Info node `(emacs-mime)Composing'.
   (when (set (make-local-variable 'mml-mode)
             (if (null arg) (not mml-mode)
               (> (prefix-numeric-value arg) 0)))
-    (gnus-add-minor-mode 'mml-mode " MML" mml-mode-map)
+    (add-minor-mode 'mml-mode " MML" mml-mode-map)
     (easy-menu-add mml-menu mml-mode-map)
     (run-hooks 'mml-mode-hook)))
 

diff --git a/lisp/smime.el b/lisp/smime.el
index 33a14ea..1006e4d 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -518,7 +518,7 @@ A string or a list of strings is returned."
     (goto-char b)
     (let (res)
       (while (< (point) e)
-       (let ((str (buffer-substring (point) (smime-point-at-eol))))
+       (let ((str (buffer-substring (point) (point-at-eol))))
          (unless (string= "" str)
            (push str res)))
        (forward-line))