[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Moved function to find `erc-parsed' prope
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Moved function to find `erc-parsed' property to erc.el. |
Date: |
Sun, 14 Oct 2007 00:48:41 -0400 |
commit 70a1912606485c1b409774319cec981120fa0b86
Author: Diane Murray <address@hidden>
Date: Thu Jan 11 12:44:32 2007 +0000
Moved function to find `erc-parsed' property to erc.el.
* erc.el (erc-find-parsed-property): Moved here from erc-track.el
since it can be useful in general.
* erc-track.el (erc-find-parsed-property): Removed.
* erc-capab.el (erc-capab-find-parsed): Removed.
(erc-capab-identify-add-prefix): Use `erc-find-parsed-property'.
git-archimport-id: address@hidden/erc--main--0--patch-89
diff --git a/ChangeLog b/ChangeLog
index 503d29d..22e9deb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-01-11 Diane Murray <address@hidden>
+ * erc.el (erc-find-parsed-property): Moved here from erc-track.el
+ since it can be useful in general.
+
+ * erc-track.el (erc-find-parsed-property): Removed.
+
+ * erc-capab.el (erc-capab-find-parsed): Removed.
+ (erc-capab-identify-add-prefix): Use `erc-find-parsed-property'.
+
* erc.el (erc-open): Run `erc-before-connect' hook here. This
makes sure the hook always gets called before a connection is
made, as some functions, like `erc-handle-irc-url', use `erc-open'
diff --git a/erc-capab.el b/erc-capab.el
index 6155172..eb90722 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -174,8 +174,7 @@ PARSED is an `erc-parsed' response struct."
"Add `erc-capab-identify-prefix' to nickname if user is unidentified."
(when (and erc-capab-identify-prefix
(erc-with-server-buffer erc-capab-identify-activated))
- (goto-char (point-min))
- (goto-char (or (erc-capab-find-parsed) (point-min)))
+ (goto-char (or (erc-find-parsed-property) (point-min)))
(let ((nickname (erc-capab-get-unidentified-nickname
(erc-get-parsed-vector (point)))))
(when (and nickname
@@ -187,17 +186,6 @@ PARSED is an `erc-parsed' response struct."
'face (get-char-property (- (point) 1)
'face)))))))
-(defun erc-capab-find-parsed ()
- "Return the position of text found with the `erc-parsed' property."
- (catch 'position
- (while (< (point) (point-max))
- (cond ((get-char-property (point) 'erc-parsed)
- (throw 'position (point)))
- (t
- (goto-char (or (next-single-property-change
- (point) 'erc-parsed)
- (point-max))))))))
-
(defun erc-capab-get-unidentified-nickname (parsed)
"Return the nickname of the user if unidentified.
PARSED is an `erc-parsed' response struct."
diff --git a/erc-track.el b/erc-track.el
index 3c8f93a..f836a78 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -773,10 +773,6 @@ is in `erc-mode'."
str)
(erc-faces-in str)))
-(defun erc-find-parsed-property ()
- "Find the next occurrence of the `erc-parsed' text property."
- (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
-
;;; Buffer switching
(defvar erc-track-last-non-erc-buffer nil
diff --git a/erc.el b/erc.el
index e6e21c8..44560a6 100644
--- a/erc.el
+++ b/erc.el
@@ -6230,6 +6230,10 @@ This function should be on `erc-kill-channel-hook'."
;;; Dealing with `erc-parsed'
+(defun erc-find-parsed-property ()
+ "Find the next occurrence of the `erc-parsed' text property."
+ (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
+
(defun erc-get-parsed-vector (point)
"Return the whole parsed vector on POINT."
(get-text-property point 'erc-parsed))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Moved function to find `erc-parsed' property to erc.el.,
mwolson <=