*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b74e415..0bb9f78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+Sun Apr  6 23:17:21 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Gnus v5.4.42 is released.
+
+Sun Apr  6 23:13:50 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-xmas.el (gnus-xmas-summary-set-display-table): There isn't
+       always a default table, it seems.
+
+Sun Apr  6 22:45:52 1997  Aaron M. Ucko  <amu@mit.edu>
+
+       * gnus-xmas.el (gnus-xmas-summary-set-display-table): Typo.
+
+Sun Apr  6 22:26:52 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-group.el: All the sorting commands were shadowed.
+
 Sun Apr  6 21:46:05 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Gnus v5.4.41 is released.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 2278096..4f3a586 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -523,7 +523,7 @@ ticked: The number of ticked articles."
     "r" gnus-group-sort-groups-by-rank
     "m" gnus-group-sort-groups-by-method)
 
-  (gnus-define-keys (gnus-group-sort-map "P" gnus-group-group-map)
+  (gnus-define-keys (gnus-group-sort-selected-map "P" gnus-group-group-map)
     "s" gnus-group-sort-selected-groups
     "a" gnus-group-sort-selected-groups-by-alphabet
     "u" gnus-group-sort-selected-groups-by-unread
@@ -2184,7 +2184,7 @@ If REVERSE (the prefix), reverse the sorting order."
 (defun gnus-group-sort-flat (func reverse)
   ;; We peel off the dummy group from the alist.
   (when func
-    (when (equal (car (gnus-info-group gnus-newsrc-alist)) "dummy.group")
+    (when (equal (gnus-info-group (car gnus-newsrc-alist)) "dummy.group")
       (pop gnus-newsrc-alist))
     ;; Do the sorting.
     (setq gnus-newsrc-alist

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 312c19d..6801fd8 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1467,6 +1467,7 @@ newsgroup."
     (while alist
       (gnus-sethash
        (caar alist)
+       ;; Preserve number of unread articles in groups.
        (cons (and ohashtb (car (gnus-gethash (caar alist) ohashtb)))
             prev)
        gnus-newsrc-hashtb)

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 95269d9..2c1da43 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -182,11 +182,9 @@ displayed, no centering will be performed."
          (select-window selected))))))
 
 (defun gnus-xmas-summary-set-display-table ()
-  ;; Setup the display table -- like gnus-summary-setup-display-table,
   ;; Setup the display table -- like `gnus-summary-setup-display-table',
   ;; but done in an XEmacsish way.
   (let ((table (make-display-table))
-       ;; Nix out all the control chars...
        (default-table (specifier-instance current-display-table))
        (i 32))
     ;; Nix out all the control chars...
@@ -199,11 +197,10 @@ displayed, no centering will be performed."
     ;; We nix out any glyphs over 126 that are not set already.
     (let ((i 256))
       (while (>= (setq i (1- i)) 127)
-       ;; Only modify if the entry is nil.
-       (or (aref table i)
        ;; Only modify if the default entry is nil.
-       (or (aref default-table i)
-           (aset table i [??]))))
+       (when (or (not default-table)
+                 (not (aref default-table i)))
+         (aset table i [??]))))
     ;; Can't use `set-specifier' because of a bug in 19.14 and earlier
     (add-spec-to-specifier current-display-table table (current-buffer) nil)))
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 6452290..56e830a 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -226,7 +226,7 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.4.41"
+(defconst gnus-version-number "5.4.42"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)

diff --git a/lisp/message.el b/lisp/message.el
index f896d01..39bbc6e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1194,10 +1194,10 @@ C-c C-r  message-caesar-buffer-body (rot13 the message body)."
   (kill-all-local-variables)
   (make-local-variable 'message-reply-buffer)
   (setq message-reply-buffer nil)
-  (set (make-local-variable 'message-send-actions) nil)
-  (set (make-local-variable 'message-exit-actions) nil)
-  (set (make-local-variable 'message-kill-actions) nil)
-  (set (make-local-variable 'message-postpone-actions) nil)
+  (make-local-variable 'message-send-actions) 
+  (make-local-variable 'message-exit-actions) 
+  (make-local-variable 'message-kill-actions)
+  (make-local-variable 'message-postpone-actions)
   (set-syntax-table message-mode-syntax-table)
   (use-local-map message-mode-map)
   (setq local-abbrev-table message-mode-abbrev-table)

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 00b71c7..06c5af1 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
-@settitle Gnus 5.4.41 Manual
+@settitle Gnus 5.4.42 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -287,7 +287,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Gnus 5.4.41 Manual
+@title Gnus 5.4.42 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -323,7 +323,7 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local
 spool or your mbox file.  All at the same time, if you want to push your
 luck.
 
-This manual corresponds to Gnus 5.4.41.
+This manual corresponds to Gnus 5.4.42.
 
 @end ifinfo
 

diff --git a/texi/message.texi b/texi/message.texi
index b9bfcb4..329d6d4 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message
-@settitle Message 5.4.41 Manual
+@settitle Message 5.4.42 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -39,7 +39,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Message 5.4.41 Manual
+@title Message 5.4.42 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -79,7 +79,7 @@ buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to Message 5.4.41.  Message is distributed with
+This manual corresponds to Message 5.4.42.  Message is distributed with
 the Gnus distribution bearing the same version number as this manual
 has.