From 8f222d88409dfa2f77a3b3c50489a642b7948e85 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 4 Mar 1997 03:23:51 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 8 ++++++++ lisp/custom.el | 10 +++++----- lisp/gnus.el | 13 +++++++++++-- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f6a9b0b9e..a264a2b57 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +Fri Aug 25 06:03:51 1995 Lars Magne Ingebrigtsen + + * gnus.el (gnus-modtime-botch): New variable. + +Fri Aug 25 05:44:07 1995 Lars Magne Ingebrigtsen + + * gnus.el: 0.99.20 is released. + Fri Aug 25 02:57:19 1995 Lars Magne Ingebrigtsen * nndir.el (nndir-status-message): Wrong number of arguments. diff --git a/lisp/custom.el b/lisp/custom.el index 74161d051..0c24a5563 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -119,11 +119,11 @@ STRING should be given if the last search was by `string-match' on STRING." (or (fboundp 'facep) ;; Introduced in Emacs 19.29. (defun facep (x) - "Return t if X is a face name or an internal face vector." - (and (or (internal-facep x) - (and (symbolp x) (assq x global-face-data))) - t))) - + "Return t if X is a face name or an internal face vector." + (and (or (and (fboundp 'internal-facep) (internal-facep x)) + (and (symbolp x) (assq x global-face-data))) + t))) + (if (facep 'underline) () ;; No underline face in XEmacs 19.12. diff --git a/lisp/gnus.el b/lisp/gnus.el index c55d977e7..9ffbef714 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1059,6 +1059,10 @@ which to perform auto-expiry. This only makes sense for mail groups.") (defvar gnus-hidden-properties '(invisible t intangible t) "Property list to use for hiding text.") +(defvar gnus-modtime-botch nil + "*Non-nil means .newsrc should be deleted prior to save. Its use is +due to the bogus appearance that .newsrc was modified on disc.") + ;; Hooks. (defvar gnus-group-mode-hook nil @@ -1339,7 +1343,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 "(ding) Gnus v0.99.20" +(defconst gnus-version "(ding) Gnus v0.99.21" "Version number for this version of Gnus.") (defvar gnus-info-nodes @@ -13462,7 +13466,12 @@ If FORCE is non-nil, the .newsrc file is read." ;; file seems to be off. We really do want to overwrite it, so ;; we clear the modtime here before saving. It's a bit odd, ;; though... - (clear-visited-file-modtime) + ;; sometimes the modtime clear isn't sufficient. most brute force: + ;; delete the silly thing entirely first. but this fails to provide + ;; such niceties as .newsrc~ creation. + (if gnus-modtime-botch + (delete-file gnus-startup-file) + (clear-visited-file-modtime)) (save-buffer) (kill-buffer (current-buffer))))) -- 2.34.1