From 12107b41ab4feeb1fe8eb26b222045b9ae36e087 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 16 Jan 2003 01:49:18 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 26 ++++++++++++++++++++++++++ lisp/gnus-agent.el | 6 +++--- lisp/gnus-group.el | 2 +- lisp/gnus.el | 2 +- lisp/nnfolder.el | 2 +- lisp/nnheader.el | 6 +++--- lisp/nnimap.el | 2 +- lisp/nnmail.el | 4 ++-- lisp/nnsoup.el | 2 +- lisp/nnspool.el | 2 +- texi/ChangeLog | 12 ++++++++++++ texi/gnus-ja.texi | 36 ++++++++++++++++++------------------ texi/gnus.texi | 34 +++++++++++++++++----------------- texi/message-ja.texi | 2 +- texi/message.texi | 2 +- 15 files changed, 89 insertions(+), 51 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f77ff8..269b776 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,29 @@ +2003-01-15 ShengHuo ZHU + + * gnus-agent.el: Don't use `path'. + From the GNU coding standards: + + Please do not use the term ``pathname'' that is used in Unix + documentation; use ``file name'' (two words) instead. We use + the term ``path'' only for search paths, which are lists of + directory names. + + * nnsoup.el (nnsoup-file-name): Ditto. + + * nnmail.el (nnmail-pathname-coding-system): Ditto. + (nnmail-group-pathname): Ditto. + + * nnimap.el (nnimap-group-overview-filename): Ditto. + + * nnheader.el (nnheader-pathname-coding-system): Ditto. + (nnheader-group-pathname): Ditto. + + * nnfolder.el (nnfolder-group-pathname): Ditto. + + * gnus.el (gnus-home-directory): Ditto. + + * gnus-group.el (gnus-group-icon-list): Ditto. + 2003-01-16 Jesper Harder * message.el (message-mode-menu): Use it. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 3ff7f26..2235f34 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -246,12 +246,12 @@ node `(gnus)Server Buffer'.") (cadr gnus-command-method)))) (defsubst gnus-agent-directory () - "Path of the Gnus agent directory." + "The name of the Gnus agent directory." (nnheader-concat gnus-agent-directory (nnheader-translate-file-chars (gnus-agent-method)) "/")) (defun gnus-agent-lib-file (file) - "The full path of the Gnus agent library FILE." + "The full name of the Gnus agent library FILE." (expand-file-name file (file-name-as-directory (expand-file-name "agent.lib" (gnus-agent-directory))))) @@ -950,7 +950,7 @@ This can be added to `gnus-select-article-hook' or (delete-char 1)))))) (defun gnus-agent-group-path (group) - "Translate GROUP into a path." + "Translate GROUP into a file name." (if nnmail-use-long-file-names (gnus-group-real-name group) (nnheader-translate-file-chars diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 3fa4f62..2c662a3 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -389,7 +389,7 @@ particular group line should be displayed, each form is evaluated. The icon from the file field after the first true form is used. You can change how those group lines are displayed by editing the file field. The File will either be found in the -`gnus-group-glyph-directory' or by designating absolute path to the +`gnus-group-glyph-directory' or by designating absolute name of the file. It is also possible to change and add form fields, but currently that diff --git a/lisp/gnus.el b/lisp/gnus.el index 0fa78be..dd665e8 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1071,7 +1071,7 @@ REST is a plist of following: (defcustom gnus-home-directory "~/" "Directory variable that specifies the \"home\" directory. -All other Gnus path variables are initialized from this variable." +All other Gnus file and directory variables are initialized from this variable." :group 'gnus-files :type 'directory) diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index 02ccc09..4f8d585 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -1046,7 +1046,7 @@ This command does not work if you use short group names." (nnheader-message 5 ""))) (defun nnfolder-group-pathname (group) - "Make pathname for GROUP." + "Make file name for GROUP." (setq group (encode-coding-string group nnmail-pathname-coding-system)) (let ((dir (file-name-as-directory (expand-file-name nnfolder-directory)))) diff --git a/lisp/nnheader.el b/lisp/nnheader.el index a4456af..0e3bb51 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -1234,7 +1234,7 @@ list of headers that match SEQUENCE (see `nntp-retrieve-headers')." "Regexp that matches numerical file names.") (defvar nnheader-numerical-full-files (concat "/" nnheader-numerical-files) - "Regexp that matches numerical full file paths.") + "Regexp that matches numerical full file names.") (defsubst nnheader-file-to-number (file) "Take a FILE name and return the article number." @@ -1412,10 +1412,10 @@ without formatting." (<= level gnus-verbose-backends))) (defvar nnheader-pathname-coding-system 'binary - "*Coding system for pathname.") + "*Coding system for file name.") (defun nnheader-group-pathname (group dir &optional file) - "Make pathname for GROUP." + "Make file name for GROUP." (concat (let ((dir (file-name-as-directory (expand-file-name dir)))) ;; If this directory exists, we use it directly. diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 72289b3..182f34f 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -566,7 +566,7 @@ If EXAMINE is non-nil the group is selected read-only." articles)))) (defun nnimap-group-overview-filename (group server) - "Make pathname for GROUP on SERVER." + "Make file name for GROUP on SERVER." (let* ((dir (file-name-as-directory (expand-file-name nnimap-directory))) (uidvalidity (gnus-group-get-parameter (gnus-group-prefixed-name diff --git a/lisp/nnmail.el b/lisp/nnmail.el index bd95e69..32d38af 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -537,7 +537,7 @@ parameter. It should return nil, `warn' or `delete'." "Coding system used in reading inbox") (defvar nnmail-pathname-coding-system nil - "*Coding system for pathname.") + "*Coding system for file name.") (defun nnmail-find-file (file) "Insert FILE in server buffer safely." @@ -555,7 +555,7 @@ parameter. It should return nil, `warn' or `delete'." (file-error nil)))) (defun nnmail-group-pathname (group dir &optional file) - "Make pathname for GROUP." + "Make file name for GROUP." (concat (let ((dir (file-name-as-directory (expand-file-name dir)))) (setq group (nnheader-replace-duplicate-chars-in-string diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index d6177cc..56fc626 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -400,7 +400,7 @@ backend for the messages.") prefix)) (defun nnsoup-file-name (dir file) - "Return the full path of FILE (in any case) in DIR." + "Return the full name of FILE (in any case) in DIR." (let* ((case-fold-search t) (files (directory-files dir t)) (regexp (concat (regexp-quote file) "$"))) diff --git a/lisp/nnspool.el b/lisp/nnspool.el index 7ca4f7a..343585e 100644 --- a/lisp/nnspool.el +++ b/lisp/nnspool.el @@ -461,7 +461,7 @@ there.") (nnheader-report 'nnspool "No such newsgroup: %s" group))))) (defun nnspool-article-pathname (group &optional article) - "Find the path for GROUP." + "Find the file name for GROUP." (nnheader-group-pathname group nnspool-spool-directory article)) (provide 'nnspool) diff --git a/texi/ChangeLog b/texi/ChangeLog index 180211c..9f914c9 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,15 @@ +2003-01-15 ShengHuo ZHU + + * gnus.texi: Don't use `path' in some cases. + From the GNU coding standards: + + Please do not use the term ``pathname'' that is used in Unix + documentation; use ``file name'' (two words) instead. We use + the term ``path'' only for search paths, which are lists of + directory names. + + * message.texi: Ditto. + 2003-01-15 Simon Josefsson * gnus.texi (X-Face): Revert substantial part of last fix. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 333dad0..045b075 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -11895,19 +11895,19 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B @item nnspool-active-file @vindex nnspool-active-file -$B%"%/%F%#%V%U%!%$%k$X$N%Q%9$G$9!#(B +$B%"%/%F%#%V%U%!%$%k$NL>A0$G$9!#(B @item nnspool-newsgroups-file @vindex nnspool-newsgroups-file -$B%0%k!<%W5-=R%U%!%$%k$X$N%Q%9$G$9!#(B +$B%0%k!<%W5-=R%U%!%$%k$NL>A0$G$9!#(B @item nnspool-history-file @vindex nnspool-history-file -$B%K%e!<%9MzNr%U%!%$%k$X$N%Q%9$G$9!#(B +$B%K%e!<%9MzNr%U%!%$%k$NL>A0$G$9!#(B @item nnspool-active-times-file @vindex nnspool-active-times-file -$B8=>uF|IU%U%!%$%k$X$N%Q%9$G$9!#(B +$B8=>uF|IU%U%!%$%k$X$NL>A0$G$9!#(B @item nnspool-nov-is-evil @vindex nnspool-nov-is-evil @@ -12200,7 +12200,7 @@ POP $B%a!<%k%5!<%P!A0$G$9!#=i4|CM$O(B @code{MAIL} $B4D6-JQ?t$NCM(B $B$+(B @code{rmail-spool-directory} $B$NCM(B ($BIaDL(B $B$O(B @file{usr-mail/spool/user-name} $B$N$h$&$J$b$N(B) $B$G$9!#(B @end table @@ -12211,7 +12211,7 @@ POP $B%a!<%k%5!<%P!$r;H$&$H(B: @lisp (file) @@ -12265,7 +12265,7 @@ rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP @table @code @item :path -$B%U%!%$%k$N$"$k%G%#%l%/%H%j!<$N%Q%9$G$9!#$3$l$K$O=i4|CM$O$"$j$^$;$s!#(B +$B%U%!%$%k$N$"$k%G%#%l%/%H%j!<$NL>A0$G$9!#$3$l$K$O=i4|CM$O$"$j$^$;$s!#(B @item :suffix $B$3$N@\Hx8l$G=*$o$k%U%!%$%k$@$1$,;HMQ$5$l$^$9!#=i4|CM$O(B @samp{.spool} $B$G(B @@ -12411,7 +12411,7 @@ Maildir $B$+$i%a!<%k$rA0$G$9!#=i4|CM$O4D6-JQ(B $B?t(B @code{MAILDIR} $B$+$iA0$rM?$($^$9(B (@pxref{Foreign Groups})$B!#(B @item -`SPACE' $B$rBG$C$F!"?7$7$/:n$i$l$?%0%k!<%W$KF~$j$^$9!#(B +@kbd{SPACE} $B$rBG$C$F!"?7$7$/:n$i$l$?%0%k!<%W$KF~$j$^$9!#(B @item -`M P b' $B$rBG$C$F!"%0%k!<%W%P%C%U%!$NA4$F$N5-;v$K$H%G%#%l%/%H%jL>$NJQ?t$O!"$3$l$K$h$C$F=i4|2=$5(B +$B$l$^$9!#%G%#%U%)%k%HCM$O(B @file{~/} $B$G$9!#(B @item gnus-directory @vindex gnus-directory -$B$?$/$5$s$N(B gnus $B3JG<%Q%9JQ?t$O$3$NJQ?t$K$h$C$F=i4|2=$5$l$^$9!#$=$N=i4|@_(B -$BDjCM$O(B @samp{SAVEDIR} $B4D6-JQ?t$NCM$+!"$=$NJQ?t$,@_Dj$5$l$F$$$J$$>l9g(B -$B$O(B @file{~/News/} $B$G$9!#(B +gnus $B$,3JG<$9$k$?$/$5$s$N%U%!%$%kL>$H%G%#%l%/%H%jL>$NJQ?t$O!"$3$l$K$h$C(B +$B$F=i4|2=$5$l$^$9!#%G%#%U%)%k%HCM$O(B @samp{SAVEDIR} $B4D6-JQ?t$NCM$+!"$=$NJQ(B +$B?t$,@_Dj$5$l$F$$$J$$>l9g$O(B @file{~/News/} $B$G$9!#(B @file{.gnus.el} $B%U%!%$%k$,FI$^$l$?$H$-$O(B gnus $B$N$[$H$s$I$O$9$G$KFI$_9~$^(B $B$l$F$$$k$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$3$l$O$D$^$j!"$3$NJQ?t(B diff --git a/texi/gnus.texi b/texi/gnus.texi index 5069f89..d2eaa17 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -12479,19 +12479,19 @@ Where the news lib dir is (@file{/usr/lib/news/} by default). @item nnspool-active-file @vindex nnspool-active-file -The path to the active file. +The name of the active file. @item nnspool-newsgroups-file @vindex nnspool-newsgroups-file -The path to the group descriptions file. +The name of the group descriptions file. @item nnspool-history-file @vindex nnspool-history-file -The path to the news history file. +The name of the news history file. @item nnspool-active-times-file @vindex nnspool-active-times-file -The path to the active date file. +The name of the active date file. @item nnspool-nov-is-evil @vindex nnspool-nov-is-evil @@ -12791,7 +12791,7 @@ Keywords: @table @code @item :path -The path of the file. Defaults to the value of the @code{MAIL} +The file name. Defaults to the value of the @code{MAIL} environment variable or the value of @code{rmail-spool-directory} (usually something like @file{/usr/mail/spool/user-name}). @end table @@ -12802,7 +12802,7 @@ An example file mail source: (file :path "/usr/spool/mail/user-name") @end lisp -Or using the default path: +Or using the default file name: @lisp (file) @@ -12856,7 +12856,7 @@ Keywords: @table @code @item :path -The path of the directory where the files are. There is no default +The name of the directory where the files are. There is no default value. @item :suffix @@ -13011,7 +13011,7 @@ Keywords: @table @code @item :path -The path of the directory where the mails are stored. The default is +The name of the directory where the mails are stored. The default is taken from the @code{MAILDIR} environment variable or @samp{~/Maildir/}. @item :subdirs @@ -13731,18 +13731,18 @@ Here's how: Go to the group buffer. @item -Type `G f' and give the path to the mbox file when prompted to create an +Type @kbd{G f} and give the file name to the mbox file when prompted to create an @code{nndoc} group from the mbox file (@pxref{Foreign Groups}). @item -Type `SPACE' to enter the newly created group. +Type @kbd{SPACE} to enter the newly created group. @item -Type `M P b' to process-mark all articles in this group's buffer +Type @kbd{M P b} to process-mark all articles in this group's buffer (@pxref{Setting Process Marks}). @item -Type `B r' to respool all the process-marked articles, and answer +Type @kbd{B r} to respool all the process-marked articles, and answer @samp{nnml} when prompted (@pxref{Mail Group Commands}). @end enumerate @@ -22227,14 +22227,14 @@ Save table: (spam-stat-save) @table @code @item gnus-home-directory -All Gnus path variables will be initialized from this variable, which -defaults to @file{~/}. +All Gnus file and directory variables will be initialized from this +variable, which defaults to @file{~/}. @item gnus-directory @vindex gnus-directory -Most Gnus storage path variables will be initialized from this variable, -which defaults to the @samp{SAVEDIR} environment variable, or -@file{~/News/} if that variable isn't set. +Most Gnus storage file and directory variables will be initialized from +this variable, which defaults to the @samp{SAVEDIR} environment +variable, or @file{~/News/} if that variable isn't set. Note that gnus is mostly loaded when the @file{.gnus.el} file is read. This means that other directory variables that are initialized from this diff --git a/texi/message-ja.texi b/texi/message-ja.texi index e3179f9..17e5a3b 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1027,7 +1027,7 @@ supported. @vindex gpg-temp-directory Note, if you are using the @code{gpg.el} you must make sure that the -path specified by @code{gpg-temp-directory} have permissions 0700. +directory specified by @code{gpg-temp-directory} have permissions 0700. Creating your own OpenPGP key is described in detail in the documentation of your OpenPGP implementation, so we refer to it. diff --git a/texi/message.texi b/texi/message.texi index 0ba64bb..8984cf6 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1013,7 +1013,7 @@ supported. @vindex gpg-temp-directory Note, if you are using the @code{gpg.el} you must make sure that the -path specified by @code{gpg-temp-directory} have permissions 0700. +directory specified by @code{gpg-temp-directory} have permissions 0700. Creating your own OpenPGP key is described in detail in the documentation of your OpenPGP implementation, so we refer to it. -- 1.7.10.4