Synch with Gnus and...

* texi/Makefile.in (INFOSWI, XINFOSWI): Revert.
* lisp/dgnushack.el (dgnushack-texi-format): Require `ptexinfmt' instead of
`texinfmt'.

diff --git a/ChangeLog b/ChangeLog
index 379d85d..7d57fc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,7 @@
 2000-08-17  Katsumi Yamaoka <yamaoka@jpl.org>
 
-       * texi/Makefile.in (INFOSWI, XINFOSWI): Load ptexinfmt.el.
-
-       * lisp/dgnushack.el (dgnushack-texi-format): Don't require
-       `texinfmt'.
+       * lisp/dgnushack.el (dgnushack-texi-format): Require `ptexinfmt'
+       instead of `texinfmt'.
        (dgnushack-install-package): Don't install ptexinfmt.el.
        (dgnushack-make-package): Don't include ptexinfmt.el in MANIFEST.
        (dgnushack-compile): Don't compile dgnushack.el nor ptexinfmt.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c27fde..55cf966 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2000-08-17  Dave Love  <fx@gnu.org>
+
+       * gnus-group.el (gnus-group-running-xemacs): Deleted.
+
+       * gnus-demon.el (gnus-demon): Bind use-dialog-box and
+       last-nonmenu-event.
+
+       * uudecode.el (char-int): Use defalias, not fset.
+
+       * score-mode.el: Don't require easymenu.  Require mm-util.
+       (score-mode-coding-system): Use mm-auto-save-coding-system.
+
+       * nneething.el (nneething-create-mapping): Don't use cadar & al.
+       (nneething-file-name): Use expand-file-name, not concat.
+
 2000-08-16 13:05:46  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnslashdot.el (nnslashdot-threaded-retrieve-headers):

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 8fb8252..1a90445 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -367,6 +367,7 @@ You must specify the name of the package path as follows:
 (defun dgnushack-texi-format (&optional addsuffix)
   (if (not noninteractive)
       (error "batch-texinfo-format may only be used -batch."))
+  (require 'ptexinfmt)
   (let ((auto-save-default nil)
        (find-file-run-dired nil)
        coding-system-for-write

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index 75b8765..78d7286 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -191,6 +191,10 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
     ;; sufficiently ripe.
     (let ((handlers gnus-demon-handler-state)
          (gnus-inhibit-demon t)
+         ;; Try to avoid dialog boxes, e.g. by Mailcrypt.
+         ;; Unfortunately, Emacs 20's `message-or-box...' doesn't
+         ;; obey `use-dialog-box'.
+         use-dialog-box (last-nonmenu-event 10)
          handler time idle)
       (while handlers
        (setq handler (pop handlers))

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 99f8c58..bb08203 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -489,7 +489,6 @@ For example:
 
 
 (defvar gnus-group-icon-cache nil)
-(defvar gnus-group-running-xemacs (string-match "XEmacs" emacs-version))
 
 ;;;
 ;;; Gnus group mode

diff --git a/lisp/nneething.el b/lisp/nneething.el
index fdf72e3..04b0229 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -231,13 +231,13 @@ included.")
       (let ((map nneething-map)
            prev)
        (while map
-         (if (and (member (cadar map) files)
+         (if (and (member (cadr (car map)) files)
                   ;; We also remove files that have changed mod times.
                   (equal (nth 5 (file-attributes
-                                 (nneething-file-name (cadar map))))
-                         (caddar map)))
+                                 (nneething-file-name (cadr (car map)))))
+                         (cadr (cdar map))))
              (progn
-               (push (cadar map) map-files)
+               (push (cadr (car map)) map-files)
                (setq prev map))
            (setq touched t)
            (if prev
@@ -362,9 +362,9 @@ included.")
         fname)
     (if (numberp article)
        (if (setq fname (cadr (assq article nneething-map)))
-           (concat dir fname)
-         (make-temp-name (concat dir "nneething")))
-      (concat dir article))))
+           (expand-file-name fname dir)
+         (make-temp-name (expand-file-name "nneething" dir)))
+      (expand-file-name article dir))))
 
 (provide 'nneething)
 

diff --git a/lisp/score-mode.el b/lisp/score-mode.el
index 999ee44..1555df9 100644 (file)
--- a/lisp/score-mode.el
+++ b/lisp/score-mode.el
@@ -28,8 +28,6 @@
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'static))
 
-(require 'easymenu)
-
 (defvar gnus-score-mode-hook nil
   "*Hook run in score mode buffers.")
 

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 835a888..8b215cc 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -11,10 +11,8 @@ TEXI2PDF=texi2pdf
 MAKEINFO=@MAKEINFO@
 EMACS=@EMACS@
 EMACSINFO=$(EMACS) -batch -q -no-site-file
-INFOSWI=-l ./dgnushack.el -l ./ptexinfmt.el \
-       -f dgnushack-texi-format
-XINFOSWI=-l ./dgnushack.el -l ./ptexinfmt.el \
-       -f dgnushack-texi-add-suffix-and-format
+INFOSWI=-l ./dgnushack.el -f dgnushack-texi-format
+XINFOSWI=-l ./dgnushack.el -f dgnushack-texi-add-suffix-and-format
 PDFLATEX=pdflatex
 LATEX=latex
 DVIPS=dvips