[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-
From: |
Alan Mackenzie |
Subject: |
Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling |
Date: |
Sat, 31 Aug 2019 11:31:33 +0000 |
User-agent: |
Mutt/1.10.1 (2018-07-13) |
Hello, Stefan.
Thanks for all the suggestions and corrections.
On Tue, Aug 27, 2019 at 15:59:27 -0400, Stefan Monnier wrote:
> Hi Alan,
> > +(defvar compilation-dummy-string ">"
> > + "A string which is only a placeholder for compilation-margin-string.
> > +It's actual value is never used, but must be one character long.")
> > +(put-text-property 0 1 'display
> > + `((margin left-margin) ,compilation-margin-string)
> > + compilation-dummy-string)
> I'd suggest you use a "compilation--" prefix here since this is supposed
> to be internal, IIUC.
DONE.
> Also, I'd do it as
> (defvar compilation--dummy-string
> (propertize ">" 'display
> `((margin left-margin) ,compilation-margin-string))
> "A string which is only a placeholder for `compilation-margin-string'.
> Its actual value is never used, but must be one character long.")
> so you can M-C-x it without ill-effect [note I also fixed "It's" to
> "Its" and added `...' around the var ref. ]
Thanks. I've made it a defconst, too.
> > +(defun compilation-tear-down-arrow-spec-in-margin ()
> > + "Restore compilation-arrow-overlay to not using the margin, which is
> > removed."
> > + (overlay-put compilation-arrow-overlay 'before-string nil)
> > + (delete-overlay compilation-arrow-overlay)
> > + (setq compilation-arrow-overlay nil)
> I think this `setq` loses the overlay and there's no code to reconstruct
> it later on.
Actually, it got reconstructed in compilation-set-overlay-arrow, which
was suboptimal. I've moved this bit to
compilation-set-up-arrow-spec-in-margin, which is where it should have
been all along.
> > + (set-window-margins (selected-window) 0))
> Of course, the main problem with this approach is that "margins don't
> compose": any other package using the margins (e.g. (n)linum) will tend
> to interfere with your own use.
I've amended this to add or subtract 2 to/from the current margin width,
rather than setting an absolute width.
> > + (with-selected-window w ; So the later `goto-char' will work.
> An alternative is to use `set-window-point` instead of `goto-char`.
Maybe. But I'm already using (selected-window) in a couple of places,
so I think I'll just leave this.
> Stefan
Here's the current version of the patch. Any objections to me
committing it?
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 09188dc14b..c30908ea01 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2602,45 +2602,69 @@ compilation-set-window
(point)))
(set-window-point w mk))))
-(defvar-local overlay-arrow-overlay nil
+(defvar-local compilation-arrow-overlay nil
"Overlay with the before-string property of `overlay-arrow-string'.
When non-nil, this overlay causes redisplay to display `overlay-arrow-string'
at the overlay's start position.")
+(defvar compilation-margin-string "=>"
+ "The string which will appear in the margin in compilation mode.
+This must be two characters long; there should be no need to
+change the default.")
+(put-text-property 0 2 'face 'default compilation-margin-string)
+
+(defconst compilation--dummy-string
+ (propertize ">" 'display
+ `((margin left-margin) ,compilation-margin-string))
+ "A string which is only a placeholder for compilation-margin-string.
+Actual value is never used, only the text property.")
+
+(defun compilation-set-up-arrow-spec-in-margin ()
+ "Set up compilation-arrow-overlay to display as an arrow in a margin."
+ (setq overlay-arrow-string "")
+ (setq compilation-arrow-overlay
+ (make-overlay overlay-arrow-position overlay-arrow-position))
+ (overlay-put compilation-arrow-overlay
+ 'before-string compilation--dummy-string)
+ (set-window-margins (selected-window) (+ (or (car (window-margins)) 0) 2)))
+
+(defun compilation-tear-down-arrow-spec-in-margin ()
+ "Restore compilation-arrow-overlay to not using the margin, which is
removed."
+ (overlay-put compilation-arrow-overlay 'before-string nil)
+ (delete-overlay compilation-arrow-overlay)
+ (setq compilation-arrow-overlay nil)
+ (set-window-margins (selected-window) (- (car (window-margins)) 2)))
+
(defun compilation-set-overlay-arrow (w)
"Set up, or switch off, the overlay-arrow for window W."
- (with-current-buffer (window-buffer w)
- (if (and (eq compilation-context-lines t)
- (equal (car (window-fringes w)) 0)) ; No left fringe
- ;; Insert a "=>" before-string overlay at the beginning of the
- ;; line pointed to by `overlay-arrow-position'.
- (cond
- ((overlayp overlay-arrow-overlay)
- (when (not (eq (overlay-start overlay-arrow-overlay)
- overlay-arrow-position))
- (if overlay-arrow-position
- (progn
- (move-overlay overlay-arrow-overlay
- overlay-arrow-position overlay-arrow-position)
- (setq overlay-arrow-string "=>")
- (overlay-put overlay-arrow-overlay
- 'before-string overlay-arrow-string))
- (delete-overlay overlay-arrow-overlay)
- (setq overlay-arrow-overlay nil))))
-
- (overlay-arrow-position
- (setq overlay-arrow-overlay
- (make-overlay overlay-arrow-position overlay-arrow-position))
- (setq overlay-arrow-string "=>")
- (overlay-put overlay-arrow-overlay 'before-string
overlay-arrow-string)))
-
- ;; `compilation-context-lines' isn't t, or we've got a left
- ;; fringe, so remove any overlay arrow.
- (when (overlayp overlay-arrow-overlay)
- (setq overlay-arrow-string "")
- (delete-overlay overlay-arrow-overlay)
- (setq overlay-arrow-overlay nil)))))
+ (with-selected-window w ; So the later `goto-char' will work.
+ (with-current-buffer (window-buffer w)
+ (if (and (eq compilation-context-lines t)
+ (equal (car (window-fringes w)) 0)) ; No left fringe
+ ;; Insert a before-string overlay at the beginning of the line
+ ;; pointed to by `overlay-arrow-position', such that it will
+ ;; display in a 2-character margin.
+ (progn
+ (cond
+ ((overlayp compilation-arrow-overlay)
+ (when (not (eq (overlay-start compilation-arrow-overlay)
+ overlay-arrow-position))
+ (if overlay-arrow-position
+ (move-overlay compilation-arrow-overlay
+ overlay-arrow-position overlay-arrow-position)
+ (compilation-tear-down-arrow-spec-in-margin))))
+
+ (overlay-arrow-position
+ (compilation-set-up-arrow-spec-in-margin)))
+ ;; Ensure that the "=>" remains in the window by causing
+ ;; the window to be scrolled, if needed.
+ (goto-char (overlay-start compilation-arrow-overlay)))
+
+ ;; `compilation-context-lines' isn't t, or we've got a left
+ ;; fringe, so remove any overlay arrow.
+ (when (overlayp compilation-arrow-overlay)
+ (compilation-tear-down-arrow-spec-in-margin))))))
(defvar next-error-highlight-timer)
--
Alan Mackenzie (Nuremberg, Germany).
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, (continued)
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Alan Mackenzie, 2019/08/26
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Eli Zaretskii, 2019/08/26
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Alan Mackenzie, 2019/08/27
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Eli Zaretskii, 2019/08/29
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Alan Mackenzie, 2019/08/31
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Eli Zaretskii, 2019/08/31
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Alan Mackenzie, 2019/08/27
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Eli Zaretskii, 2019/08/27
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Stefan Monnier, 2019/08/27
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Stefan Monnier, 2019/08/27
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling,
Alan Mackenzie <=
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, martin rudalics, 2019/08/31
- Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Alan Mackenzie, 2019/08/31
Re: [Emacs-diffs] master 29d1c72: Introduce new value t for compilation-context-lines to eliminate scrolling, Stefan Monnier, 2019/08/25