var renamed

This commit is contained in:
Igor Shymko 2016-12-12 00:17:33 +02:00
parent 73d90fab7c
commit 7634460a77
2 changed files with 7 additions and 5 deletions

View File

@ -75,3 +75,4 @@ Adjustable by `M-x customize-option` -> `markdown-preview-port`.
Makes use of `markdown-mode`, which already can transform markdown into html Makes use of `markdown-mode`, which already can transform markdown into html
and `websocket.el` to deliver html to browser. and `websocket.el` to deliver html to browser.

View File

@ -42,7 +42,7 @@
:prefix "markdown-preview-" :prefix "markdown-preview-"
:link '(url-link "https://github.com/ancane/markdown-preview-mode")) :link '(url-link "https://github.com/ancane/markdown-preview-mode"))
(defcustom markdown-preview-ws-host "localhost" (defcustom markdown-preview-host "localhost"
"Markdown preview websocket server address." "Markdown preview websocket server address."
:group 'markdown-preview :group 'markdown-preview
:type 'string) :type 'string)
@ -142,7 +142,7 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
(if (search-forward "${MD_JS}" nil t) (if (search-forward "${MD_JS}" nil t)
(replace-match (markdown-preview--scripts) t)) (replace-match (markdown-preview--scripts) t))
(if (search-forward "${WS_HOST}" nil t) (if (search-forward "${WS_HOST}" nil t)
(replace-match markdown-preview-ws-host t)) (replace-match markdown-preview-host t))
(if (search-forward "${WS_PORT}" nil t) (if (search-forward "${WS_PORT}" nil t)
(replace-match (format "%s" markdown-preview-ws-port) t)) (replace-match (format "%s" markdown-preview-ws-port) t))
(if (search-forward "${MD_UUID}" nil t) (if (search-forward "${MD_UUID}" nil t)
@ -230,7 +230,7 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
(setq markdown-preview--websocket-server (setq markdown-preview--websocket-server
(websocket-server (websocket-server
markdown-preview-ws-port markdown-preview-ws-port
:host markdown-preview-ws-host :host markdown-preview-host
:on-message (lambda (websocket frame) :on-message (lambda (websocket frame)
(let ((ws-frame-text (websocket-frame-payload frame))) (let ((ws-frame-text (websocket-frame-payload frame)))
(if (string-prefix-p "MDPM-Register-UUID: " ws-frame-text) (if (string-prefix-p "MDPM-Register-UUID: " ws-frame-text)
@ -243,7 +243,7 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
frame)) frame))
))) )))
:on-open (lambda (websocket) (message "Websocket opened")) :on-open (lambda (websocket) (message "Websocket opened"))
:on-error (lambda (websocket type err) (message (concat "====> Error:" err))) :on-error (lambda (websocket type err) (message (format "====> Error: %s" err)))
:on-close (lambda (websocket) (markdown-preview--drop-closed-clients)))) :on-close (lambda (websocket) (markdown-preview--drop-closed-clients))))
(add-hook 'kill-emacs-hook 'markdown-preview--stop-websocket-server)) (add-hook 'kill-emacs-hook 'markdown-preview--stop-websocket-server))
(markdown-preview--open-browser-preview)) (markdown-preview--open-browser-preview))
@ -253,7 +253,7 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
(when (not markdown-preview--local-client) (when (not markdown-preview--local-client)
(setq markdown-preview--local-client (setq markdown-preview--local-client
(websocket-open (websocket-open
(format "ws://%s:%d" markdown-preview-ws-host markdown-preview-ws-port) (format "ws://%s:%d" markdown-preview-host markdown-preview-ws-port)
:on-error (lambda (ws type err) :on-error (lambda (ws type err)
(message "error connecting")) (message "error connecting"))
:on-close (lambda (websocket) :on-close (lambda (websocket)
@ -277,6 +277,7 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
(let ((md-buffer (gethash preview-uuid markdown-preview--preview-buffers))) (let ((md-buffer (gethash preview-uuid markdown-preview--preview-buffers)))
(when md-buffer (when md-buffer
(with-current-buffer md-buffer (with-current-buffer md-buffer
(markdown markdown-output-buffer-name)))) (markdown markdown-output-buffer-name))))
(with-current-buffer markdown-output-buffer-name ;; get-buffer (with-current-buffer markdown-output-buffer-name ;; get-buffer