Revert bogus changes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94827a5..d491066 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,3 @@
-2004-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * pop3.el (pop3-md5): Define it before being used.
-
 2004-11-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.el (message-forbidden-properties): Fixed typo in doc

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 245d434..401358d 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -136,13 +136,6 @@ way."
   :type '(radio (const :format "Unlimited " nil)
                (integer :format "Maximum number: %v")))
 
-;; Function(s) missing in Emacs 20
-(when (memq nil (mapcar 'fboundp '(puthash)))
-  (require 'cl)
-  (unless (fboundp 'puthash)
-    ;; alias puthash is missing from Emacs 20 cl-extra.el
-    (defalias 'puthash 'cl-puthash)))
-
 (defun gnus-registry-track-subject-p ()
   (memq 'subject gnus-registry-track-extra))
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 219ace0..e2e50a0 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -65,25 +65,7 @@ If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
 string containing the replacements.
 
 This is a compatibility function for different Emacsen."
-      (replace-regexp-in-string regexp newtext string nil literal)))
-   (t
-    (defun gnus-replace-in-string (string regexp newtext &optional literal)
-      "Replace all matches for REGEXP with NEWTEXT in STRING.
-If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
-string containing the replacements.
-
-This is a compatibility function for different Emacsen."
-      (let ((start 0) tail)
-       (while (string-match regexp string start)
-         (setq tail (- (length string) (match-end 0)))
-         (setq string (replace-match newtext nil literal string))
-         (setq start (- (length string) tail))))
-      string))))
-
-;;; bring in the netrc functions as aliases
-(defalias 'gnus-netrc-get 'netrc-get)
-(defalias 'gnus-netrc-machine 'netrc-machine)
-(defalias 'gnus-parse-netrc 'netrc-parse)
+      (replace-regexp-in-string regexp newtext string nil literal)))))
 
 (defun gnus-boundp (variable)
   "Return non-nil if VARIABLE is bound and non-nil."

diff --git a/lisp/message.el b/lisp/message.el
index 7c28d4e..0678282 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2451,11 +2451,7 @@ See also `message-forbidden-properties'."
             (message-tamago-not-in-use-p begin))
     (let ((buffer-read-only nil)
          (inhibit-read-only t))
-      (while (not (= begin end))
-       (when (not (get-text-property begin 'message-hidden))
-         (remove-text-properties begin (1+ begin)
-                                 message-forbidden-properties))
-       (incf begin)))))
+      (remove-text-properties begin end message-forbidden-properties))))
 
 ;;;###autoload
 (define-derived-mode message-mode text-mode "Message"

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 84e9234..de881c2 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -348,22 +348,6 @@ If NOW, use that time instead."
 
 ;; AUTHORIZATION STATE
 
-(eval-and-compile
-  (if (fboundp 'md5)
-      (defalias 'pop3-md5 'md5)
-    (defvar pop3-md5-program "md5"
-      "*Program to encode its input in MD5.")
-
-    (defun pop3-md5 (string)
-      (with-temp-buffer
-       (insert string)
-       (call-process-region (point-min) (point-max)
-                            pop3-md5-program
-                            t (current-buffer) nil)
-       ;; The meaningful output is the first 32 characters.
-       ;; Don't return the newline that follows them!
-       (buffer-substring (point-min) (+ 32 (point-min)))))))
-
 (defun pop3-user (process user)
   "Send USER information to POP3 server."
   (pop3-send-command process (format "USER %s" user))