diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 40 | ||||
| -rw-r--r-- | lisp/gnus/gnus-agent.el | 16 | ||||
| -rw-r--r-- | lisp/gnus/gnus-art.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 16 | ||||
| -rw-r--r-- | lisp/gnus/gnus-start.el | 10 | ||||
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 16 | ||||
| -rw-r--r-- | lisp/gnus/gnus.el | 16 | ||||
| -rw-r--r-- | lisp/gnus/mm-url.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 19 | ||||
| -rw-r--r-- | lisp/gnus/mml2015.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nneething.el | 2 |
11 files changed, 96 insertions, 49 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 196c0e6ff71..eb324178b7d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,43 @@ +2006-12-06 Chris Moore <dooglus@gmail.com> (tiny change) + + * gnus-sum.el (gnus-sort-threads, gnus-summary-limit-children): + Use `max' to avoid the value of `max-lisp-eval-depth' decreasing. + +2006-12-04 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> (tiny change) + + * mm-url.el (mm-url-predefined-programs): Call curl with correct + options. + +2006-11-30 Katsumi Yamaoka <yamaoka@jpl.org> + + * mml2015.el (mml2015-pgg-clear-verify): Replace encode-coding-string + with mm-encode-coding-string. + +2006-11-29 Katsumi Yamaoka <yamaoka@jpl.org> + + * nneething.el (nneething-decode-file-name): Replace + decode-coding-string with mm-decode-coding-string. + +2006-11-24 Juanma Barranquero <lekktu@gmail.com> + + * gnus-agent.el (gnus-agent-expire-unagentized-dirs) + (gnus-agent-regenerate-group): Fix space/tab mixup in messages. + + * gnus-art.el (gnus-article-x-face-command, gnus-numeric-save-name): + * gnus-group.el (gnus-group-sort-function, gnus-group-line-format) + (gnus-group-mode, gnus-group-read-group, gnus-group-delete-group) + (gnus-group-make-directory-group, gnus-group-transpose-groups): + * gnus-start.el (gnus-options-subscribe, gnus-options-not-subscribe) + (gnus-subscribe-newsgroup, gnus-1): + * gnus-sum.el (gnus-summary-make-false-root, gnus-make-threads): + * gnus.el (gnus-nntp-server, gnus-use-cross-reference) + (gnus-valid-select-methods, total-expire, gnus-summary-line-format) + (gnus-group-read-only-p): Fix space/tab mixup in docstrings. + +2006-11-21 Katsumi Yamaoka <yamaoka@jpl.org> + + * mm-util.el (mm-string-to-multibyte): Alias to identity in XEmacs. + 2006-11-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * mm-uu.el (mm-uu-pgp-signed-extract-1): Make last fix more thorough diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 733b7533cc1..64e080f5aa3 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -13,7 +13,7 @@ ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License @@ -1167,7 +1167,7 @@ downloadable." ;; For each article that I processed that is no longer ;; undownloaded, remove its processable mark. - (mapc #'gnus-summary-remove-process-mark + (mapc #'gnus-summary-remove-process-mark (gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded)) ;; The preceeding call to (gnus-agent-summary-fetch-group) @@ -1972,11 +1972,11 @@ doesn't exist, to valid the overview buffer." ;; First, we'll fix the sort. (sort-numeric-fields 1 (point-min) (point-max)) - ;; but now we have to consider that we may have duplicate rows... + ;; but now we have to consider that we may have duplicate rows... ;; so reset to beginning of file (goto-char (point-min)) (setq last -134217728) - + ;; and throw a code that restarts this scan (throw 'problems t)) nil)))))) @@ -3470,7 +3470,7 @@ articles in every agentized group? ")) (or gnus-expert-user (gnus-y-or-n-p "gnus-agent-expire has identified local directories that are\ - not currently required by any agentized group. Do you wish to consider\ + not currently required by any agentized group. Do you wish to consider\ deleting them?"))) (while to-remove (let ((dir (pop to-remove))) @@ -3756,7 +3756,7 @@ If REREAD is not nil, downloaded articles are marked as unread." (dir (file-name-directory file)) point (downloaded (if (file-exists-p dir) - (sort (delq nil (mapcar (lambda (name) + (sort (delq nil (mapcar (lambda (name) (and (not (file-directory-p (nnheader-concat dir name))) (string-to-number name))) (directory-files dir nil "^[0-9]+$" t))) @@ -3802,7 +3802,7 @@ If REREAD is not nil, downloaded articles are marked as unread." ((= l1 l2) (forward-line -1) (gnus-message 4 "gnus-agent-regenerate-group: NOV\ - entries contained duplicate of article %s. Duplicate deleted." l1) + entries contained duplicate of article %s. Duplicate deleted." l1) (gnus-delete-line) (setq nov-arts (cdr nov-arts)))))) (t @@ -3923,7 +3923,7 @@ If REREAD is not nil, downloaded articles are marked as unread." (gnus-agent-possibly-alter-active group group-active))))) (when (and reread gnus-agent-article-alist) - (gnus-agent-synchronize-group-flags + (gnus-agent-synchronize-group-flags group (list (list (if (listp reread) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index bc7f27c97c8..cdb3c8950cc 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -15,7 +15,7 @@ ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License @@ -265,7 +265,7 @@ regexp. If it matches, the text in question is not a signature." display -")) "*String or function to be executed to display an X-Face header. If it is a string, the command will be executed in a sub-shell -asynchronously. The compressed face will be piped to this command." +asynchronously. The compressed face will be piped to this command." :type `(choice string (function-item gnus-display-x-face-in-from) function) @@ -3641,7 +3641,7 @@ Otherwise, it is like ~/News/news/group/num." (defun gnus-numeric-save-name (newsgroup headers &optional last-file) "Generate file name from NEWSGROUP, HEADERS, and optional LAST-FILE. If variable `gnus-use-long-file-name' is non-nil, it is -~/News/news.group/num. Otherwise, it is like ~/News/news/group/num." +~/News/news.group/num. Otherwise, it is like ~/News/news/group/num." (let ((default (expand-file-name (concat (if (gnus-use-long-file-name 'not-save) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index c6a0d599ac4..f004a043834 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -131,7 +131,7 @@ for the groups to be sorted. Pre-made functions include `gnus-group-sort-by-score', `gnus-group-sort-by-method', `gnus-group-sort-by-server', and `gnus-group-sort-by-rank'. -This variable can also be a list of sorting functions. In that case, +This variable can also be a list of sorting functions. In that case, the most significant sort function should be the last function in the list." :group 'gnus-group-listing @@ -193,7 +193,7 @@ with some simple extensions. Note that this format specification is not always respected. For reasons of efficiency, when listing killed groups, this specification -is ignored altogether. If the spec is changed considerably, your +is ignored altogether. If the spec is changed considerably, your output may end up looking strange when listing both alive and killed groups. @@ -1115,7 +1115,7 @@ When FORCE, rebuild the tool bar." All normal editing commands are switched off. \\<gnus-group-mode-map> -The group buffer lists (some of) the groups available. For instance, +The group buffer lists (some of) the groups available. For instance, `\\[gnus-group-list-groups]' will list all subscribed groups with unread articles, while `\\[gnus-group-list-zombies]' lists all zombie groups. @@ -2006,7 +2006,7 @@ and with point over the group in question." If the prefix argument ALL is non-nil, already read articles become readable. IF ALL is a number, fetch this number of articles. If the optional argument NO-ARTICLE is non-nil, no article will be -auto-selected upon group entry. If GROUP is non-nil, fetch that +auto-selected upon group entry. If GROUP is non-nil, fetch that group." (interactive "P") (let ((no-display (eq all 0)) @@ -2446,7 +2446,7 @@ ADDRESS." "Delete the current group. Only meaningful with editable groups. If FORCE (the prefix) is non-nil, all the articles in the group will be deleted. This is \"deleted\" as in \"removed forever from the face -of the Earth\". There is no undo. The user will be prompted before +of the Earth\". There is no undo. The user will be prompted before doing the deletion. Note that you also have to specify FORCE if you want the group to be removed from the server, even when it's empty." @@ -2825,7 +2825,7 @@ Given a prefix, create a full group." (defun gnus-group-make-directory-group (dir) "Create an nndir group. The user will be prompted for a directory. The contents of this -directory will be used as a newsgroup. The directory should contain +directory will be used as a newsgroup. The directory should contain mail messages or news articles in files that have numeric names." (interactive (list (read-file-name "Create group from directory: "))) @@ -3495,7 +3495,7 @@ group line." (defun gnus-group-transpose-groups (n) "Move the current newsgroup up N places. -If given a negative prefix, move down instead. The difference between +If given a negative prefix, move down instead. The difference between N and the number of steps taken is returned." (interactive "p") (unless (gnus-group-group-name) @@ -4211,7 +4211,7 @@ and the second element is the address." (unless entry (error "Trying to change non-existent group %s" method-only-group)) ;; We have received parts of the actual group info - either the - ;; select method or the group parameters. We first check + ;; select method or the group parameters. We first check ;; whether we have to extend the info, and if so, do that. (let ((len (length info)) (total (if (eq part 'method) 5 6))) diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index b4867c18108..0486392818e 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -15,7 +15,7 @@ ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License @@ -352,7 +352,7 @@ be subscribed using `gnus-subscribe-options-newsgroup-method'." (defcustom gnus-options-subscribe nil "*All new groups matching this regexp will be subscribed unconditionally. -Note that this variable deals only with new newsgroups. This variable +Note that this variable deals only with new newsgroups. This variable does not affect old newsgroups. New groups that match this regexp will not be handled by @@ -364,7 +364,7 @@ be subscribed using `gnus-subscribe-options-newsgroup-method'." (defcustom gnus-options-not-subscribe nil "*All new groups matching this regexp will be ignored. -Note that this variable deals only with new newsgroups. This variable +Note that this variable deals only with new newsgroups. This variable does not affect old (already subscribed) newsgroups." :group 'gnus-group-new :type '(choice regexp @@ -622,7 +622,7 @@ it is killed." (defun gnus-subscribe-newsgroup (newsgroup &optional next) "Subscribe new NEWSGROUP. -If NEXT is non-nil, it is inserted before NEXT. Otherwise it is made +If NEXT is non-nil, it is inserted before NEXT. Otherwise it is made the first newsgroup." (save-excursion (goto-char (point-min)) @@ -734,7 +734,7 @@ will not connect to the local server." (defun gnus-1 (&optional arg dont-connect slave) "Read network news. If ARG is non-nil and a positive number, Gnus will use that as the -startup level. If ARG is non-nil and not a positive number, Gnus will +startup level. If ARG is non-nil and not a positive number, Gnus will prompt the user for the name of an NNTP server to use." (interactive "P") diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 6bf4142216d..05d5614756b 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -15,7 +15,7 @@ ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License @@ -110,7 +110,7 @@ have all the sub-threads as children. If this variable is `adopt', Gnus will make one of the \"children\" the parent and mark all the step-children as such. If this variable is `empty', the \"children\" are printed with empty -subject fields. (Or rather, they will be printed with a string +subject fields. (Or rather, they will be printed with a string given by the `gnus-summary-same-subject' variable.)" :group 'gnus-thread :type '(choice (const :tag "off" nil) @@ -3975,7 +3975,7 @@ If NO-DISPLAY, don't generate a summary buffer." infloop)) (defun gnus-make-threads () - "Go through the dependency hashtb and find the roots. Return all threads." + "Go through the dependency hashtb and find the roots. Return all threads." (let (threads) (while (catch 'infloop (mapatoms @@ -4481,7 +4481,7 @@ If LINE, insert the rebuilt thread starting on line LINE." ;; First go up in this thread until we find the root. (setq last-id (gnus-root-id id) headers (message-flatten-list (gnus-id-to-thread last-id))) - ;; We have now found the real root of this thread. It might have + ;; We have now found the real root of this thread. It might have ;; been gathered into some loose thread, so we have to search ;; through the threads to find the thread we wanted. (let ((threads gnus-newsgroup-threads) @@ -4561,7 +4561,7 @@ If LINE, insert the rebuilt thread starting on line LINE." (if (not gnus-thread-sort-functions) threads (gnus-message 8 "Sorting threads...") - (let ((max-lisp-eval-depth 5000)) + (let ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth))) (prog1 (gnus-sort-threads-1 threads (gnus-make-sort-function gnus-thread-sort-functions)) @@ -5927,7 +5927,7 @@ The resulting hash table is returned, or nil if no Xrefs were found." (let ((case-fold-search t) in-reply-to header p lines chars) (goto-char (point-min)) - ;; Search to the beginning of the next header. Error messages + ;; Search to the beginning of the next header. Error messages ;; do not begin with 2 or 3. (while (re-search-forward "^[23][0-9]+ " nil t) (setq id nil @@ -5935,7 +5935,7 @@ The resulting hash table is returned, or nil if no Xrefs were found." ;; This implementation of this function, with nine ;; search-forwards instead of the one re-search-forward and ;; a case (which basically was the old function) is actually - ;; about twice as fast, even though it looks messier. You + ;; about twice as fast, even though it looks messier. You ;; can't have everything, I guess. Speed and elegance ;; doesn't always go hand in hand. (setq @@ -8165,7 +8165,7 @@ fetch-old-headers verbiage, and so on." ;; will really go down to a leaf article first, before slowly ;; working its way up towards the root. (when thread - (let* ((max-lisp-eval-depth 5000) + (let* ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth)) (children (if (cdr thread) (apply '+ (mapcar 'gnus-summary-limit-children diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 41a79ccc1ca..81f62d7036a 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -16,7 +16,7 @@ ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License @@ -1335,7 +1335,7 @@ non-numeric prefix - `C-u M-x gnus', in short." (defcustom gnus-nntp-server nil "*The name of the host running the NNTP server. -This variable is semi-obsolete. Use the `gnus-select-method' +This variable is semi-obsolete. Use the `gnus-select-method' variable instead." :group 'gnus-server :type '(choice (const :tag "disable" nil) @@ -1478,7 +1478,7 @@ group." (defcustom gnus-use-cross-reference t "*Non-nil means that cross referenced articles will be marked as read. If nil, ignore cross references. If t, mark articles as read in -subscribed newsgroups. If neither t nor nil, mark as read in all +subscribed newsgroups. If neither t nor nil, mark as read in all newsgroups." :group 'gnus-server :type '(choice (const :tag "off" nil) @@ -1697,7 +1697,7 @@ of the select method. The other elements may be the category of this method (i. e., `post', `mail', `none' or whatever) or other properties that this method has (like being respoolable). If you implement a new select method, all you should have to change is -this variable. I think." +this variable. I think." :group 'gnus-server :type '(repeat (group (string :tag "Name") (radio-button-choice (const :format "%v " post) @@ -1851,7 +1851,7 @@ which to perform auto-expiry. This only makes sense for mail groups." "*Groups in which to perform expiry of all read articles. Use with extreme caution. All groups that match this regexp will be expiring - which means that all read articles will be deleted after -\(say) one week. (This only goes for mail groups and the like, of +\(say) one week. (This only goes for mail groups and the like, of course.)" :variable-group nnmail-expire :variable-type '(choice (const nil) @@ -2983,7 +2983,7 @@ with some simple extensions. The %U (status), %R (replied) and %z (zcore) specs have to be handled with care. For reasons of efficiency, Gnus will compute what column these characters will end up in, and \"hard-code\" that. This means that -it is invalid to have these specs after a variable-length spec. Well, +it is invalid to have these specs after a variable-length spec. Well, you might not be arrested, but your summary buffer will look strange, which is bad enough. @@ -3368,7 +3368,7 @@ GROUP can either be a string (a group name) or a select method." (defun gnus-group-read-only-p (&optional group) "Check whether GROUP supports editing or not. -If GROUP is nil, `gnus-newsgroup-name' will be checked instead. Note +If GROUP is nil, `gnus-newsgroup-name' will be checked instead. Note that that variable is buffer-local to the summary buffers." (let ((group (or group gnus-newsgroup-name))) (not (gnus-check-backend-function 'request-replace-article group)))) @@ -4043,7 +4043,7 @@ If NEWSGROUP is nil, return the global kill file name instead." (not method))) (defun gnus-server-extend-method (group method) - ;; This function "extends" a virtual server. If the server is + ;; This function "extends" a virtual server. If the server is ;; "hello", and the select method is ("hello" (my-var "something")) ;; in the group "alt.alt", this will result in a new virtual server ;; called "hello+alt.alt". diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index 5e228f0af72..70584bdf50d 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -64,7 +64,7 @@ '((wget "wget" "--user-agent=mm-url" "-q" "-O" "-") (w3m "w3m" "-dump_source") (lynx "lynx" "-source") - (curl "curl" "--silent" "--user-agent mm-url" "--location"))) + (curl "curl" "--silent" "--user-agent" "mm-url" "--location"))) (defcustom mm-url-program (cond diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 54f5612a72d..402e824af23 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -92,12 +92,6 @@ ;; (string-to-multibyte s) ~= (decode-coding-string s 'binary) ;; (string-make-multibyte s) ~= (decode-coding-string s locale-coding-system) (string-as-multibyte . identity) - (string-to-multibyte - . (lambda (string) - "Return a multibyte string with the same individual chars as string." - (mapconcat - (lambda (ch) (mm-string-as-multibyte (char-to-string ch))) - string ""))) (multibyte-string-p . ignore) (insert-byte . insert-char) (multibyte-char-to-unibyte . identity)))) @@ -128,6 +122,19 @@ This is a compatibility function for different Emacsen." (setq start (- (length string) tail)))) string)))) +(defalias 'mm-string-to-multibyte + (cond + ((featurep 'xemacs) + 'identity) + ((fboundp 'string-to-multibyte) + 'string-to-multibyte) + (t + (lambda (string) + "Return a multibyte string with the same individual chars as string." + (mapconcat + (lambda (ch) (mm-string-as-multibyte (char-to-string ch))) + string ""))))) + (eval-and-compile (defalias 'mm-char-or-char-int-p (cond diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 591ef647678..6c58272509e 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -785,7 +785,7 @@ (if (condition-case err (prog1 (mm-with-unibyte-buffer - (insert (encode-coding-string text coding-system)) + (insert (mm-encode-coding-string text coding-system)) (pgg-verify-region (point-min) (point-max) nil t)) (goto-char (point-min)) (while (search-forward "\r\n" nil t) diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el index 92a62d12386..4b5f1871aa3 100644 --- a/lisp/gnus/nneething.el +++ b/lisp/gnus/nneething.el @@ -303,7 +303,7 @@ included.") (setq buf (cons (string (string-to-number (match-string 1 file) 16)) (cons (substring file pos (match-beginning 0)) buf)) pos (match-end 0))) - (decode-coding-string + (mm-decode-coding-string (apply (function concat) (nreverse (cons (substring file pos) buf))) (or coding-system nnmail-pathname-coding-system)))) |