diff options
| author | Kenichi Handa <handa@gnu.org> | 2014-07-02 00:34:58 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2014-07-02 00:34:58 +0900 |
| commit | 763a11d0d0dcf543e89a22c98f55ea07c40ceefa (patch) | |
| tree | 9ecaec1b8a509a799903926ecd961ab905a1b1bd /lisp/net | |
| parent | 0782685d43f026b2366dbacbebc79021a9df50c6 (diff) | |
| parent | a519335cc3a00f3d4d8efac2c08d9b6b17c7fcf0 (diff) | |
| download | emacs-763a11d0d0dcf543e89a22c98f55ea07c40ceefa.tar.gz | |
merge trunk
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/eww.el | 1 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index e8eb09c9a8e..02fc575c261 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -478,6 +478,7 @@ word(s) will be searched for via `eww-search-prefix'." (setq-local eww-current-url 'author) (setq-local eww-current-dom nil) (setq-local eww-current-source nil) + (setq-local eww-current-title "") (setq-local browse-url-browser-function 'eww-browse-url) (setq-local after-change-functions 'eww-process-text-input) (setq-local eww-history nil) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index a0e72d1a6f5..9f2b4bb85db 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -802,11 +802,11 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") (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." |