Commit da946239 authored by Katsumi Yamaoka's avatar Katsumi Yamaoka

gmm-utils.el (gmm-called-interactively-p): Restore as a macro.

gnus-art.el (article-unsplit-urls)
gnus-bookmark.el (gnus-bookmark-bmenu-list)
gnus-registry.el (gnus-registry-get-article-marks)
message.el (message-goto-body): Use it.
  (message-called-interactively-p): Remove.

spam-stat.el (spam-stat-called-interactively-p): New macro.
  (spam-stat-score-buffer): Use it.

spam.el: Silence the warnings against BBDB functions when compiling.

gnus-score.el (gnus-score-decode-text-parts):
  Use append+mapcar instead of the cl function mapcan.
parent 9ad948e2
2012-12-06 Katsumi Yamaoka <yamaoka@jpl.org>
* gmm-utils.el (gmm-called-interactively-p): Restore as a macro.
* gnus-art.el (article-unsplit-urls)
* gnus-bookmark.el (gnus-bookmark-bmenu-list)
* gnus-registry.el (gnus-registry-get-article-marks)
* message.el (message-goto-body): Use it.
(message-called-interactively-p): Remove.
* spam-stat.el (spam-stat-called-interactively-p): New macro.
(spam-stat-score-buffer): Use it.
* spam.el: Silence the warnings against BBDB functions when compiling.
* gnus-score.el (gnus-score-decode-text-parts):
Use append+mapcar instead of the cl function mapcan.
* gmm-utils.el (gmm-flet): Remove.
* gnus-sync.el (gnus-sync-lesync-call):
......
......@@ -417,6 +417,18 @@ coding-system."
(write-region start end filename append visit lockname))
(write-region start end filename append visit lockname mustbenew)))
;; `interactive-p' is obsolete since Emacs 23.2.
(defmacro gmm-called-interactively-p (kind)
(condition-case nil
(progn
(eval '(called-interactively-p 'any))
;; Emacs >=23.2
`(called-interactively-p ,kind))
;; Emacs <23.2
(wrong-number-of-arguments '(called-interactively-p))
;; XEmacs
(void-function '(interactive-p))))
;; `labels' is obsolete since Emacs 24.3.
(defmacro gmm-labels (bindings &rest body)
"Make temporary function bindings.
......
......@@ -2718,7 +2718,7 @@ If READ-CHARSET, ask for a coding system."
(while (re-search-forward
"\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
(replace-match "\\1\\3" t)))
(when (interactive-p)
(when (gmm-called-interactively-p 'any)
(gnus-treat-article nil))))
(defun article-wash-html ()
......
......@@ -367,7 +367,7 @@ The leftmost column displays a D if the bookmark is flagged for
deletion, or > if it is flagged for displaying."
(interactive)
(gnus-bookmark-maybe-load-default-file)
(if (interactive-p)
(if (gmm-called-interactively-p 'any)
(switch-to-buffer (get-buffer-create "*Gnus Bookmark List*"))
(set-buffer (get-buffer-create "*Gnus Bookmark List*")))
(let ((inhibit-read-only t)
......
......@@ -982,7 +982,7 @@ only the last one's marks are returned."
(let* ((article (last articles))
(id (gnus-registry-fetch-message-id-fast article))
(marks (when id (gnus-registry-get-id-key id 'mark))))
(when (interactive-p)
(when (gmm-called-interactively-p 'any)
(gnus-message 1 "Marks are %S" marks))
marks))
......
......@@ -1723,7 +1723,8 @@ score in `gnus-newsgroup-scored' by SCORE."
((mm-text-parts
(handle)
(cond ((stringp (car handle))
(let ((parts (mapcan #'mm-text-parts (cdr handle))))
(let ((parts (apply #'append
(mapcar #'mm-text-parts (cdr handle)))))
(if (equal "multipart/alternative" (car handle))
;; pick the first supported alternative
(list (car parts))
......@@ -1733,7 +1734,7 @@ score in `gnus-newsgroup-scored' by SCORE."
(when (string-match "^text/" (mm-handle-media-type handle))
(list handle)))
(t (mapcan #'mm-text-parts handle))))
(t (apply #'append (mapcar #'mm-text-parts handle)))))
(my-mm-display-part
(handle)
(when handle
......
......@@ -3137,22 +3137,10 @@ M-RET `message-newline-and-reformat' (break the line and reformat)."
(push-mark)
(message-position-on-field "Summary" "Subject"))
(eval-when-compile
(defmacro message-called-interactively-p (kind)
(condition-case nil
(progn
(eval '(called-interactively-p 'any))
;; Emacs >=23.2
`(called-interactively-p ,kind))
;; Emacs <23.2
(wrong-number-of-arguments '(called-interactively-p))
;; XEmacs
(void-function '(interactive-p)))))
(defun message-goto-body ()
"Move point to the beginning of the message body."
(interactive)
(when (and (message-called-interactively-p 'any)
(when (and (gmm-called-interactively-p 'any)
(looking-at "[ \t]*\n"))
(expand-abbrev))
(push-mark)
......
......@@ -494,6 +494,18 @@ where DIFF is the difference between SCORE and 0.5."
(setcdr (nthcdr 14 result) nil)
result))
(eval-when-compile
(defmacro spam-stat-called-interactively-p (kind)
(condition-case nil
(progn
(eval '(called-interactively-p 'any))
;; Emacs >=23.2
`(called-interactively-p ,kind))
;; Emacs <23.2
(wrong-number-of-arguments '(called-interactively-p))
;; XEmacs
(void-function '(interactive-p)))))
(defun spam-stat-score-buffer ()
"Return a score describing the spam-probability for this buffer.
Add user supplied modifications if supplied."
......@@ -511,7 +523,7 @@ Add user supplied modifications if supplied."
(error nil)))
(ans
(if score1s (+ score0 score1s) score0)))
(when (interactive-p)
(when (spam-stat-called-interactively-p 'any)
(message "%S" ans))
ans))
......
......@@ -2092,22 +2092,24 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
(declare-function gnus-extract-address-components "gnus-util" (from))
(eval-and-compile
(when (condition-case nil
(progn
(require 'bbdb)
(require 'bbdb-com))
(file-error
;; `bbdb-records' should not be bound as an autoload function
;; before loading bbdb because of `bbdb-hashtable-size'.
(defalias 'bbdb-buffer 'ignore)
(defalias 'bbdb-create-internal 'ignore)
(defalias 'bbdb-records 'ignore)
(defalias 'spam-BBDB-register-routine 'ignore)
(defalias 'spam-enter-ham-BBDB 'ignore)
(defalias 'spam-exists-in-BBDB-p 'ignore)
(defalias 'bbdb-gethash 'ignore)
nil))
(condition-case nil
(progn
(require 'bbdb)
(require 'bbdb-com))
(file-error
;; `bbdb-records' should not be bound as an autoload function
;; before loading bbdb because of `bbdb-hashtable-size'.
(defalias 'bbdb-buffer 'ignore)
(defalias 'bbdb-create-internal 'ignore)
(defalias 'bbdb-records 'ignore)
(defalias 'spam-BBDB-register-routine 'ignore)
(defalias 'spam-enter-ham-BBDB 'ignore)
(defalias 'spam-exists-in-BBDB-p 'ignore)
(defalias 'bbdb-gethash 'ignore)
nil)))
(eval-when-compile
(when (featurep 'bbdb-com)
;; when the BBDB changes, we want to clear out our cache
(defun spam-clear-cache-BBDB (&rest immaterial)
(spam-clear-cache 'spam-use-BBDB))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment