[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 3071cec 2/5: Backport: Don't let item decoration be disrupted b
From: |
ken manheimer |
Subject: |
emacs-27 3071cec 2/5: Backport: Don't let item decoration be disrupted by too-shallow items. |
Date: |
Mon, 20 Jul 2020 14:33:42 -0400 (EDT) |
branch: emacs-27
commit 3071cecda070b0a4808eeca8009a5dc088606ec6
Author: Ken Manheimer <ken.manheimer@gmail.com>
Commit: Ken Manheimer <ken.manheimer@gmail.com>
Backport: Don't let item decoration be disrupted by too-shallow items.
* lisp/allout-widgets.el (allout-decorate-item-and-context): Check for
parent-position having value before using it.
Also, shift local emacs vars topic deeper so it doesn't constitute
an instance of that particular aberrant case.
(cherry picked from commit 8684216542889fa57daa32072104afc69785907f)
---
lisp/allout-widgets.el | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 3c6a05c..e7750b3 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -1594,7 +1594,10 @@ We return the item-widget corresponding to the item at
point."
(if is-container
(progn (widget-put item-widget :is-container t)
(setq reverse-siblings-chart (list 1)))
- (goto-char (widget-apply parent :actual-position :from))
+ (let ((parent-position (widget-apply parent
+ :actual-position :from)))
+ (when parent-position
+ (goto-char parent-position)))
(if (widget-get parent :is-container)
;; `allout-goto-prefix' will go to first non-container item:
(allout-goto-prefix)
@@ -2388,7 +2391,7 @@ The elements of LIST are not copied, just the list
structure itself."
;;;_ : provide
(provide 'allout-widgets)
-;;;_. Local emacs vars.
-;;;_ , Local variables:
-;;;_ , allout-layout: (-1 : 0)
-;;;_ , End:
+;;;_ . Local emacs vars.
+;;;_ , Local variables:
+;;;_ , allout-layout: (-1 : 0)
+;;;_ , End:
- emacs-27 updated (cd93deb -> bc10e46), ken manheimer, 2020/07/20
- emacs-27 3071cec 2/5: Backport: Don't let item decoration be disrupted by too-shallow items.,
ken manheimer <=
- emacs-27 2035ecc 3/5: Backport: Provide missing let definition to prevent background void-variable error., ken manheimer, 2020/07/20
- emacs-27 044960e 1/5: Backport: Fix allout-widgets-mode handling of edits to item cue, fixing (bug#11312), ken manheimer, 2020/07/20
- emacs-27 bc10e46 5/5: Backport: Rectify allout-widgets region undecoration so item at start is not missed., ken manheimer, 2020/07/20
- emacs-27 82742e2 4/5: Backport: Resolve missing button-region keymap bindings., ken manheimer, 2020/07/20