[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117447: * net/rcirc.el (rcirc-buffer-process): Rest
From: |
Leo Liu |
Subject: |
[Emacs-diffs] trunk r117447: * net/rcirc.el (rcirc-buffer-process): Restore previous behaviour. |
Date: |
Mon, 30 Jun 2014 02:57:12 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117447
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17772
author: Grégoire Jadi <address@hidden>
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-30 10:55:14 +0800
message:
* net/rcirc.el (rcirc-buffer-process): Restore previous behaviour.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/rcirc.el rcirc.el-20091113204419-o5vbwnq5f7feedwu-4032
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-06-29 11:26:47 +0000
+++ b/lisp/ChangeLog 2014-06-30 02:55:14 +0000
@@ -1,3 +1,8 @@
+2014-06-30 Grégoire Jadi <address@hidden>
+
+ * net/rcirc.el (rcirc-buffer-process): Restore previous
+ behaviour. (Bug#17772)
+
2014-06-29 Alan Mackenzie <address@hidden>
Don't call c-parse-state when c++-template-syntax-table is active.
=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2014-06-19 11:14:59 +0000
+++ b/lisp/net/rcirc.el 2014-06-30 02:55:14 +0000
@@ -802,11 +802,11 @@
(defun rcirc-buffer-process (&optional buffer)
"Return the process associated with channel BUFFER.
With no argument or nil as argument, use the current buffer."
- (let ((buffer (or buffer (if (buffer-live-p rcirc-server-buffer)
- rcirc-server-buffer
- (error "Server buffer deleted")))))
- (or (with-current-buffer buffer rcirc-process)
- rcirc-process)))
+ (let ((buffer (or buffer (and (buffer-live-p rcirc-server-buffer)
+ rcirc-server-buffer))))
+ (if buffer
+ (with-current-buffer buffer rcirc-process)
+ rcirc-process)))
(defun rcirc-server-name (process)
"Return PROCESS server name, given by the 001 response."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117447: * net/rcirc.el (rcirc-buffer-process): Restore previous behaviour.,
Leo Liu <=