Commit daddb3fd authored by Darren Hoo's avatar Darren Hoo Committed by Stefan Monnier
Browse files

* lisp/man.el (Man-start-calling): New macro, extracted from

Man-getpage-in-background.
(Man-getpage-in-background): Use it.
(Man-update-manpage): New command.
(Man-mode-map): Bind it.
parent d85783ca
2013-11-08 Darren Hoo <darren.hoo@gmail.com>
* man.el (Man-start-calling): New macro, extracted from
Man-getpage-in-background.
(Man-getpage-in-background): Use it.
(Man-update-manpage): New command.
(Man-mode-map): Bind it.
2013-11-08 Dmitry Gutov <dgutov@yandex.ru> 2013-11-08 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-smie-grammar): Improve precedences * progmodes/ruby-mode.el (ruby-smie-grammar): Improve precedences
...@@ -5,8 +13,8 @@ ...@@ -5,8 +13,8 @@
(ruby-smie--args-separator-p): Prohibit keyword "do" as the first (ruby-smie--args-separator-p): Prohibit keyword "do" as the first
argument. Prohibit opening curly brace because it could only be a argument. Prohibit opening curly brace because it could only be a
block opener in that position. block opener in that position.
(ruby-smie--forward-token, ruby-smie--backward-token): Separate (ruby-smie--forward-token, ruby-smie--backward-token):
"|" from "&" or "*" going after it. That can happen in block Separate "|" from "&" or "*" going after it. That can happen in block
arguments. arguments.
(ruby-smie--indent-to-stmt): New function, seeks the end of (ruby-smie--indent-to-stmt): New function, seeks the end of
previous statement or beginning of buffer. previous statement or beginning of buffer.
......
...@@ -448,6 +448,7 @@ Otherwise, the value is whatever the function ...@@ -448,6 +448,7 @@ Otherwise, the value is whatever the function
(define-key map "s" 'Man-goto-see-also-section) (define-key map "s" 'Man-goto-see-also-section)
(define-key map "k" 'Man-kill) (define-key map "k" 'Man-kill)
(define-key map "q" 'Man-quit) (define-key map "q" 'Man-quit)
(define-key map "u" 'Man-update-manpage)
(define-key map "m" 'man) (define-key map "m" 'man)
;; Not all the man references get buttons currently. The text in the ;; Not all the man references get buttons currently. The text in the
;; manual page can contain references to other man pages ;; manual page can contain references to other man pages
...@@ -1000,30 +1001,15 @@ names or descriptions. The pattern argument is usually an ...@@ -1000,30 +1001,15 @@ names or descriptions. The pattern argument is usually an
(error "No item under point") (error "No item under point")
(man man-args))) (man man-args)))
(defun Man-getpage-in-background (topic) (defmacro Man-start-calling (&rest body)
"Use TOPIC to build and fire off the manpage and cleaning command. "Start the man command in `body' after setting up the environment"
Return the buffer in which the manpage will appear." `(let ((process-environment (copy-sequence process-environment))
(let* ((man-args topic)
(bufname (concat "*Man " man-args "*"))
(buffer (get-buffer bufname)))
(if buffer
(Man-notify-when-ready buffer)
(require 'env)
(message "Invoking %s %s in the background" manual-program man-args)
(setq buffer (generate-new-buffer bufname))
(with-current-buffer buffer
(setq buffer-undo-list t)
(setq Man-original-frame (selected-frame))
(setq Man-arguments man-args))
(let ((process-environment (copy-sequence process-environment))
;; The following is so Awk script gets \n intact ;; The following is so Awk script gets \n intact
;; But don't prevent decoding of the outside. ;; But don't prevent decoding of the outside.
(coding-system-for-write 'raw-text-unix) (coding-system-for-write 'raw-text-unix)
;; We must decode the output by a coding system that the ;; We must decode the output by a coding system that the
;; system's locale suggests in multibyte mode. ;; system's locale suggests in multibyte mode.
(coding-system-for-read (coding-system-for-read locale-coding-system)
(if (default-value 'enable-multibyte-characters)
locale-coding-system 'raw-text-unix))
;; Avoid possible error by using a directory that always exists. ;; Avoid possible error by using a directory that always exists.
(default-directory (default-directory
(if (and (file-directory-p default-directory) (if (and (file-directory-p default-directory)
...@@ -1059,6 +1045,24 @@ Return the buffer in which the manpage will appear." ...@@ -1059,6 +1045,24 @@ Return the buffer in which the manpage will appear."
;; sequences when stdout is not a tty. In 2.5.0, the following ;; sequences when stdout is not a tty. In 2.5.0, the following
;; env-var was added to allow control of this (see Debian Bug#340673). ;; env-var was added to allow control of this (see Debian Bug#340673).
(setenv "MAN_KEEP_FORMATTING" "1") (setenv "MAN_KEEP_FORMATTING" "1")
,@body))
(defun Man-getpage-in-background (topic)
"Use TOPIC to build and fire off the manpage and cleaning command.
Return the buffer in which the manpage will appear."
(let* ((man-args topic)
(bufname (concat "*Man " man-args "*"))
(buffer (get-buffer bufname)))
(if buffer
(Man-notify-when-ready buffer)
(require 'env)
(message "Invoking %s %s in the background" manual-program man-args)
(setq buffer (generate-new-buffer bufname))
(with-current-buffer buffer
(setq buffer-undo-list t)
(setq Man-original-frame (selected-frame))
(setq Man-arguments man-args))
(Man-start-calling
(if (fboundp 'start-process) (if (fboundp 'start-process)
(set-process-sentinel (set-process-sentinel
(start-process manual-program buffer (start-process manual-program buffer
...@@ -1083,6 +1087,33 @@ Return the buffer in which the manpage will appear." ...@@ -1083,6 +1087,33 @@ Return the buffer in which the manpage will appear."
(Man-bgproc-sentinel bufname msg))))) (Man-bgproc-sentinel bufname msg)))))
buffer)) buffer))
(defun Man-update-manpage ()
"Reformat current manpage by calling the man command again synchronously."
(interactive)
(when (eq Man-arguments nil)
;;this shouldn't happen unless it is not in a Man buffer."
(error "Man-arguments not initialized"))
(let ((old-pos (point))
(text (current-word))
(old-size (buffer-size))
(inhibit-read-only t)
(buffer-read-only nil))
(erase-buffer)
(Man-start-calling
(call-process shell-file-name nil (list (current-buffer) nil) nil
shell-command-switch
(format (Man-build-man-command) Man-arguments)))
(if Man-fontify-manpage-flag
(Man-fontify-manpage)
(Man-cleanup-manpage))
(goto-char old-pos)
;;restore the point, not strictly right.
(unless (or (eq text nil) (= old-size (buffer-size)))
(let ((case-fold-search nil))
(if (> old-size (buffer-size))
(search-backward text nil t))
(search-forward text nil t)))))
(defun Man-notify-when-ready (man-buffer) (defun Man-notify-when-ready (man-buffer)
"Notify the user when MAN-BUFFER is ready. "Notify the user when MAN-BUFFER is ready.
See the variable `Man-notify-method' for the different notification behaviors." See the variable `Man-notify-method' for the different notification behaviors."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment