diff options
| author | Julien Danjou | 2012-07-24 22:17:17 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2012-07-24 22:17:17 +0000 |
| commit | b7af7f62e4b269d1e5ed6e85660a169b3a075232 (patch) | |
| tree | f273921b3768b045a89b53722a8e84b910bdbbc2 | |
| parent | 8a0484e105fcb4a7d6904f7a904003456e9ec913 (diff) | |
| download | emacs-b7af7f62e4b269d1e5ed6e85660a169b3a075232.tar.gz emacs-b7af7f62e4b269d1e5ed6e85660a169b3a075232.zip | |
Merge changes made in Gnus master; Remove dead code
* mail-source.el (mail-source-movemail-and-remove): Remove, unused.
* nntp.el (nntp-send-nosy-authinfo, nntp-send-authinfo-from-file)
(nntp-async-timer-handler): Remove, unused.
* nnimap.el (nnimap-get-responses): Remove, unused.
* nnheader.el (mail-header-set-extra): Remove, unused.
* netrc.el (netrc-find-service-number, netrc-store-data): Remove,
unused.
* mm-view.el (mm-view-sound-file): Remove, unused.
* mm-url.el (mm-url-fetch-simple, mm-url-fetch-form)
(mm-url-encode-multipart-form-data): Remove, unused.
* message.el (message-remove-signature, message-make-host-name)
(message-fill-address): Remove, unused.
* gnus.el (gnus-writable-groups, gnus-group-guess-prefixed-name)
(gnus-group-guess-full-name, gnus-group-guess-prefixed-name): Remove,
unused.
* gnus-uu.el (gnus-uu-find-name-in-shar): Remove, unused.
* gnus-util.el (gnus-extract-address-component-name)
(gnus-extract-address-component-email, gnus-sortable-date)
(gnus-alist-to-hashtable, gnus-hashtable-to-alist)
(gnus-process-live-p): Remove, unused.
* gnus-topic.el (gnus-group-parent-topic): Remove, unused.
* gnus-sum.el (gnus-score-set-default, gnus-article-parent-p)
(gnus-article-read-p, gnus-uncompress-marks): Remove, unused.
(gnus-summary-set-current-mark): Remove obsolete, empty and unused
function.
* gnus-start.el (gnus-kill-newsgroup): Remove unused obsolete function.
* gnus-score.el (gnus-summary-score-crossposting)
(gnus-score-regexp-bad-p): Remove, unused.
* gnus-salt.el (gnus-tree-goto-article): Remove, unused.
* gnus-range.el (gnus-sublist-p): Remove, unused.
* gnus-msg.el (gnus-mail-parse-comma-list, gnus-put-message): Remove,
unused.
* gnus-kill.el (gnus-Newsgroup-kill-file): Remove, unused.
* gnus-int.el (gnus-list-active-group, gnus-request-group-articles)
(gnus-request-associate-buffer): Remove, unused.
* gnus-group.el (gnus-group-set-method-info)
(gnus-group-set-params-info): Remove, unused.
* gnus-fun.el (gnus-shell-command-to-string)
(gnus-shell-command-on-region): Remove, unused.
* gnus-cite.el (gnus-cited-line-p): Remove, unused.
* gnus-art.el (gnus-article-text-type-exists-p)
(article-translate-characters, gnus-article-hide-text-of-type)
(gnus-kill-sticky-article-buffers, gnus-article-maybe-highlight):
Remove, unused.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 67 | ||||
| -rw-r--r-- | lisp/gnus/gnus-art.el | 46 | ||||
| -rw-r--r-- | lisp/gnus/gnus-cite.el | 12 | ||||
| -rw-r--r-- | lisp/gnus/gnus-fun.el | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus-int.el | 21 | ||||
| -rw-r--r-- | lisp/gnus/gnus-kill.el | 18 | ||||
| -rw-r--r-- | lisp/gnus/gnus-msg.el | 62 | ||||
| -rw-r--r-- | lisp/gnus/gnus-range.el | 9 | ||||
| -rw-r--r-- | lisp/gnus/gnus-salt.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus-score.el | 75 | ||||
| -rw-r--r-- | lisp/gnus/gnus-start.el | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 36 | ||||
| -rw-r--r-- | lisp/gnus/gnus-topic.el | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 43 | ||||
| -rw-r--r-- | lisp/gnus/gnus-uu.el | 10 | ||||
| -rw-r--r-- | lisp/gnus/gnus.el | 20 | ||||
| -rw-r--r-- | lisp/gnus/mail-source.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 35 | ||||
| -rw-r--r-- | lisp/gnus/mm-url.el | 63 | ||||
| -rw-r--r-- | lisp/gnus/mm-view.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 9 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 32 | ||||
| -rw-r--r-- | lisp/net/netrc.el | 20 |
25 files changed, 72 insertions, 551 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b43706a0bef..9377f334bd4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-24 Julien Danjou <julien@danjou.info> | ||
| 2 | |||
| 3 | * net/netrc.el (netrc-find-service-number, netrc-store-data): | ||
| 4 | Remove, unused. | ||
| 5 | |||
| 1 | 2012-07-23 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-07-23 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * startup.el (command-line): Don't display an empty user name in | 8 | * startup.el (command-line): Don't display an empty user name in |
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0ab56a87514..7278d427d41 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,70 @@ | |||
| 1 | 2012-07-24 Julien Danjou <julien@danjou.info> | ||
| 2 | |||
| 3 | * mail-source.el (mail-source-movemail-and-remove): Remove, unused. | ||
| 4 | |||
| 5 | * nntp.el (nntp-send-nosy-authinfo, nntp-send-authinfo-from-file) | ||
| 6 | (nntp-async-timer-handler): Remove, unused. | ||
| 7 | |||
| 8 | * nnimap.el (nnimap-get-responses): Remove, unused. | ||
| 9 | |||
| 10 | * nnheader.el (mail-header-set-extra): Remove, unused. | ||
| 11 | |||
| 12 | * mm-view.el (mm-view-sound-file): Remove, unused. | ||
| 13 | |||
| 14 | * mm-url.el (mm-url-fetch-simple, mm-url-fetch-form) | ||
| 15 | (mm-url-encode-multipart-form-data): Remove, unused. | ||
| 16 | |||
| 17 | * message.el (message-remove-signature, message-make-host-name) | ||
| 18 | (message-fill-address): Remove, unused. | ||
| 19 | |||
| 20 | * gnus.el (gnus-writable-groups, gnus-group-guess-prefixed-name) | ||
| 21 | (gnus-group-guess-full-name, gnus-group-guess-prefixed-name): Remove, | ||
| 22 | unused. | ||
| 23 | |||
| 24 | * gnus-uu.el (gnus-uu-find-name-in-shar): Remove, unused. | ||
| 25 | |||
| 26 | * gnus-util.el (gnus-extract-address-component-name) | ||
| 27 | (gnus-extract-address-component-email, gnus-sortable-date) | ||
| 28 | (gnus-alist-to-hashtable, gnus-hashtable-to-alist) | ||
| 29 | (gnus-process-live-p): Remove, unused. | ||
| 30 | |||
| 31 | * gnus-topic.el (gnus-group-parent-topic): Remove, unused. | ||
| 32 | |||
| 33 | * gnus-sum.el (gnus-score-set-default, gnus-article-parent-p) | ||
| 34 | (gnus-article-read-p, gnus-uncompress-marks): Remove, unused. | ||
| 35 | (gnus-summary-set-current-mark): Remove obsolete, empty and unused | ||
| 36 | function. | ||
| 37 | |||
| 38 | * gnus-start.el (gnus-kill-newsgroup): Remove unused obsolete function. | ||
| 39 | |||
| 40 | * gnus-score.el (gnus-summary-score-crossposting) | ||
| 41 | (gnus-score-regexp-bad-p): Remove, unused. | ||
| 42 | |||
| 43 | * gnus-salt.el (gnus-tree-goto-article): Remove, unused. | ||
| 44 | |||
| 45 | * gnus-range.el (gnus-sublist-p): Remove, unused. | ||
| 46 | |||
| 47 | * gnus-msg.el (gnus-mail-parse-comma-list, gnus-put-message): Remove, | ||
| 48 | unused. | ||
| 49 | |||
| 50 | * gnus-kill.el (gnus-Newsgroup-kill-file): Remove, unused. | ||
| 51 | |||
| 52 | * gnus-int.el (gnus-list-active-group, gnus-request-group-articles) | ||
| 53 | (gnus-request-associate-buffer): Remove, unused. | ||
| 54 | |||
| 55 | * gnus-group.el (gnus-group-set-method-info) | ||
| 56 | (gnus-group-set-params-info): Remove, unused. | ||
| 57 | |||
| 58 | * gnus-fun.el (gnus-shell-command-to-string) | ||
| 59 | (gnus-shell-command-on-region): Remove, unused. | ||
| 60 | |||
| 61 | * gnus-cite.el (gnus-cited-line-p): Remove, unused. | ||
| 62 | |||
| 63 | * gnus-art.el (gnus-article-text-type-exists-p) | ||
| 64 | (article-translate-characters, gnus-article-hide-text-of-type) | ||
| 65 | (gnus-kill-sticky-article-buffers, gnus-article-maybe-highlight): | ||
| 66 | Remove, unused. | ||
| 67 | |||
| 1 | 2012-07-23 Katsumi Yamaoka <yamaoka@jpl.org> | 68 | 2012-07-23 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 69 | ||
| 3 | * nnir.el ("nnir"): Revert last change, that's premature to merge from | 70 | * nnir.el ("nnir"): Revert last change, that's premature to merge from |
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 56c2a37c2aa..4bdf8354aae 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -1794,14 +1794,6 @@ Initialized from `text-mode-syntax-table.") | |||
| 1794 | (put-text-property (max (1- b) (point-min)) | 1794 | (put-text-property (max (1- b) (point-min)) |
| 1795 | b 'intangible nil))) | 1795 | b 'intangible nil))) |
| 1796 | 1796 | ||
| 1797 | (defun gnus-article-hide-text-of-type (type) | ||
| 1798 | "Hide text of TYPE in the current buffer." | ||
| 1799 | (save-excursion | ||
| 1800 | (let ((b (point-min)) | ||
| 1801 | (e (point-max))) | ||
| 1802 | (while (setq b (text-property-any b e 'article-type type)) | ||
| 1803 | (add-text-properties b (incf b) gnus-hidden-properties))))) | ||
| 1804 | |||
| 1805 | (defun gnus-article-delete-text-of-type (type) | 1797 | (defun gnus-article-delete-text-of-type (type) |
| 1806 | "Delete text of TYPE in the current buffer." | 1798 | "Delete text of TYPE in the current buffer." |
| 1807 | (save-excursion | 1799 | (save-excursion |
| @@ -1834,10 +1826,6 @@ Initialized from `text-mode-syntax-table.") | |||
| 1834 | b (or (text-property-not-all b (point-max) 'invisible t) | 1826 | b (or (text-property-not-all b (point-max) 'invisible t) |
| 1835 | (point-max))))))) | 1827 | (point-max))))))) |
| 1836 | 1828 | ||
| 1837 | (defun gnus-article-text-type-exists-p (type) | ||
| 1838 | "Say whether any text of type TYPE exists in the buffer." | ||
| 1839 | (text-property-any (point-min) (point-max) 'article-type type)) | ||
| 1840 | |||
| 1841 | (defsubst gnus-article-header-rank () | 1829 | (defsubst gnus-article-header-rank () |
| 1842 | "Give the rank of the string HEADER as given by `gnus-sorted-header-list'." | 1830 | "Give the rank of the string HEADER as given by `gnus-sorted-header-list'." |
| 1843 | (let ((list gnus-sorted-header-list) | 1831 | (let ((list gnus-sorted-header-list) |
| @@ -2146,23 +2134,6 @@ try this wash." | |||
| 2146 | props) | 2134 | props) |
| 2147 | (insert replace))))))))) | 2135 | (insert replace))))))))) |
| 2148 | 2136 | ||
| 2149 | (defun article-translate-characters (from to) | ||
| 2150 | "Translate all characters in the body of the article according to FROM and TO. | ||
| 2151 | FROM is a string of characters to translate from; to is a string of | ||
| 2152 | characters to translate to." | ||
| 2153 | (save-excursion | ||
| 2154 | (when (article-goto-body) | ||
| 2155 | (let ((inhibit-read-only t) | ||
| 2156 | (x (make-string 225 ?x)) | ||
| 2157 | (i -1)) | ||
| 2158 | (while (< (incf i) (length x)) | ||
| 2159 | (aset x i i)) | ||
| 2160 | (setq i 0) | ||
| 2161 | (while (< i (length from)) | ||
| 2162 | (aset x (aref from i) (aref to i)) | ||
| 2163 | (incf i)) | ||
| 2164 | (translate-region (point) (point-max) x))))) | ||
| 2165 | |||
| 2166 | (defun article-translate-strings (map) | 2137 | (defun article-translate-strings (map) |
| 2167 | "Translate all string in the body of the article according to MAP. | 2138 | "Translate all string in the body of the article according to MAP. |
| 2168 | MAP is an alist where the elements are on the form (\"from\" \"to\")." | 2139 | MAP is an alist where the elements are on the form (\"from\" \"to\")." |
| @@ -4804,18 +4775,6 @@ If none is given, assume the current buffer and kill it if it has | |||
| 4804 | (when (eq major-mode 'gnus-sticky-article-mode) | 4775 | (when (eq major-mode 'gnus-sticky-article-mode) |
| 4805 | (gnus-kill-buffer buffer)))) | 4776 | (gnus-kill-buffer buffer)))) |
| 4806 | 4777 | ||
| 4807 | (defun gnus-kill-sticky-article-buffers (arg) | ||
| 4808 | "Kill all sticky article buffers. | ||
| 4809 | If a prefix ARG is given, ask for confirmation." | ||
| 4810 | (interactive "P") | ||
| 4811 | (dolist (buf (gnus-buffers)) | ||
| 4812 | (with-current-buffer buf | ||
| 4813 | (when (eq major-mode 'gnus-sticky-article-mode) | ||
| 4814 | (if (not arg) | ||
| 4815 | (gnus-kill-buffer buf) | ||
| 4816 | (when (yes-or-no-p (concat "Kill buffer " (buffer-name buf) "? ")) | ||
| 4817 | (gnus-kill-buffer buf))))))) | ||
| 4818 | |||
| 4819 | ;;; | 4778 | ;;; |
| 4820 | ;;; Gnus MIME viewing functions | 4779 | ;;; Gnus MIME viewing functions |
| 4821 | ;;; | 4780 | ;;; |
| @@ -6770,11 +6729,6 @@ If given a prefix, show the hidden text instead." | |||
| 6770 | (gnus-article-hide-citation-maybe arg force) | 6729 | (gnus-article-hide-citation-maybe arg force) |
| 6771 | (gnus-article-hide-signature arg)) | 6730 | (gnus-article-hide-signature arg)) |
| 6772 | 6731 | ||
| 6773 | (defun gnus-article-maybe-highlight () | ||
| 6774 | "Do some article highlighting if article highlighting is requested." | ||
| 6775 | (when (gnus-visual-p 'article-highlight 'highlight) | ||
| 6776 | (gnus-article-highlight-some))) | ||
| 6777 | |||
| 6778 | (defun gnus-check-group-server () | 6732 | (defun gnus-check-group-server () |
| 6779 | ;; Make sure the connection to the server is alive. | 6733 | ;; Make sure the connection to the server is alive. |
| 6780 | (unless (gnus-server-opened | 6734 | (unless (gnus-server-opened |
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el index 6bcba714696..d107dfad32e 100644 --- a/lisp/gnus/gnus-cite.el +++ b/lisp/gnus/gnus-cite.el | |||
| @@ -1164,18 +1164,6 @@ See also the documentation for `gnus-article-highlight-citation'." | |||
| 1164 | (while vars | 1164 | (while vars |
| 1165 | (make-local-variable (pop vars))))) | 1165 | (make-local-variable (pop vars))))) |
| 1166 | 1166 | ||
| 1167 | (defun gnus-cited-line-p () | ||
| 1168 | "Say whether the current line is a cited line." | ||
| 1169 | (save-excursion | ||
| 1170 | (beginning-of-line) | ||
| 1171 | (let ((found nil)) | ||
| 1172 | (dolist (prefix (mapcar 'car gnus-cite-prefix-alist)) | ||
| 1173 | (when (string= (buffer-substring (point) (+ (length prefix) (point))) | ||
| 1174 | prefix) | ||
| 1175 | (setq found t))) | ||
| 1176 | found))) | ||
| 1177 | |||
| 1178 | |||
| 1179 | ;; Highlighting of different citation levels in message-mode. | 1167 | ;; Highlighting of different citation levels in message-mode. |
| 1180 | ;; - message-cite-prefix will be overridden if this is enabled. | 1168 | ;; - message-cite-prefix will be overridden if this is enabled. |
| 1181 | 1169 | ||
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el index 1cd5ce5bb1e..f33eb910c6a 100644 --- a/lisp/gnus/gnus-fun.el +++ b/lisp/gnus/gnus-fun.el | |||
| @@ -85,13 +85,6 @@ PNG format." | |||
| 85 | (call-process shell-file-name nil (list standard-output nil) | 85 | (call-process shell-file-name nil (list standard-output nil) |
| 86 | nil shell-command-switch command))) | 86 | nil shell-command-switch command))) |
| 87 | 87 | ||
| 88 | (defun gnus-shell-command-on-region (start end command) | ||
| 89 | "A simplified `shell-command-on-region'. | ||
| 90 | Output to the current buffer, replace text, and don't mingle error." | ||
| 91 | (call-process-region start end shell-file-name t | ||
| 92 | (list (current-buffer) nil) | ||
| 93 | nil shell-command-switch command)) | ||
| 94 | |||
| 95 | ;;;###autoload | 88 | ;;;###autoload |
| 96 | (defun gnus-random-x-face () | 89 | (defun gnus-random-x-face () |
| 97 | "Return X-Face header data chosen randomly from `gnus-x-face-directory'." | 90 | "Return X-Face header data chosen randomly from `gnus-x-face-directory'." |
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 8287a6bb86e..2f6fc0ccd19 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el | |||
| @@ -4450,12 +4450,6 @@ and the second element is the address." | |||
| 4450 | (gnus-list-of-unread-articles (car info)))))) | 4450 | (gnus-list-of-unread-articles (car info)))))) |
| 4451 | (error "No such group: %s" (gnus-info-group info)))))) | 4451 | (error "No such group: %s" (gnus-info-group info)))))) |
| 4452 | 4452 | ||
| 4453 | (defun gnus-group-set-method-info (group select-method) | ||
| 4454 | (gnus-group-set-info select-method group 'method)) | ||
| 4455 | |||
| 4456 | (defun gnus-group-set-params-info (group params) | ||
| 4457 | (gnus-group-set-info params group 'params)) | ||
| 4458 | |||
| 4459 | ;; Ad-hoc function for inserting data from a different newsrc.eld | 4453 | ;; Ad-hoc function for inserting data from a different newsrc.eld |
| 4460 | ;; file. Use with caution, if at all. | 4454 | ;; file. Use with caution, if at all. |
| 4461 | (defun gnus-import-other-newsrc-file (file) | 4455 | (defun gnus-import-other-newsrc-file (file) |
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el index 18e56ed9b3a..339e3d951c2 100644 --- a/lisp/gnus/gnus-int.el +++ b/lisp/gnus/gnus-int.el | |||
| @@ -416,14 +416,6 @@ If it is down, start it up (again)." | |||
| 416 | dont-check | 416 | dont-check |
| 417 | info))) | 417 | info))) |
| 418 | 418 | ||
| 419 | (defun gnus-list-active-group (group) | ||
| 420 | "Request active information on GROUP." | ||
| 421 | (let ((gnus-command-method (gnus-find-method-for-group group)) | ||
| 422 | (func 'list-active-group)) | ||
| 423 | (when (gnus-check-backend-function func group) | ||
| 424 | (funcall (gnus-get-function gnus-command-method func) | ||
| 425 | (gnus-group-real-name group) (nth 1 gnus-command-method))))) | ||
| 426 | |||
| 427 | (defun gnus-request-group-description (group) | 419 | (defun gnus-request-group-description (group) |
| 428 | "Request a description of GROUP." | 420 | "Request a description of GROUP." |
| 429 | (let ((gnus-command-method (gnus-find-method-for-group group)) | 421 | (let ((gnus-command-method (gnus-find-method-for-group group)) |
| @@ -432,14 +424,6 @@ If it is down, start it up (again)." | |||
| 432 | (funcall (gnus-get-function gnus-command-method func) | 424 | (funcall (gnus-get-function gnus-command-method func) |
| 433 | (gnus-group-real-name group) (nth 1 gnus-command-method))))) | 425 | (gnus-group-real-name group) (nth 1 gnus-command-method))))) |
| 434 | 426 | ||
| 435 | (defun gnus-request-group-articles (group) | ||
| 436 | "Request a list of existing articles in GROUP." | ||
| 437 | (let ((gnus-command-method (gnus-find-method-for-group group)) | ||
| 438 | (func 'request-group-articles)) | ||
| 439 | (when (gnus-check-backend-function func group) | ||
| 440 | (funcall (gnus-get-function gnus-command-method func) | ||
| 441 | (gnus-group-real-name group) (nth 1 gnus-command-method))))) | ||
| 442 | |||
| 443 | (defun gnus-close-group (group) | 427 | (defun gnus-close-group (group) |
| 444 | "Request the GROUP be closed." | 428 | "Request the GROUP be closed." |
| 445 | (let ((gnus-command-method (inline (gnus-find-method-for-group group)))) | 429 | (let ((gnus-command-method (inline (gnus-find-method-for-group group)))) |
| @@ -798,11 +782,6 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned." | |||
| 798 | (gnus-agent-regenerate-group group (list article))) | 782 | (gnus-agent-regenerate-group group (list article))) |
| 799 | result)) | 783 | result)) |
| 800 | 784 | ||
| 801 | (defun gnus-request-associate-buffer (group) | ||
| 802 | (let ((gnus-command-method (gnus-find-method-for-group group))) | ||
| 803 | (funcall (gnus-get-function gnus-command-method 'request-associate-buffer) | ||
| 804 | (gnus-group-real-name group)))) | ||
| 805 | |||
| 806 | (defun gnus-request-restore-buffer (article group) | 785 | (defun gnus-request-restore-buffer (article group) |
| 807 | "Request a new buffer restored to the state of ARTICLE." | 786 | "Request a new buffer restored to the state of ARTICLE." |
| 808 | (let ((gnus-command-method (gnus-find-method-for-group group))) | 787 | (let ((gnus-command-method (gnus-find-method-for-group group))) |
diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el index e70b9b8e73a..c1e5bcb7d01 100644 --- a/lisp/gnus/gnus-kill.el +++ b/lisp/gnus/gnus-kill.el | |||
| @@ -328,24 +328,6 @@ If NEWSGROUP is nil, the global kill file is selected." | |||
| 328 | 328 | ||
| 329 | ;; For kill files | 329 | ;; For kill files |
| 330 | 330 | ||
| 331 | (defun gnus-Newsgroup-kill-file (newsgroup) | ||
| 332 | "Return the name of a kill file for NEWSGROUP. | ||
| 333 | If NEWSGROUP is nil, return the global kill file instead." | ||
| 334 | (cond ((or (null newsgroup) | ||
| 335 | (string-equal newsgroup "")) | ||
| 336 | ;; The global kill file is placed at top of the directory. | ||
| 337 | (expand-file-name gnus-kill-file-name gnus-kill-files-directory)) | ||
| 338 | (gnus-use-long-file-name | ||
| 339 | ;; Append ".KILL" to capitalized newsgroup name. | ||
| 340 | (expand-file-name (concat (gnus-capitalize-newsgroup newsgroup) | ||
| 341 | "." gnus-kill-file-name) | ||
| 342 | gnus-kill-files-directory)) | ||
| 343 | (t | ||
| 344 | ;; Place "KILL" under the hierarchical directory. | ||
| 345 | (expand-file-name (concat (gnus-newsgroup-directory-form newsgroup) | ||
| 346 | "/" gnus-kill-file-name) | ||
| 347 | gnus-kill-files-directory)))) | ||
| 348 | |||
| 349 | (defun gnus-expunge (marks) | 331 | (defun gnus-expunge (marks) |
| 350 | "Remove lines marked with MARKS." | 332 | "Remove lines marked with MARKS." |
| 351 | (with-current-buffer gnus-summary-buffer | 333 | (with-current-buffer gnus-summary-buffer |
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index d38f36a0c77..bcd2cd438e9 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el | |||
| @@ -1457,33 +1457,6 @@ See `gnus-summary-mail-forward' for ARG." | |||
| 1457 | (when (gnus-y-or-n-p "Send this complaint? ") | 1457 | (when (gnus-y-or-n-p "Send this complaint? ") |
| 1458 | (message-send-and-exit)))))) | 1458 | (message-send-and-exit)))))) |
| 1459 | 1459 | ||
| 1460 | (defun gnus-mail-parse-comma-list () | ||
| 1461 | (let (accumulated | ||
| 1462 | beg) | ||
| 1463 | (skip-chars-forward " ") | ||
| 1464 | (while (not (eobp)) | ||
| 1465 | (setq beg (point)) | ||
| 1466 | (skip-chars-forward "^,") | ||
| 1467 | (while (zerop | ||
| 1468 | (save-excursion | ||
| 1469 | (save-restriction | ||
| 1470 | (let ((i 0)) | ||
| 1471 | (narrow-to-region beg (point)) | ||
| 1472 | (goto-char beg) | ||
| 1473 | (logand (progn | ||
| 1474 | (while (search-forward "\"" nil t) | ||
| 1475 | (incf i)) | ||
| 1476 | (if (zerop i) 2 i)) | ||
| 1477 | 2))))) | ||
| 1478 | (skip-chars-forward ",") | ||
| 1479 | (skip-chars-forward "^,")) | ||
| 1480 | (skip-chars-backward " ") | ||
| 1481 | (push (buffer-substring beg (point)) | ||
| 1482 | accumulated) | ||
| 1483 | (skip-chars-forward "^,") | ||
| 1484 | (skip-chars-forward ", ")) | ||
| 1485 | accumulated)) | ||
| 1486 | |||
| 1487 | (defun gnus-inews-add-to-address (group) | 1460 | (defun gnus-inews-add-to-address (group) |
| 1488 | (let ((to-address (mail-fetch-field "to"))) | 1461 | (let ((to-address (mail-fetch-field "to"))) |
| 1489 | (when (and to-address | 1462 | (when (and to-address |
| @@ -1494,41 +1467,6 @@ See `gnus-summary-mail-forward' for ARG." | |||
| 1494 | (format "Do you want to add this as `to-list': %s? " to-address)) | 1467 | (format "Do you want to add this as `to-list': %s? " to-address)) |
| 1495 | (gnus-group-add-parameter group (cons 'to-list to-address)))))) | 1468 | (gnus-group-add-parameter group (cons 'to-list to-address)))))) |
| 1496 | 1469 | ||
| 1497 | (defun gnus-put-message () | ||
| 1498 | "Put the current message in some group and return to Gnus." | ||
| 1499 | (interactive) | ||
| 1500 | (let ((reply gnus-article-reply) | ||
| 1501 | (winconf gnus-prev-winconf) | ||
| 1502 | (group gnus-newsgroup-name)) | ||
| 1503 | (unless (and group | ||
| 1504 | (not (gnus-group-read-only-p group))) | ||
| 1505 | (setq group (read-string "Put in group: " nil (gnus-writable-groups)))) | ||
| 1506 | |||
| 1507 | (when (gnus-group-entry group) | ||
| 1508 | (error "No such group: %s" group)) | ||
| 1509 | (save-excursion | ||
| 1510 | (save-restriction | ||
| 1511 | (widen) | ||
| 1512 | (message-narrow-to-headers) | ||
| 1513 | (let ((gnus-deletable-headers nil)) | ||
| 1514 | (message-generate-headers | ||
| 1515 | (if (message-news-p) | ||
| 1516 | message-required-news-headers | ||
| 1517 | message-required-mail-headers))) | ||
| 1518 | (goto-char (point-max)) | ||
| 1519 | (if (string-match " " group) | ||
| 1520 | (insert "Gcc: \"" group "\"\n") | ||
| 1521 | (insert "Gcc: " group "\n")) | ||
| 1522 | (widen))) | ||
| 1523 | (gnus-inews-do-gcc) | ||
| 1524 | (when (and (get-buffer gnus-group-buffer) | ||
| 1525 | (gnus-buffer-exists-p (car-safe reply)) | ||
| 1526 | (cdr reply)) | ||
| 1527 | (set-buffer (car reply)) | ||
| 1528 | (gnus-summary-mark-article-as-replied (cdr reply))) | ||
| 1529 | (when winconf | ||
| 1530 | (set-window-configuration winconf)))) | ||
| 1531 | |||
| 1532 | (defun gnus-article-mail (yank) | 1470 | (defun gnus-article-mail (yank) |
| 1533 | "Send a reply to the address near point. | 1471 | "Send a reply to the address near point. |
| 1534 | If YANK is non-nil, include the original article." | 1472 | If YANK is non-nil, include the original article." |
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el index b80f177fb61..68729da0910 100644 --- a/lisp/gnus/gnus-range.el +++ b/lisp/gnus/gnus-range.el | |||
| @@ -592,15 +592,6 @@ LIST is a sorted list." | |||
| 592 | (setq sum | 592 | (setq sum |
| 593 | (+ sum (if (consp x) (- (cdr x) (car x) -1) 1)))))))) | 593 | (+ sum (if (consp x) (- (cdr x) (car x) -1) 1)))))))) |
| 594 | 594 | ||
| 595 | (defun gnus-sublist-p (list sublist) | ||
| 596 | "Test whether all elements in SUBLIST are members of LIST." | ||
| 597 | (let ((sublistp t)) | ||
| 598 | (while sublist | ||
| 599 | (unless (memq (pop sublist) list) | ||
| 600 | (setq sublistp nil | ||
| 601 | sublist nil))) | ||
| 602 | sublistp)) | ||
| 603 | |||
| 604 | (defun gnus-range-add (range1 range2) | 595 | (defun gnus-range-add (range1 range2) |
| 605 | "Add RANGE2 to RANGE1 (nondestructively)." | 596 | "Add RANGE2 to RANGE1 (nondestructively)." |
| 606 | (unless (listp (cdr range1)) | 597 | (unless (listp (cdr range1)) |
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el index 6d165fb72dd..760a7a0942e 100644 --- a/lisp/gnus/gnus-salt.el +++ b/lisp/gnus/gnus-salt.el | |||
| @@ -536,12 +536,6 @@ Two predefined functions are available: | |||
| 536 | (when pos | 536 | (when pos |
| 537 | (cons pos (next-single-property-change pos 'gnus-number))))) | 537 | (cons pos (next-single-property-change pos 'gnus-number))))) |
| 538 | 538 | ||
| 539 | (defun gnus-tree-goto-article (article) | ||
| 540 | (let ((pos (text-property-any | ||
| 541 | (point-min) (point-max) 'gnus-number article))) | ||
| 542 | (when pos | ||
| 543 | (goto-char pos)))) | ||
| 544 | |||
| 545 | (defun gnus-tree-recenter () | 539 | (defun gnus-tree-recenter () |
| 546 | "Center point in the tree window." | 540 | "Center point in the tree window." |
| 547 | (let ((selected (selected-window)) | 541 | (let ((selected (selected-window)) |
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index f86b6f837a7..f24d889216e 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el | |||
| @@ -947,25 +947,6 @@ EXTRA is the possible non-standard header." | |||
| 947 | (gnus-summary-raise-score score)))) | 947 | (gnus-summary-raise-score score)))) |
| 948 | (beginning-of-line 2)))) | 948 | (beginning-of-line 2)))) |
| 949 | (gnus-set-mode-line 'summary)) | 949 | (gnus-set-mode-line 'summary)) |
| 950 | |||
| 951 | (defun gnus-summary-score-crossposting (score date) | ||
| 952 | ;; Enter score file entry for current crossposting. | ||
| 953 | ;; SCORE is the score to add. | ||
| 954 | ;; DATE is the expire date. | ||
| 955 | (let ((xref (gnus-summary-header "xref")) | ||
| 956 | (start 0) | ||
| 957 | group) | ||
| 958 | (unless xref | ||
| 959 | (error "This article is not crossposted")) | ||
| 960 | (while (string-match " \\([^ \t]+\\):" xref start) | ||
| 961 | (setq start (match-end 0)) | ||
| 962 | (when (not (string= | ||
| 963 | (setq group | ||
| 964 | (substring xref (match-beginning 1) (match-end 1))) | ||
| 965 | gnus-newsgroup-name)) | ||
| 966 | (gnus-summary-score-entry | ||
| 967 | "xref" (concat " " group ":") nil score date t))))) | ||
| 968 | |||
| 969 | 950 | ||
| 970 | ;;; | 951 | ;;; |
| 971 | ;;; Gnus Score Files | 952 | ;;; Gnus Score Files |
| @@ -3056,62 +3037,6 @@ If ADAPT, return the home adaptive file instead." | |||
| 3056 | ;; Return whether this score file needs to be saved. By Je-haysuss! | 3037 | ;; Return whether this score file needs to be saved. By Je-haysuss! |
| 3057 | updated)) | 3038 | updated)) |
| 3058 | 3039 | ||
| 3059 | (defun gnus-score-regexp-bad-p (regexp) | ||
| 3060 | "Test whether REGEXP is safe for Gnus scoring. | ||
| 3061 | A regexp is unsafe if it matches newline or a buffer boundary. | ||
| 3062 | |||
| 3063 | If the regexp is good, return nil. If the regexp is bad, return a | ||
| 3064 | cons cell (SYM . STRING), where the symbol SYM is `new' or `bad'. | ||
| 3065 | In the `new' case, the string is a safe replacement for REGEXP. | ||
| 3066 | In the `bad' case, the string is a unsafe subexpression of REGEXP, | ||
| 3067 | and we do not have a simple replacement to suggest. | ||
| 3068 | |||
| 3069 | See Info node `(gnus)Scoring Tips' for examples of good regular expressions." | ||
| 3070 | (let (case-fold-search) | ||
| 3071 | (and | ||
| 3072 | ;; First, try a relatively fast necessary condition. | ||
| 3073 | ;; Notice ranges (like [^:] or [\t-\r]), \s>, \Sw, \W, \', \`: | ||
| 3074 | (string-match "\n\\|\\\\[SsW`']\\|\\[\\^\\|[\0-\n]-" regexp) | ||
| 3075 | ;; Now break the regexp into tokens, and check each: | ||
| 3076 | (let ((tail regexp) ; remaining regexp to check | ||
| 3077 | tok ; current token | ||
| 3078 | bad ; nil, or bad subexpression | ||
| 3079 | new ; nil, or replacement regexp so far | ||
| 3080 | end) ; length of current token | ||
| 3081 | (while (and (not bad) | ||
| 3082 | (string-match | ||
| 3083 | "\\`\\(\\\\[sS]?.\\|\\[\\^?]?[^]]*]\\|[^\\]\\)" | ||
| 3084 | tail)) | ||
| 3085 | (setq end (match-end 0) | ||
| 3086 | tok (substring tail 0 end) | ||
| 3087 | tail (substring tail end)) | ||
| 3088 | (if;; Is token `bad' (matching newline or buffer ends)? | ||
| 3089 | (or (member tok '("\n" "\\W" "\\`" "\\'")) | ||
| 3090 | ;; This next handles "[...]", "\\s.", and "\\S.": | ||
| 3091 | (and (> end 2) (string-match tok "\n"))) | ||
| 3092 | (let ((newtok | ||
| 3093 | ;; Try to suggest a replacement for tok ... | ||
| 3094 | (cond ((string-equal tok "\\`") "^") ; or "\\(^\\)" | ||
| 3095 | ((string-equal tok "\\'") "$") ; or "\\($\\)" | ||
| 3096 | ((string-match "\\[\\^" tok) ; very common | ||
| 3097 | (concat (substring tok 0 -1) "\n]"))))) | ||
| 3098 | (if newtok | ||
| 3099 | (setq new | ||
| 3100 | (concat | ||
| 3101 | (or new | ||
| 3102 | ;; good prefix so far: | ||
| 3103 | (substring regexp 0 (- (+ (length tail) end)))) | ||
| 3104 | newtok)) | ||
| 3105 | ;; No replacement idea, so give up: | ||
| 3106 | (setq bad tok))) | ||
| 3107 | ;; tok is good, may need to extend new | ||
| 3108 | (and new (setq new (concat new tok))))) | ||
| 3109 | ;; Now return a value: | ||
| 3110 | (cond | ||
| 3111 | (bad (cons 'bad bad)) | ||
| 3112 | (new (cons 'new new)) | ||
| 3113 | (t nil)))))) | ||
| 3114 | |||
| 3115 | (provide 'gnus-score) | 3040 | (provide 'gnus-score) |
| 3116 | 3041 | ||
| 3117 | ;;; gnus-score.el ends here | 3042 | ;;; gnus-score.el ends here |
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 15bbf01c469..40ee78bb695 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el | |||
| @@ -1369,11 +1369,6 @@ for new groups, and subscribe the new groups as zombies." | |||
| 1369 | (funcall gnus-group-change-level-function | 1369 | (funcall gnus-group-change-level-function |
| 1370 | group level oldlevel previous))))) | 1370 | group level oldlevel previous))))) |
| 1371 | 1371 | ||
| 1372 | (defun gnus-kill-newsgroup (newsgroup) | ||
| 1373 | "Obsolete function. Kills a newsgroup." | ||
| 1374 | (gnus-group-change-level | ||
| 1375 | (gnus-group-entry newsgroup) gnus-level-killed)) | ||
| 1376 | |||
| 1377 | (defun gnus-check-bogus-newsgroups (&optional confirm) | 1372 | (defun gnus-check-bogus-newsgroups (&optional confirm) |
| 1378 | "Remove bogus newsgroups. | 1373 | "Remove bogus newsgroups. |
| 1379 | If CONFIRM is non-nil, the user has to confirm the deletion of every | 1374 | If CONFIRM is non-nil, the user has to confirm the deletion of every |
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 8c4f67504e4..06f17bcf646 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el | |||
| @@ -2967,12 +2967,6 @@ When FORCE, rebuild the tool bar." | |||
| 2967 | (setq gnus-summary-tool-bar-map map)))) | 2967 | (setq gnus-summary-tool-bar-map map)))) |
| 2968 | (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map)) | 2968 | (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map)) |
| 2969 | 2969 | ||
| 2970 | (defun gnus-score-set-default (var value) | ||
| 2971 | "A version of set that updates the GNU Emacs menu-bar." | ||
| 2972 | (set var value) | ||
| 2973 | ;; It is the message that forces the active status to be updated. | ||
| 2974 | (message "")) | ||
| 2975 | |||
| 2976 | (defun gnus-make-score-map (type) | 2970 | (defun gnus-make-score-map (type) |
| 2977 | "Make a summary score map of type TYPE." | 2971 | "Make a summary score map of type TYPE." |
| 2978 | (if t | 2972 | (if t |
| @@ -3258,13 +3252,6 @@ The following commands are available: | |||
| 3258 | "Say whether this article is a sparse article or not." | 3252 | "Say whether this article is a sparse article or not." |
| 3259 | `(memq ,article gnus-newsgroup-ancient)) | 3253 | `(memq ,article gnus-newsgroup-ancient)) |
| 3260 | 3254 | ||
| 3261 | (defun gnus-article-parent-p (number) | ||
| 3262 | "Say whether this article is a parent or not." | ||
| 3263 | (let ((data (gnus-data-find-list number))) | ||
| 3264 | (and (cdr data) ; There has to be an article after... | ||
| 3265 | (< (gnus-data-level (car data)) ; And it has to have a higher level. | ||
| 3266 | (gnus-data-level (nth 1 data)))))) | ||
| 3267 | |||
| 3268 | (defun gnus-article-children (number) | 3255 | (defun gnus-article-children (number) |
| 3269 | "Return a list of all children to NUMBER." | 3256 | "Return a list of all children to NUMBER." |
| 3270 | (let* ((data (gnus-data-find-list number)) | 3257 | (let* ((data (gnus-data-find-list number)) |
| @@ -3286,14 +3273,6 @@ The following commands are available: | |||
| 3286 | "Say whether this article is intangible or not." | 3273 | "Say whether this article is intangible or not." |
| 3287 | '(get-text-property (point) 'gnus-intangible)) | 3274 | '(get-text-property (point) 'gnus-intangible)) |
| 3288 | 3275 | ||
| 3289 | (defun gnus-article-read-p (article) | ||
| 3290 | "Say whether ARTICLE is read or not." | ||
| 3291 | (not (or (memq article gnus-newsgroup-marked) | ||
| 3292 | (memq article gnus-newsgroup-spam-marked) | ||
| 3293 | (memq article gnus-newsgroup-unreads) | ||
| 3294 | (memq article gnus-newsgroup-unselected) | ||
| 3295 | (memq article gnus-newsgroup-dormant)))) | ||
| 3296 | |||
| 3297 | ;; Some summary mode macros. | 3276 | ;; Some summary mode macros. |
| 3298 | 3277 | ||
| 3299 | (defmacro gnus-summary-article-number () | 3278 | (defmacro gnus-summary-article-number () |
| @@ -5925,17 +5904,6 @@ If SELECT-ARTICLES, only select those articles from GROUP." | |||
| 5925 | (setq articles (cdr articles))) | 5904 | (setq articles (cdr articles))) |
| 5926 | out)) | 5905 | out)) |
| 5927 | 5906 | ||
| 5928 | (defun gnus-uncompress-marks (marks) | ||
| 5929 | "Uncompress the mark ranges in MARKS." | ||
| 5930 | (let ((uncompressed '(score bookmark)) | ||
| 5931 | out) | ||
| 5932 | (while marks | ||
| 5933 | (if (memq (caar marks) uncompressed) | ||
| 5934 | (push (car marks) out) | ||
| 5935 | (push (cons (caar marks) (gnus-uncompress-range (cdar marks))) out)) | ||
| 5936 | (setq marks (cdr marks))) | ||
| 5937 | out)) | ||
| 5938 | |||
| 5939 | (defun gnus-article-mark-to-type (mark) | 5907 | (defun gnus-article-mark-to-type (mark) |
| 5940 | "Return the type of MARK." | 5908 | "Return the type of MARK." |
| 5941 | (or (cadr (assq mark gnus-article-special-mark-lists)) | 5909 | (or (cadr (assq mark gnus-article-special-mark-lists)) |
| @@ -7754,10 +7722,6 @@ be displayed." | |||
| 7754 | gnus-buttonized-mime-types))) | 7722 | gnus-buttonized-mime-types))) |
| 7755 | (gnus-summary-select-article nil 'force))) | 7723 | (gnus-summary-select-article nil 'force))) |
| 7756 | 7724 | ||
| 7757 | (defun gnus-summary-set-current-mark (&optional current-mark) | ||
| 7758 | "Obsolete function." | ||
| 7759 | nil) | ||
| 7760 | |||
| 7761 | (defun gnus-summary-next-article (&optional unread subject backward push) | 7725 | (defun gnus-summary-next-article (&optional unread subject backward push) |
| 7762 | "Select the next article. | 7726 | "Select the next article. |
| 7763 | If UNREAD, only unread articles are selected. | 7727 | If UNREAD, only unread articles are selected. |
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index 0c6c2d36f83..3567f37aeb3 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el | |||
| @@ -145,13 +145,6 @@ See Info node `(gnus)Formatting Variables'." | |||
| 145 | (setq alist (cdr alist))) | 145 | (setq alist (cdr alist))) |
| 146 | out)) | 146 | out)) |
| 147 | 147 | ||
| 148 | (defun gnus-group-parent-topic (group) | ||
| 149 | "Return the topic GROUP is member of by looking at the group buffer." | ||
| 150 | (with-current-buffer gnus-group-buffer | ||
| 151 | (if (gnus-group-goto-group group) | ||
| 152 | (gnus-current-topic) | ||
| 153 | (gnus-group-topic group)))) | ||
| 154 | |||
| 155 | (defun gnus-topic-goto-topic (topic) | 148 | (defun gnus-topic-goto-topic (topic) |
| 156 | (when topic | 149 | (when topic |
| 157 | (gnus-goto-char (text-property-any (point-min) (point-max) | 150 | (gnus-goto-char (text-property-any (point-min) (point-max) |
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 072e7b5822a..26178afa864 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el | |||
| @@ -207,16 +207,6 @@ is slower." | |||
| 207 | (match-end 0))))) | 207 | (match-end 0))))) |
| 208 | (list (if (string= name "") nil name) (or address from)))) | 208 | (list (if (string= name "") nil name) (or address from)))) |
| 209 | 209 | ||
| 210 | (defun gnus-extract-address-component-name (from) | ||
| 211 | "Extract name from a From header. | ||
| 212 | Uses `gnus-extract-address-components'." | ||
| 213 | (nth 0 (gnus-extract-address-components from))) | ||
| 214 | |||
| 215 | (defun gnus-extract-address-component-email (from) | ||
| 216 | "Extract e-mail address from a From header. | ||
| 217 | Uses `gnus-extract-address-components'." | ||
| 218 | (nth 1 (gnus-extract-address-components from))) | ||
| 219 | |||
| 220 | (declare-function message-fetch-field "message" (header &optional not-all)) | 210 | (declare-function message-fetch-field "message" (header &optional not-all)) |
| 221 | 211 | ||
| 222 | (defun gnus-fetch-field (field) | 212 | (defun gnus-fetch-field (field) |
| @@ -655,10 +645,6 @@ If N, return the Nth ancestor instead." | |||
| 655 | ;; should be gnus-characterp, but this can't be called in XEmacs anyway | 645 | ;; should be gnus-characterp, but this can't be called in XEmacs anyway |
| 656 | (cons (and (numberp event) event) event))) | 646 | (cons (and (numberp event) event) event))) |
| 657 | 647 | ||
| 658 | (defun gnus-sortable-date (date) | ||
| 659 | "Make string suitable for sorting from DATE." | ||
| 660 | (gnus-time-iso8601 (date-to-time date))) | ||
| 661 | |||
| 662 | (defun gnus-copy-file (file &optional to) | 648 | (defun gnus-copy-file (file &optional to) |
| 663 | "Copy FILE to TO." | 649 | "Copy FILE to TO." |
| 664 | (interactive | 650 | (interactive |
| @@ -843,28 +829,6 @@ If there's no subdirectory, delete DIRECTORY as well." | |||
| 843 | (unless dir | 829 | (unless dir |
| 844 | (delete-directory directory))))) | 830 | (delete-directory directory))))) |
| 845 | 831 | ||
| 846 | ;; The following two functions are used in gnus-registry. | ||
| 847 | ;; They were contributed by Andreas Fuchs <asf@void.at>. | ||
| 848 | (defun gnus-alist-to-hashtable (alist) | ||
| 849 | "Build a hashtable from the values in ALIST." | ||
| 850 | (let ((ht (make-hash-table | ||
| 851 | :size 4096 | ||
| 852 | :test 'equal))) | ||
| 853 | (mapc | ||
| 854 | (lambda (kv-pair) | ||
| 855 | (puthash (car kv-pair) (cdr kv-pair) ht)) | ||
| 856 | alist) | ||
| 857 | ht)) | ||
| 858 | |||
| 859 | (defun gnus-hashtable-to-alist (hash) | ||
| 860 | "Build an alist from the values in HASH." | ||
| 861 | (let ((list nil)) | ||
| 862 | (maphash | ||
| 863 | (lambda (key value) | ||
| 864 | (setq list (cons (cons key value) list))) | ||
| 865 | hash) | ||
| 866 | list)) | ||
| 867 | |||
| 868 | (defun gnus-strip-whitespace (string) | 832 | (defun gnus-strip-whitespace (string) |
| 869 | "Return STRING stripped of all whitespace." | 833 | "Return STRING stripped of all whitespace." |
| 870 | (while (string-match "[\r\n\t ]+" string) | 834 | (while (string-match "[\r\n\t ]+" string) |
| @@ -1241,13 +1205,6 @@ This function saves the current buffer." | |||
| 1241 | (with-current-buffer gnus-group-buffer | 1205 | (with-current-buffer gnus-group-buffer |
| 1242 | (eq major-mode 'gnus-group-mode)))) | 1206 | (eq major-mode 'gnus-group-mode)))) |
| 1243 | 1207 | ||
| 1244 | (defun gnus-process-live-p (process) | ||
| 1245 | "Returns non-nil if PROCESS is alive. | ||
| 1246 | A process is considered alive if its status is `run', `open', | ||
| 1247 | `listen', `connect' or `stop'." | ||
| 1248 | (memq (process-status process) | ||
| 1249 | '(run open listen connect stop))) | ||
| 1250 | |||
| 1251 | (defun gnus-remove-if (predicate sequence &optional hash-table-p) | 1208 | (defun gnus-remove-if (predicate sequence &optional hash-table-p) |
| 1252 | "Return a copy of SEQUENCE with all items satisfying PREDICATE removed. | 1209 | "Return a copy of SEQUENCE with all items satisfying PREDICATE removed. |
| 1253 | SEQUENCE should be a list, a vector, or a string. Returns always a list. | 1210 | SEQUENCE should be a list, a vector, or a string. Returns always a list. |
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 717b6162a1b..1ca6d0e10ed 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el | |||
| @@ -1615,16 +1615,6 @@ Gnus might fail to display all of it.") | |||
| 1615 | gnus-shell-command-separator " sh"))))) | 1615 | gnus-shell-command-separator " sh"))))) |
| 1616 | state)) | 1616 | state)) |
| 1617 | 1617 | ||
| 1618 | ;; Returns the name of what the shar file is going to unpack. | ||
| 1619 | (defun gnus-uu-find-name-in-shar () | ||
| 1620 | (let ((oldpoint (point)) | ||
| 1621 | res) | ||
| 1622 | (goto-char (point-min)) | ||
| 1623 | (when (re-search-forward gnus-uu-shar-name-marker nil t) | ||
| 1624 | (setq res (buffer-substring (match-beginning 1) (match-end 1)))) | ||
| 1625 | (goto-char oldpoint) | ||
| 1626 | res)) | ||
| 1627 | |||
| 1628 | ;; `gnus-uu-choose-action' chooses what action to perform given the name | 1618 | ;; `gnus-uu-choose-action' chooses what action to perform given the name |
| 1629 | ;; and `gnus-uu-file-action-list'. Returns either nil if no action is | 1619 | ;; and `gnus-uu-file-action-list'. Returns either nil if no action is |
| 1630 | ;; found, or the name of the command to run if such a rule is found. | 1620 | ;; found, or the name of the command to run if such a rule is found. |
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index a605f483ea4..e48fa385284 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el | |||
| @@ -3412,15 +3412,6 @@ that that variable is buffer-local to the summary buffers." | |||
| 3412 | (t ;Has positive number | 3412 | (t ;Has positive number |
| 3413 | (eq (gnus-request-type group article) 'news)))) ;use it. | 3413 | (eq (gnus-request-type group article) 'news)))) ;use it. |
| 3414 | 3414 | ||
| 3415 | ;; Returns a list of writable groups. | ||
| 3416 | (defun gnus-writable-groups () | ||
| 3417 | (let ((alist gnus-newsrc-alist) | ||
| 3418 | groups group) | ||
| 3419 | (while (setq group (car (pop alist))) | ||
| 3420 | (unless (gnus-group-read-only-p group) | ||
| 3421 | (push group groups))) | ||
| 3422 | (nreverse groups))) | ||
| 3423 | |||
| 3424 | ;; Check whether to use long file names. | 3415 | ;; Check whether to use long file names. |
| 3425 | (defun gnus-use-long-file-name (symbol) | 3416 | (defun gnus-use-long-file-name (symbol) |
| 3426 | ;; The variable has to be set... | 3417 | ;; The variable has to be set... |
| @@ -3696,21 +3687,10 @@ server is native)." | |||
| 3696 | group | 3687 | group |
| 3697 | (concat (gnus-method-to-server-name method) ":" group))) | 3688 | (concat (gnus-method-to-server-name method) ":" group))) |
| 3698 | 3689 | ||
| 3699 | (defun gnus-group-guess-prefixed-name (group) | ||
| 3700 | "Guess the whole name from GROUP and METHOD." | ||
| 3701 | (gnus-group-prefixed-name group (gnus-find-method-for-group | ||
| 3702 | group))) | ||
| 3703 | |||
| 3704 | (defun gnus-group-full-name (group method) | 3690 | (defun gnus-group-full-name (group method) |
| 3705 | "Return the full name from GROUP and METHOD, even if the method is native." | 3691 | "Return the full name from GROUP and METHOD, even if the method is native." |
| 3706 | (gnus-group-prefixed-name group method t)) | 3692 | (gnus-group-prefixed-name group method t)) |
| 3707 | 3693 | ||
| 3708 | (defun gnus-group-guess-full-name (group) | ||
| 3709 | "Guess the full name from GROUP, even if the method is native." | ||
| 3710 | (if (gnus-group-prefixed-p group) | ||
| 3711 | group | ||
| 3712 | (gnus-group-full-name group (gnus-find-method-for-group group)))) | ||
| 3713 | |||
| 3714 | (defun gnus-group-guess-full-name-from-command-method (group) | 3694 | (defun gnus-group-guess-full-name-from-command-method (group) |
| 3715 | "Guess the full name from GROUP, even if the method is native." | 3695 | "Guess the full name from GROUP, even if the method is native." |
| 3716 | (if (gnus-group-prefixed-p group) | 3696 | (if (gnus-group-prefixed-p group) |
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 2cd9233db61..ad66fecc427 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el | |||
| @@ -721,12 +721,6 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile) | |||
| 721 | ;; Return whether we moved successfully or not. | 721 | ;; Return whether we moved successfully or not. |
| 722 | to))) | 722 | to))) |
| 723 | 723 | ||
| 724 | (defun mail-source-movemail-and-remove (from to) | ||
| 725 | "Move FROM to TO using movemail, then remove FROM if empty." | ||
| 726 | (or (not (mail-source-movemail from to)) | ||
| 727 | (not (zerop (nth 7 (file-attributes from)))) | ||
| 728 | (delete-file from))) | ||
| 729 | |||
| 730 | (defun mail-source-fetch-with-program (program) | 724 | (defun mail-source-fetch-with-program (program) |
| 731 | (eq 0 (call-process shell-file-name nil nil nil | 725 | (eq 0 (call-process shell-file-name nil nil nil |
| 732 | shell-command-switch program))) | 726 | shell-command-switch program))) |
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index b4bad214043..ecc797314c4 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el | |||
| @@ -4011,28 +4011,6 @@ This function strips off the signature from the original message." | |||
| 4011 | (forward-char -1) | 4011 | (forward-char -1) |
| 4012 | nil)))) | 4012 | nil)))) |
| 4013 | 4013 | ||
| 4014 | (defun message-remove-signature () | ||
| 4015 | "Remove the signature from the text between point and mark. | ||
| 4016 | The text will also be indented the normal way." | ||
| 4017 | (save-excursion | ||
| 4018 | (let ((start (point)) | ||
| 4019 | mark) | ||
| 4020 | (if (not (re-search-forward message-signature-separator (mark t) t)) | ||
| 4021 | ;; No signature here, so we just indent the cited text. | ||
| 4022 | (message-indent-citation) | ||
| 4023 | ;; Find the last non-empty line. | ||
| 4024 | (forward-line -1) | ||
| 4025 | (while (looking-at "[ \t]*$") | ||
| 4026 | (forward-line -1)) | ||
| 4027 | (forward-line 1) | ||
| 4028 | (setq mark (set-marker (make-marker) (point))) | ||
| 4029 | (goto-char start) | ||
| 4030 | (message-indent-citation) | ||
| 4031 | ;; Enable undoing the deletion. | ||
| 4032 | (undo-boundary) | ||
| 4033 | (delete-region mark (mark t)) | ||
| 4034 | (set-marker mark nil))))) | ||
| 4035 | |||
| 4036 | 4014 | ||
| 4037 | 4015 | ||
| 4038 | ;;; | 4016 | ;;; |
| @@ -5805,12 +5783,6 @@ give as trustworthy answer as possible." | |||
| 5805 | (concat system-name | 5783 | (concat system-name |
| 5806 | ".i-did-not-set--mail-host-address--so-tickle-me"))))) | 5784 | ".i-did-not-set--mail-host-address--so-tickle-me"))))) |
| 5807 | 5785 | ||
| 5808 | (defun message-make-host-name () | ||
| 5809 | "Return the name of the host." | ||
| 5810 | (let ((fqdn (message-make-fqdn))) | ||
| 5811 | (string-match "^[^.]+\\." fqdn) | ||
| 5812 | (substring fqdn 0 (1- (match-end 0))))) | ||
| 5813 | |||
| 5814 | (defun message-make-domain () | 5786 | (defun message-make-domain () |
| 5815 | "Return the domain name." | 5787 | "Return the domain name." |
| 5816 | (or mail-host-address | 5788 | (or mail-host-address |
| @@ -6134,13 +6106,6 @@ Headers already prepared in the buffer are not modified." | |||
| 6134 | (forward-char 1))) | 6106 | (forward-char 1))) |
| 6135 | (skip-chars-forward " \t\n"))) | 6107 | (skip-chars-forward " \t\n"))) |
| 6136 | 6108 | ||
| 6137 | (defun message-fill-address (header value) | ||
| 6138 | (insert (capitalize (symbol-name header)) | ||
| 6139 | ": " | ||
| 6140 | (if (consp value) (car value) value) | ||
| 6141 | "\n") | ||
| 6142 | (message-fill-field-address)) | ||
| 6143 | |||
| 6144 | (defun message-split-line () | 6109 | (defun message-split-line () |
| 6145 | "Split current line, moving portion beyond point vertically down. | 6110 | "Split current line, moving portion beyond point vertically down. |
| 6146 | If the current line has `message-yank-prefix', insert it on the new line." | 6111 | If the current line has `message-yank-prefix', insert it on the new line." |
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index a0322b00cf3..109bd265faa 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el | |||
| @@ -416,69 +416,6 @@ spaces. Die Die Die." | |||
| 416 | 416 | ||
| 417 | (autoload 'mml-compute-boundary "mml") | 417 | (autoload 'mml-compute-boundary "mml") |
| 418 | 418 | ||
| 419 | (defun mm-url-encode-multipart-form-data (pairs &optional boundary) | ||
| 420 | "Return PAIRS encoded in multipart/form-data." | ||
| 421 | ;; RFC1867 | ||
| 422 | |||
| 423 | ;; Get a good boundary | ||
| 424 | (unless boundary | ||
| 425 | (setq boundary (mml-compute-boundary '()))) | ||
| 426 | |||
| 427 | (concat | ||
| 428 | |||
| 429 | ;; Start with the boundary | ||
| 430 | "--" boundary "\r\n" | ||
| 431 | |||
| 432 | ;; Create name value pairs | ||
| 433 | (mapconcat | ||
| 434 | 'identity | ||
| 435 | ;; Delete any returned items that are empty | ||
| 436 | (delq nil | ||
| 437 | (mapcar (lambda (data) | ||
| 438 | (when (car data) | ||
| 439 | ;; For each pair | ||
| 440 | (concat | ||
| 441 | |||
| 442 | ;; Encode the name | ||
| 443 | "Content-Disposition: form-data; name=\"" | ||
| 444 | (car data) "\"\r\n" | ||
| 445 | "Content-Type: text/plain; charset=utf-8\r\n" | ||
| 446 | "Content-Transfer-Encoding: binary\r\n\r\n" | ||
| 447 | |||
| 448 | (cond ((stringp (cdr data)) | ||
| 449 | (cdr data)) | ||
| 450 | ((integerp (cdr data)) | ||
| 451 | (int-to-string (cdr data)))) | ||
| 452 | |||
| 453 | "\r\n"))) | ||
| 454 | pairs)) | ||
| 455 | ;; use the boundary as a separator | ||
| 456 | (concat "--" boundary "\r\n")) | ||
| 457 | |||
| 458 | ;; put a boundary at the end. | ||
| 459 | "--" boundary "--\r\n")) | ||
| 460 | |||
| 461 | (defun mm-url-fetch-form (url pairs) | ||
| 462 | "Fetch a form from URL with PAIRS as the data using the POST method." | ||
| 463 | (mm-url-load-url) | ||
| 464 | (let ((url-request-data (mm-url-encode-www-form-urlencoded pairs)) | ||
| 465 | (url-request-method "POST") | ||
| 466 | (url-request-extra-headers | ||
| 467 | '(("Content-type" . "application/x-www-form-urlencoded")))) | ||
| 468 | (url-insert-file-contents url) | ||
| 469 | (setq buffer-file-name nil)) | ||
| 470 | t) | ||
| 471 | |||
| 472 | (defun mm-url-fetch-simple (url content) | ||
| 473 | (mm-url-load-url) | ||
| 474 | (let ((url-request-data content) | ||
| 475 | (url-request-method "POST") | ||
| 476 | (url-request-extra-headers | ||
| 477 | '(("Content-type" . "application/x-www-form-urlencoded")))) | ||
| 478 | (url-insert-file-contents url) | ||
| 479 | (setq buffer-file-name nil)) | ||
| 480 | t) | ||
| 481 | |||
| 482 | (defun mm-url-remove-markup () | 419 | (defun mm-url-remove-markup () |
| 483 | "Remove all HTML markup, leaving just plain text." | 420 | "Remove all HTML markup, leaving just plain text." |
| 484 | (goto-char (point-min)) | 421 | (goto-char (point-min)) |
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 1d7b174d5a4..d3e1014fcd4 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el | |||
| @@ -496,9 +496,6 @@ | |||
| 496 | (defun mm-inline-audio (handle) | 496 | (defun mm-inline-audio (handle) |
| 497 | (message "Not implemented")) | 497 | (message "Not implemented")) |
| 498 | 498 | ||
| 499 | (defun mm-view-sound-file () | ||
| 500 | (message "Not implemented")) | ||
| 501 | |||
| 502 | (defun mm-w3-prepare-buffer () | 499 | (defun mm-w3-prepare-buffer () |
| 503 | (require 'w3) | 500 | (require 'w3) |
| 504 | (let ((url-standalone-mode t) | 501 | (let ((url-standalone-mode t) |
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 5126c25f66b..a630c732b81 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el | |||
| @@ -1852,15 +1852,6 @@ textual parts.") | |||
| 1852 | (forward-line 1))) | 1852 | (forward-line 1))) |
| 1853 | (buffer-substring (point) end)))) | 1853 | (buffer-substring (point) end)))) |
| 1854 | 1854 | ||
| 1855 | (defun nnimap-get-responses (sequences) | ||
| 1856 | (let (responses) | ||
| 1857 | (dolist (sequence sequences) | ||
| 1858 | (goto-char (point-min)) | ||
| 1859 | (when (re-search-forward (format "^%d " sequence) nil t) | ||
| 1860 | (push (list sequence (nnimap-parse-response)) | ||
| 1861 | responses))) | ||
| 1862 | responses)) | ||
| 1863 | |||
| 1864 | (defvar nnimap-incoming-split-list nil) | 1855 | (defvar nnimap-incoming-split-list nil) |
| 1865 | 1856 | ||
| 1866 | (defun nnimap-fetch-inbox (articles) | 1857 | (defun nnimap-fetch-inbox (articles) |
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index c538d740209..be5d1e6ff4c 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el | |||
| @@ -1230,30 +1230,6 @@ If SEND-IF-FORCE, only send authinfo to the server if the | |||
| 1230 | (read-passwd (format "NNTP (%s@%s) password: " | 1230 | (read-passwd (format "NNTP (%s@%s) password: " |
| 1231 | user nntp-address)))))))))) | 1231 | user nntp-address)))))))))) |
| 1232 | 1232 | ||
| 1233 | (defun nntp-send-nosy-authinfo () | ||
| 1234 | "Send the AUTHINFO to the nntp server." | ||
| 1235 | (let ((user (read-string (format "NNTP (%s) user name: " nntp-address)))) | ||
| 1236 | (unless (member user '(nil "")) | ||
| 1237 | (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" user) | ||
| 1238 | (when t ;???Should check if AUTHINFO succeeded | ||
| 1239 | (nntp-send-command "^2.*\r?\n" "AUTHINFO PASS" | ||
| 1240 | (read-passwd (format "NNTP (%s@%s) password: " | ||
| 1241 | user nntp-address))))))) | ||
| 1242 | |||
| 1243 | (defun nntp-send-authinfo-from-file () | ||
| 1244 | "Send the AUTHINFO to the nntp server. | ||
| 1245 | |||
| 1246 | The authinfo login name is taken from the user's login name and the | ||
| 1247 | password contained in '~/.nntp-authinfo'." | ||
| 1248 | (when (file-exists-p "~/.nntp-authinfo") | ||
| 1249 | (with-temp-buffer | ||
| 1250 | (insert-file-contents "~/.nntp-authinfo") | ||
| 1251 | (goto-char (point-min)) | ||
| 1252 | (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" (user-login-name)) | ||
| 1253 | (nntp-send-command | ||
| 1254 | "^2.*\r?\n" "AUTHINFO PASS" | ||
| 1255 | (buffer-substring (point) (point-at-eol)))))) | ||
| 1256 | |||
| 1257 | ;;; Internal functions. | 1233 | ;;; Internal functions. |
| 1258 | 1234 | ||
| 1259 | (defun nntp-handle-authinfo (process) | 1235 | (defun nntp-handle-authinfo (process) |
| @@ -1380,14 +1356,6 @@ password contained in '~/.nntp-authinfo'." | |||
| 1380 | nntp-process-start-point (point-max)) | 1356 | nntp-process-start-point (point-max)) |
| 1381 | (setq after-change-functions '(nntp-after-change-function)))) | 1357 | (setq after-change-functions '(nntp-after-change-function)))) |
| 1382 | 1358 | ||
| 1383 | (defun nntp-async-timer-handler () | ||
| 1384 | (mapcar | ||
| 1385 | (lambda (proc) | ||
| 1386 | (if (memq (process-status proc) '(open run)) | ||
| 1387 | (nntp-async-trigger proc) | ||
| 1388 | (nntp-async-stop proc))) | ||
| 1389 | nntp-async-process-list)) | ||
| 1390 | |||
| 1391 | (defun nntp-async-stop (proc) | 1359 | (defun nntp-async-stop (proc) |
| 1392 | (setq nntp-async-process-list (delq proc nntp-async-process-list)) | 1360 | (setq nntp-async-process-list (delq proc nntp-async-process-list)) |
| 1393 | (when (and nntp-async-timer (not nntp-async-process-list)) | 1361 | (when (and nntp-async-timer (not nntp-async-process-list)) |
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 16d9203ba04..b01b8697825 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el | |||
| @@ -215,26 +215,6 @@ MODE can be \"login\" or \"password\", suitable for passing to | |||
| 215 | (eq type (car (cddr service))))))) | 215 | (eq type (car (cddr service))))))) |
| 216 | (car service))) | 216 | (car service))) |
| 217 | 217 | ||
| 218 | (defun netrc-find-service-number (name &optional type) | ||
| 219 | (let ((services (netrc-parse-services)) | ||
| 220 | service) | ||
| 221 | (setq type (or type 'tcp)) | ||
| 222 | (while (and (setq service (pop services)) | ||
| 223 | (not (and (string= name (car service)) | ||
| 224 | (eq type (car (cddr service))))))) | ||
| 225 | (cadr service))) | ||
| 226 | |||
| 227 | (defun netrc-store-data (file host port user password) | ||
| 228 | (with-temp-buffer | ||
| 229 | (when (file-exists-p file) | ||
| 230 | (insert-file-contents file)) | ||
| 231 | (goto-char (point-max)) | ||
| 232 | (unless (bolp) | ||
| 233 | (insert "\n")) | ||
| 234 | (insert (format "machine %s login %s password %s port %s\n" | ||
| 235 | host user password port)) | ||
| 236 | (write-region (point-min) (point-max) file nil 'silent))) | ||
| 237 | |||
| 238 | ;;;###autoload | 218 | ;;;###autoload |
| 239 | (defun netrc-credentials (machine &rest ports) | 219 | (defun netrc-credentials (machine &rest ports) |
| 240 | "Return a user name/password pair. | 220 | "Return a user name/password pair. |