*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad0f027..df90c83 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jul  6 05:46:12 1996  Lars Magne Ingebrigtsen  <larsi@ylfing.ifi.uio.no>
+
+       * nnheader.el (nnheader-re-read-dir): Would sometimes bug out.
+
+Fri Jul  5 03:14:43 1996  Lars Magne Ingebrigtsen  <larsi@ylfing.ifi.uio.no>
+
+       * gnus.el (gnus-summary-toggle-threads): Message the state.
+
+Thu Jul  4 07:52:07 1996  Lars Magne Ingebrigtsen  <larsi@ylfing.ifi.uio.no>
+
+       * gnus.el: Gnus v5.2.33 is released.
+
 Thu Jul  4 06:08:11 1996  Lars Magne Ingebrigtsen  <larsi@aegir.ifi.uio.no>
 
        * nntp.el (nntp-open-telnet): Working function.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 61d9001..7c67ab2 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -31,6 +31,12 @@
 
 (setq custom-file "/THIS FILE DOES NOT eXiST!")
 
+(defalias 'device-sound-enabled-p 'ignore)
+(defalias 'play-sound-file 'ignore)
+(defalias 'nndb-request-article 'ignore)
+(defalias 'efs-re-read-dir 'ignore)
+(defalias 'ange-ftp-re-read-dir 'ignore)
+
 (defun dgnushack-compile ()
   ;(setq byte-compile-dynamic t)
   (let ((files (directory-files "." nil ".el$"))

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index 12472e2..eb19005 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -108,11 +108,13 @@ Face used for group or summary buffer mouse highlighting.
 The line beneath the mouse pointer will be highlighted with this
 face.")
        (name . gnus-mouse-face)
-       (calculate . (if (gnus-visual-p 'mouse-face 'highlight)
-                        (if (boundp 'gnus-mouse-face)
-                            gnus-mouse-face
-                          'highlight)
-                      'default))
+       (calculate . (condition-case ()
+                        (if (gnus-visual-p 'mouse-face 'highlight)
+                            (if (boundp 'gnus-mouse-face)
+                                gnus-mouse-face
+                              'highlight)
+                          'default)
+                      (error nil)))
        (type . face))
        ((tag . "Article Display")
        (doc . "Controls how the article buffer will look.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 046f156..1c5bf70 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -32,7 +32,6 @@
 (require 'timezone)
 (require 'nnheader)
 (require 'nnmail)
-(require 'backquote)
 (require 'nnoo)
 
 (eval-when-compile (require 'cl))
@@ -1772,7 +1771,7 @@ variable (string, integer, character, etc).")
   "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
-(defconst gnus-version-number "5.2.33"
+(defconst gnus-version-number "5.2.34"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)
@@ -12742,6 +12741,7 @@ If ARG is positive number, turn showing conversation threads on."
            (> (prefix-numeric-value arg) 0)))
     (gnus-summary-prepare)
     (gnus-summary-goto-subject current)
+    (gnus-message 6 "Threading is now %s" (if gnus-show-threads "on" "off"))
     (gnus-summary-position-point)))
 
 (defun gnus-summary-show-all-threads ()

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 5957002..ab49c59 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -597,10 +597,10 @@ without formatting."
 (defvar efs-path-regexp)
 (defun nnheader-re-read-dir (path)
   "Re-read directory PATH if PATH is on a remote system."
-    (if (or (fboundp 'efs-re-read-dir) (boundp 'efs-path-regexp))
+    (if (and (fboundp 'efs-re-read-dir) (boundp 'efs-path-regexp))
        (when (string-match efs-path-regexp path)
          (efs-re-read-dir path))
-     (if (or (fboundp 'ange-ftp-re-read-dir) (boundp 'ange-ftp-path-format))
+     (if (and (fboundp 'ange-ftp-re-read-dir) (boundp 'ange-ftp-path-format))
       (when (string-match (car ange-ftp-path-format) path)
        (ange-ftp-re-read-dir path)))))