projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* riece-unread.el (riece-unread-disable): Reset riece-unread-channels.
[riece]
/
lisp
/
riece-filter.el
diff --git
a/lisp/riece-filter.el
b/lisp/riece-filter.el
index
a19221a
..
5c1b42b
100644
(file)
--- a/
lisp/riece-filter.el
+++ b/
lisp/riece-filter.el
@@
-28,7
+28,6
@@
(require 'riece-misc)
(require 'riece-server) ;riece-close-server
(require 'riece-identity)
(require 'riece-misc)
(require 'riece-server) ;riece-close-server
(require 'riece-identity)
-(require 'riece-display)
(defun riece-handle-numeric-reply (prefix number name string)
(let ((base-number (* (/ number 100) 100))
(defun riece-handle-numeric-reply (prefix number name string)
(let ((base-number (* (/ number 100) 100))
@@
-49,7
+48,7
@@
(riece-decode-coding-string string))
(error
(if riece-debug
(riece-decode-coding-string string))
(error
(if riece-debug
- (message "Error
occurred
in `%S': %S" function error)))))))
+ (message "Error in `%S': %S" function error)))))))
(defun riece-default-handle-numeric-reply
(client-prefix prefix number name string)
(defun riece-default-handle-numeric-reply
(client-prefix prefix number name string)
@@
-75,19
+74,19
@@
(run-hook-with-args-until-success hook prefix string)
(error
(if riece-debug
(run-hook-with-args-until-success hook prefix string)
(error
(if riece-debug
- (message "Error
occurred
in `%S': %S" hook error))
+ (message "Error in `%S': %S" hook error))
nil))
(if function
(condition-case error
(funcall function prefix string)
(error
(if riece-debug
nil))
(if function
(condition-case error
(funcall function prefix string)
(error
(if riece-debug
- (message "Error
occurred
in `%S': %S" function error)))))
+ (message "Error in `%S': %S" function error)))))
(condition-case error
(run-hook-with-args-until-success after-hook prefix string)
(error
(if riece-debug
(condition-case error
(run-hook-with-args-until-success after-hook prefix string)
(error
(if riece-debug
- (message "Error
occurred
in `%S': %S" after-hook error)))))))
+ (message "Error in `%S': %S" after-hook error)))))))
(defun riece-filter (process input)
(save-excursion
(defun riece-filter (process input)
(save-excursion
@@
-124,6
+123,8
@@
(throw 'contiguous nil)))))
(forward-line)))))
(throw 'contiguous nil)))))
(forward-line)))))
+(eval-when-compile
+ (autoload 'riece-exit "riece"))
(defun riece-sentinel (process status)
(if riece-reconnect-with-password
(let ((server-name
(defun riece-sentinel (process status)
(if riece-reconnect-with-password
(let ((server-name
@@
-154,7
+155,10
@@
(riece-part-channel (car channels)))
(setq channels (cdr channels))))
(riece-redisplay-buffers)
(riece-part-channel (car channels)))
(setq channels (cdr channels))))
(riece-redisplay-buffers)
- (riece-close-server-process process))))
+ (riece-close-server-process process)
+ ;; If no server process is available, exit.
+ (unless riece-server-process-alist
+ (riece-exit)))))
(provide 'riece-filter)
(provide 'riece-filter)