projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark outgoing encrypted message.
[riece]
/
lisp
/
riece-display.el
diff --git
a/lisp/riece-display.el
b/lisp/riece-display.el
index
037f437
..
fbead8b
100644
(file)
--- a/
lisp/riece-display.el
+++ b/
lisp/riece-display.el
@@
-19,8
+19,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Code:
;;; Code:
@@
-429,7
+429,14
@@
Local to the buffer in `riece-buffer-list'.")
(current-buffer)))
(defun riece-channel-buffer (identity)
(current-buffer)))
(defun riece-channel-buffer (identity)
- (cdr (riece-identity-assoc identity riece-channel-buffer-alist)))
+ (let ((entry (riece-identity-assoc identity riece-channel-buffer-alist)))
+ (if entry
+ (if (buffer-live-p (cdr entry))
+ (cdr entry)
+ (if riece-debug
+ (riece-debug
+ (format "riece-channel-buffer: nonexistent buffer: %s"
+ (riece-format-identity identity))))))))
(defun riece-switch-to-channel (identity)
(let ((last riece-current-channel)
(defun riece-switch-to-channel (identity)
(let ((last riece-current-channel)
@@
-476,10
+483,12
@@
Local to the buffer in `riece-buffer-list'.")
(defun riece-part-channel (identity)
(let ((pointer (riece-identity-member identity riece-current-channels)))
(defun riece-part-channel (identity)
(let ((pointer (riece-identity-member identity riece-current-channels)))
- (if pointer
- (setcar pointer nil))
+ (unless pointer
+ (error "No such channel!"))
+ (setcar pointer nil)
(if (riece-identity-equal identity riece-current-channel)
(if (riece-identity-equal identity riece-current-channel)
- (riece-switch-to-nearest-channel pointer))
+ (riece-switch-to-nearest-channel pointer)
+ (riece-emit-signal 'channel-list-changed))
(funcall riece-buffer-dispose-function (riece-channel-buffer identity))))
(defun riece-redisplay-buffers (&optional force)
(funcall riece-buffer-dispose-function (riece-channel-buffer identity))))
(defun riece-redisplay-buffers (&optional force)