[Emacs-diffs] master 4f8de08 2/2: Remove XEmacs compat code from Gnus helper libraries

[Lars Ingebrigtsen]

branch: master
commit 4f8de080ef9bd6417fa99560f8bf9f3e7cc4d28b
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Remove XEmacs compat code from Gnus helper libraries
    
    * lisp/gnus/plstore.el (plstore-called-interactively-p): Remove.
    
    * lisp/gnus/pop3.el (pop3-make-date): Remove XEmacs compat.
    
    * lisp/gnus/sieve-mode.el: Remove XEmacs compat.
    
    * lisp/gnus/spam-stat.el (spam-stat-called-interactively-p): Remove.
---
 lisp/gnus/plstore.el    |   14 +-------------
 lisp/gnus/pop3.el       |    4 +---
 lisp/gnus/rfc1843.el    |    1 -
 lisp/gnus/rfc2047.el    |    4 +---
 lisp/gnus/sieve-mode.el |    5 ++---
 lisp/gnus/smime.el      |   10 +++-------
 lisp/gnus/spam-stat.el  |   14 +-------------
 lisp/gnus/yenc.el       |    4 ++--
 8 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index e327bbd..5685590 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -554,18 +554,6 @@ If no one is selected, symmetric encryption will be 
performed.  "
       (plstore-mode-original)
     (plstore-mode-decoded)))
 
-(eval-when-compile
-  (defmacro plstore-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)))))
-
 ;;;###autoload
 (define-derived-mode plstore-mode emacs-lisp-mode "PLSTORE"
   "Major mode for editing PLSTORE files."
@@ -573,7 +561,7 @@ If no one is selected, symmetric encryption will be 
performed.  "
   (add-hook 'write-contents-functions #'plstore--write-contents-functions)
   (define-key plstore-mode-map "\C-c\C-c" #'plstore-mode-toggle-display)
   ;; to create a new file with plstore-mode, mark it as already decoded
-  (if (plstore-called-interactively-p 'any)
+  (if (called-interactively-p 'any)
       (setq plstore-encoded t)
     (plstore-mode-decoded)))
 
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index fc59380..41ebe98 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -644,9 +644,7 @@ If NOW, use that time instead."
      (format " %s "
             (capitalize (car (rassoc (nth 4 (decode-time now))
                                      parse-time-months))))
-     (format-time-string "%Y %H:%M:%S " now)
-     ;; We do all of this because XEmacs doesn't have the %z spec.
-     (format "%s%02d%02d" sign (/ zone 3600) (/ (% zone 3600) 60)))))
+     (format-time-string "%Y %H:%M:%S %z" now))))
 
 (defun pop3-munge-message-separator (start end)
   "Check to see if a message separator exists.  If not, generate one."
diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el
index 81646b4..ee2af48 100644
--- a/lisp/gnus/rfc1843.el
+++ b/lisp/gnus/rfc1843.el
@@ -90,7 +90,6 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc";
            (while (re-search-forward (if rfc1843-decode-hzp
                                          rfc1843-hzp-word-regexp
                                        rfc1843-word-regexp) (point-max) t)
-             ;;; Text with extents may cause XEmacs crash
              (setq str (buffer-substring-no-properties
                         (match-beginning 1)
                         (match-end 1)))
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index be491e9..2862bb3 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -356,9 +356,7 @@ The buffer may be narrowed."
     ;; it appears to be the cleanest way.
     ;; Play safe and don't assume the form of the word syntax entry --
     ;; copy it from ?a.
-    (if (featurep 'xemacs)
-       (put-char-table t (get-char-table ?a (standard-syntax-table)) table)
-      (set-char-table-range table t (aref (standard-syntax-table) ?a)))
+    (set-char-table-range table t (aref (standard-syntax-table) ?a))
     (modify-syntax-entry ?\\ "\\" table)
     (modify-syntax-entry ?\" "\"" table)
     (modify-syntax-entry ?\( "(" table)
diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index 5ea687d..7575ba6 100644
--- a/lisp/gnus/sieve-mode.el
+++ b/lisp/gnus/sieve-mode.el
@@ -204,9 +204,8 @@ Turning on Sieve mode runs `sieve-mode-hook'."
   (set (make-local-variable 'comment-end) "")
   ;;(set (make-local-variable 'comment-start-skip) "\\(^\\|\\s-\\);?#+ *")
   (set (make-local-variable 'comment-start-skip) "#+ *")
-  (unless (featurep 'xemacs)
-    (set (make-local-variable 'font-lock-defaults)
-        '(sieve-font-lock-keywords nil nil ((?_ . "w")))))
+  (set (make-local-variable 'font-lock-defaults)
+       '(sieve-font-lock-keywords nil nil ((?_ . "w"))))
   (easy-menu-add-item nil nil sieve-mode-menu))
 
 ;; Menu
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index d1077a9..27e3127 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -588,13 +588,9 @@ A string or a list of strings is returned."
   "Get certificate for MAIL from the ldap server at HOST."
   (let ((ldapresult
         (funcall
-         (if (featurep 'xemacs)
-             (progn
-               (require 'smime-ldap)
-               'smime-ldap-search)
-           (progn
-             (require 'ldap)
-             'ldap-search))
+         (progn
+           (require 'ldap)
+           'ldap-search)
          (concat "mail=" mail)
          host '("userCertificate") nil))
        (retbuf (generate-new-buffer (format "*certificate for %s*" mail)))
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index afcc541..23b4556 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -493,18 +493,6 @@ where DIFF is the difference between SCORE and 0.5."
     (setcdr (nthcdr 14 result) nil)
     result))
 
-(eval-when-compile
-  (defmacro spam-stat-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)))))
-
 (defun spam-stat-score-buffer ()
   "Return a score describing the spam-probability for this buffer.
 Add user supplied modifications if supplied."
@@ -522,7 +510,7 @@ Add user supplied modifications if supplied."
            (error nil)))
         (ans
          (if score1s (+ score0 score1s) score0)))
-    (when (spam-stat-called-interactively-p 'any)
+    (when (called-interactively-p 'any)
       (message "%S" ans))
     ans))
 
diff --git a/lisp/gnus/yenc.el b/lisp/gnus/yenc.el
index cfac06d..a4ebd0d 100644
--- a/lisp/gnus/yenc.el
+++ b/lisp/gnus/yenc.el
@@ -90,8 +90,8 @@
                (setq last (match-beginning 0))
                (setq footer-alist (yenc-parse-line (match-string 0)))
                (setq work-buffer (generate-new-buffer " *yenc-work*"))
-               (unless (featurep 'xemacs)
-                 (with-current-buffer work-buffer (set-buffer-multibyte nil)))
+               (with-current-buffer work-buffer
+                 (set-buffer-multibyte nil))
                (while (< first last)
                  (setq char (char-after first))
                  (cond ((or (eq char ?\r)