[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/makeinfo.el
From: |
Romain Francoise |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/makeinfo.el |
Date: |
Sat, 27 Aug 2005 12:11:46 -0400 |
Index: emacs/lisp/textmodes/makeinfo.el
diff -c emacs/lisp/textmodes/makeinfo.el:1.19
emacs/lisp/textmodes/makeinfo.el:1.20
*** emacs/lisp/textmodes/makeinfo.el:1.19 Sat Aug 6 17:41:14 2005
--- emacs/lisp/textmodes/makeinfo.el Sat Aug 27 16:11:44 2005
***************
*** 171,192 ****
makeinfo-options
" "
makeinfo-temp-file)
! "Use `makeinfo-buffer' to gain use of the `next-error' command"
! nil
'makeinfo-compilation-sentinel-region)))))))
! ;;; Actually run makeinfo. COMMAND is the command to run.
! ;;; ERROR-MESSAGE is what to say when next-error can't find another error.
! ;;; If PARSE-ERRORS is non-nil, do try to parse error messages.
! (defun makeinfo-compile (command error-message parse-errors sentinel)
! (let ((buffer
! (compile-internal command error-message nil
! (and (not parse-errors)
! ;; If we do want to parse errors, pass nil.
! ;; Otherwise, use this function, which won't
! ;; ever find any errors.
! (lambda (&rest ignore)
! (setq compilation-error-list nil))))))
(set-process-sentinel (get-buffer-process buffer) sentinel)))
;; Delete makeinfo-temp-file after processing is finished,
--- 171,197 ----
makeinfo-options
" "
makeinfo-temp-file)
! t
'makeinfo-compilation-sentinel-region)))))))
! (defun makeinfo-next-error (arg reset)
! "This function is used to disable `next-error' if the user has
! used `makeinfo-region'. Since the compilation process is used on
! a temporary file in that case, calling `next-error' would give
! nonsensical results."
! (error "Use `makeinfo-buffer' to gain use of the `next-error' command"))
!
! ;; Actually run makeinfo. COMMAND is the command to run. If
! ;; DISABLE-ERRORS is non-nil, disable `next-error' by setting
! ;; `next-error-function' to `makeinfo-next-error' in the compilation
! ;; buffer.
! (defun makeinfo-compile (command disable-errors sentinel)
! (let ((buffer (compilation-start command)))
! (with-current-buffer buffer
! (setq next-error-function
! (if disable-errors
! 'makeinfo-next-error
! 'compilation-next-error-function)))
(set-process-sentinel (get-buffer-process buffer) sentinel)))
;; Delete makeinfo-temp-file after processing is finished,
***************
*** 249,257 ****
(save-excursion
(makeinfo-compile
(concat makeinfo-run-command " " makeinfo-options
! " " buffer-file-name)
! "No more errors."
! t
'makeinfo-compilation-sentinel-buffer)))
(defun makeinfo-compilation-sentinel-buffer (proc msg)
--- 254,261 ----
(save-excursion
(makeinfo-compile
(concat makeinfo-run-command " " makeinfo-options
! " " buffer-file-name)
! nil
'makeinfo-compilation-sentinel-buffer)))
(defun makeinfo-compilation-sentinel-buffer (proc msg)