[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el

[Nick Roberts]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.353 
emacs/lisp/progmodes/compile.el:1.354
*** emacs/lisp/progmodes/compile.el:1.353       Sat May  7 16:18:36 2005
--- emacs/lisp/progmodes/compile.el     Mon May 16 00:01:46 2005
***************
*** 1247,1254 ****
    (make-local-variable 'compilation-messages-start)
    (make-local-variable 'compilation-error-screen-columns)
    (make-local-variable 'overlay-arrow-position)
!   (set (make-local-variable 'overlay-arrow-string)
!        (if (display-graphic-p) "=>" ""))
    (setq next-error-overlay-arrow-position nil)
    (add-hook 'kill-buffer-hook
            (lambda () (setq next-error-overlay-arrow-position nil)) nil t)
--- 1247,1253 ----
    (make-local-variable 'compilation-messages-start)
    (make-local-variable 'compilation-error-screen-columns)
    (make-local-variable 'overlay-arrow-position)
!   (set (make-local-variable 'overlay-arrow-string) "")
    (setq next-error-overlay-arrow-position nil)
    (add-hook 'kill-buffer-hook
            (lambda () (setq next-error-overlay-arrow-position nil)) nil t)
***************
*** 1575,1583 ****
        (setcdr loc (list line file marker)))
      loc))
  
! (defcustom compilation-context-lines 0
!   "*Display this many lines of leading context before message.
! If nil, don't scroll the compilation output window."
    :type '(choice integer (const :tag "No window scrolling" nil))
    :group 'compilation
    :version "22.1")
--- 1574,1585 ----
        (setcdr loc (list line file marker)))
      loc))
  
! (defcustom compilation-context-lines nil
!   "Display this many lines of leading context before the current message.
! If nil and the left fringe is displayed, don't scroll the
! compilation output window; an arrow in the left fringe points to
! the current message.  If nil and there is no left fringe, the message
! displays at the top of the window; there is no arrow."
    :type '(choice integer (const :tag "No window scrolling" nil))
    :group 'compilation
    :version "22.1")
***************
*** 1586,1595 ****
    "Align the compilation output window W with marker MK near top."
    (if (integerp compilation-context-lines)
        (set-window-start w (save-excursion
!                             (goto-char mk)
!                             (beginning-of-line (- 1 
compilation-context-lines))
!                             (point))))
!   (set-window-point w mk))
  
  (defvar next-error-highlight-timer)
  
--- 1588,1603 ----
    "Align the compilation output window W with marker MK near top."
    (if (integerp compilation-context-lines)
        (set-window-start w (save-excursion
!                           (goto-char mk)
!                           (beginning-of-line
!                            (- 1 compilation-context-lines))
!                           (point)))
!     (if (left-fringe-p)
!       (set-window-start w (save-excursion
!                             (goto-char mk)
!                           (beginning-of-line 1)
!                           (point)))))
!     (set-window-point w mk))
  
  (defvar next-error-highlight-timer)