Commit 299a66e9 authored by Katsumi Yamaoka's avatar Katsumi Yamaoka
Browse files

gmm-utils.el (gmm-called-interactively-p): Revert. This seems to causes Emacs to get stuck!

parent 51b890ac
2012-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
 
* gmm-utils.el (gmm-called-interactively-p): Revert.
This seems to causes Emacs to get stuck!
* 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)
(message-called-interactively-p): Revert.
* gmm-utils.el (gmm-called-interactively-p): New function.
* gnus-art.el (article-unsplit-urls)
* gnus-bookmark.el (gnus-bookmark-bmenu-list)
......
......@@ -417,18 +417,6 @@ 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.
(defalias 'gmm-called-interactively-p
(condition-case nil
(progn
(eval '(called-interactively-p 'any))
;; Emacs >=23.2
'called-interactively-p)
;; Emacs <23.2
(wrong-number-of-arguments '(lambda (kind) (called-interactively-p)))
;; XEmacs
(void-function '(lambda (kind) (interactive-p)))))
;; `flet' and `labels' are obsolete since Emacs 24.3.
(defmacro gmm-flet (bindings &rest body)
"Make temporary overriding function definitions.
......
......@@ -45,7 +45,6 @@
(require 'mm-uu)
(require 'message)
(require 'mouse)
(require 'gmm-utils)
(autoload 'gnus-msg-mail "gnus-msg" nil t)
(autoload 'gnus-button-mailto "gnus-msg")
......@@ -2719,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 (gmm-called-interactively-p 'any)
(when (interactive-p)
(gnus-treat-article nil))))
(defun article-wash-html ()
......
......@@ -53,7 +53,6 @@
;;; Code:
(require 'gnus-sum)
(require 'gmm-utils)
;; FIXME: should avoid using C-c (no?)
;; (define-key gnus-summary-mode-map "\C-crm" 'gnus-bookmark-set)
......@@ -368,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 (gmm-called-interactively-p 'any)
(if (interactive-p)
(switch-to-buffer (get-buffer-create "*Gnus Bookmark List*"))
(set-buffer (get-buffer-create "*Gnus Bookmark List*")))
(let ((inhibit-read-only t)
......
......@@ -86,7 +86,6 @@
(require 'nnmail)
(require 'easymenu)
(require 'registry)
(require 'gmm-utils)
(defvar gnus-adaptive-word-syntax-table)
......@@ -983,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 (gmm-called-interactively-p 'interactive)
(when (interactive-p)
(gnus-message 1 "Marks are %S" marks))
marks))
......
......@@ -3137,10 +3137,22 @@ 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 (gmm-called-interactively-p 'any)
(when (and (message-called-interactively-p 'any)
(looking-at "[ \t]*\n"))
(expand-abbrev))
(push-mark)
......
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