From cd25b95193df9434e77ff651a09a1ee183d3d75b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 21 May 2004 01:13:03 +0000 Subject: [PATCH] Synch to No Gnus 200405210034. * lisp/nnheader.el (mm-string-make-unibyte): New function. * lisp/utf7.el: Require `mm-util' only when compiling. --- ChangeLog | 6 ++++++ contrib/nnir.el | 3 --- contrib/ssl.el | 3 --- lisp/ChangeLog | 6 ++++++ lisp/gnus-start.el | 2 +- lisp/nnheader.el | 7 ++++++- lisp/utf7.el | 5 +++-- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8acb0d1..ae9018c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-21 Katsumi Yamaoka + + * lisp/nnheader.el (mm-string-make-unibyte): New function. + + * lisp/utf7.el: Require `mm-util' only when compiling. + 2004-05-02 TSUCHIYA Masatoshi * gnus-namazu.el (gnus-namazu-imap-group-prefix): Abolished. diff --git a/contrib/nnir.el b/contrib/nnir.el index 926b4b9..5d65d31 100644 --- a/contrib/nnir.el +++ b/contrib/nnir.el @@ -298,9 +298,6 @@ ;;; Setup Code: -(defconst nnir-version "$Id: nnir.el,v 1.1.6.1.4.3 2004-04-05 23:08:14 yamaoka Exp $" - "Version of NNIR.") - (require 'cl) (require 'nnoo) (require 'gnus-group) diff --git a/contrib/ssl.el b/contrib/ssl.el index b3125ba..5aa9d2f 100644 --- a/contrib/ssl.el +++ b/contrib/ssl.el @@ -1,7 +1,4 @@ ;;; ssl.el,v --- ssl functions for emacsen without them builtin -;; Author: $Author: yamaoka $ -;; Created: $Date: 2004-01-05 03:24:10 $ -;; Version: $Revision: 1.1.6.1.8.1 $ ;; Keywords: comm ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bc7357f..c2379db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-05-21 Katsumi Yamaoka + + * gnus-start.el (gnus-get-unread-articles): Don't invalidate + active for foreign groups even if the group level is higher than + the specified value. + 2004-05-21 Lars Magne Ingebrigtsen * gnus-art.el (gnus-picon-databases): Add /usr/share/picons. diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 00d02f5..9168757 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -1715,7 +1715,7 @@ newsgroup." (when (fboundp (intern (concat (symbol-name (car method)) "-request-update-info"))) (inline (gnus-request-update-info info method)))) - (setq active 'ignore))) + (setq active nil))) ;; These groups are native or secondary. ((> (gnus-info-level info) level) ;; We don't want these groups. diff --git a/lisp/nnheader.el b/lisp/nnheader.el index 5f09c3e..297dd0f 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -286,7 +286,12 @@ nil, ." "Return non-nil if SYM is a coding system." (or (and (fboundp 'find-coding-system) (find-coding-system sym)) (and (fboundp 'coding-system-p) (coding-system-p sym)))) - (defalias 'mm-coding-system-p 'nnheader-coding-system-p)) + (defalias 'mm-coding-system-p 'nnheader-coding-system-p) + + (defalias 'mm-string-make-unibyte + (if (fboundp 'string-make-unibyte) + 'string-make-unibyte + 'identity))) ;; mail-parse stuff. (unless (featurep 'mail-parse) diff --git a/lisp/utf7.el b/lisp/utf7.el index 45e472a..f1598f1 100644 --- a/lisp/utf7.el +++ b/lisp/utf7.el @@ -65,8 +65,9 @@ ;;; Code: (require 'base64) -(eval-when-compile (require 'cl)) -(require 'mm-util) +(eval-when-compile + (require 'cl) + (require 'mm-util)) (defconst utf7-direct-encoding-chars " -%'-*,-[]-}" "Character ranges which do not need escaping in UTF-7.") -- 1.7.10.4