aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2005-10-20 18:28:20 +0000
committerRomain Francoise2005-10-20 18:28:20 +0000
commitc18a54de65c1736093aeceaceb3cc5f91ec141dd (patch)
treea30ef3990fcdeeaecd3a00aea08e8aa8e7edc94f
parent10625c3cc9decf7d32119c26ac23d0ecd49e7a69 (diff)
downloademacs-c18a54de65c1736093aeceaceb3cc5f91ec141dd.tar.gz
emacs-c18a54de65c1736093aeceaceb3cc5f91ec141dd.zip
(with-rcirc-process-buffer): Move above its first user.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/net/rcirc.el12
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4313a51de7b..7a7f9dfddde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -112,6 +112,9 @@
112 112
1132005-10-20 Romain Francoise <romain@orebokech.com> 1132005-10-20 Romain Francoise <romain@orebokech.com>
114 114
115 * net/rcirc.el (with-rcirc-process-buffer): Move above its first
116 user.
117
115 * replace.el (occur-engine): Add follow-link property. 118 * replace.el (occur-engine): Add follow-link property.
116 119
117 * font-core.el (font-lock-mode): Doc fix. 120 * font-core.el (font-lock-mode): Doc fix.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 54013157b2d..dded8956f59 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -167,7 +167,7 @@ use `rcirc-update-prompt' after changing this variable.")
167 "Return rcirc version string. 167 "Return rcirc version string.
168If optional argument HERE is non-nil, insert string at point." 168If optional argument HERE is non-nil, insert string at point."
169 (interactive "P") 169 (interactive "P")
170 (let ((version "rcirc.el 0.9 $Revision: 1.1 $")) 170 (let ((version "rcirc.el 0.9 $Revision: 1.2 $"))
171 (if here 171 (if here
172 (insert version) 172 (insert version)
173 (if (interactive-p) 173 (if (interactive-p)
@@ -554,6 +554,11 @@ If buffer is nil, return the target of the current buffer."
554 554
555 (run-hooks 'rcirc-mode-hook)) 555 (run-hooks 'rcirc-mode-hook))
556 556
557(defmacro with-rcirc-process-buffer (process &rest body)
558 (declare (indent 1) (debug t))
559 `(with-current-buffer (process-buffer ,process)
560 ,@body))
561
557(defun rcirc-update-prompt () 562(defun rcirc-update-prompt ()
558 "Reset the prompt string in the current buffer." 563 "Reset the prompt string in the current buffer."
559 (let ((inhibit-read-only t) 564 (let ((inhibit-read-only t)
@@ -777,11 +782,6 @@ Used for displaying messages that don't have an explicit destination."
777 (with-current-buffer (process-buffer process) 782 (with-current-buffer (process-buffer process)
778 (setq rcirc-last-buffer buffer))) 783 (setq rcirc-last-buffer buffer)))
779 784
780(defmacro with-rcirc-process-buffer (process &rest body)
781 (declare (indent 1) (debug t))
782 `(with-current-buffer (process-buffer ,process)
783 ,@body))
784
785(defun rcirc-format-response-string (process sender response target text) 785(defun rcirc-format-response-string (process sender response target text)
786 (concat (when rcirc-time-format 786 (concat (when rcirc-time-format
787 (format-time-string rcirc-time-format (current-time))) 787 (format-time-string rcirc-time-format (current-time)))