diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 2009-12-03 00:24:11 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 2009-12-03 00:24:11 +0000 |
| commit | e19e6d8c98141f52852eb84eb222a524a82481e2 (patch) | |
| tree | 14ccef4fdf9bc59791b9fa5805edac8297bad698 /generic/pg-user.el | |
| parent | b345b5a20680046d40fd99f8844be3b35dbb0726 (diff) | |
Rework script span element hiding to avoid buffer-invisibility-spec. Add command elements.
Diffstat (limited to 'generic/pg-user.el')
| -rw-r--r-- | generic/pg-user.el | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/generic/pg-user.el b/generic/pg-user.el index 198f7fe9..f3dbd755 100644 --- a/generic/pg-user.el +++ b/generic/pg-user.el @@ -806,18 +806,18 @@ If NUM is negative, move upwards. Return new span." (defun pg-span-context-menu (event) (interactive "e") - (let ((span (pg-span-for-event event)) - cspan) - ;; Find controlling span - (while (setq cspan (span-property span 'controlspan)) - (setq span cspan)) - (let* - ((idiom (and span (span-property span 'idiom))) - (id (and span (span-property span 'id)))) - (popup-menu (pg-create-in-span-context-menu - span - (if idiom (symbol-name idiom)) - (if id (symbol-name id))))))) + (let* ((span (pg-span-for-event event)) + cspan) + (when span + ;; Find controlling span + (while (setq cspan (span-property span 'controlspan)) + (setq span cspan)) + (let* + ((idiom (and span (span-property span 'idiom))) + (id (and span (span-property span 'id)))) + (popup-menu (pg-create-in-span-context-menu + span idiom + (if id (symbol-name id)))))))) (defun pg-toggle-visibility () "Toggle visibility of region under point." @@ -826,8 +826,7 @@ If NUM is negative, move upwards. Return new span." (idiom (and span (span-property span 'idiom))) (id (and span (span-property span 'id)))) (and idiom id - (pg-toggle-element-visibility (symbol-name idiom) (symbol-name id))))) - + (pg-toggle-element-visibility idiom (symbol-name id))))) (defun pg-create-in-span-context-menu (span idiom name) "Create the dynamic context-sensitive menu for a span." @@ -839,12 +838,11 @@ If NUM is negative, move upwards. Return new span." (append (list (pg-span-name span)) (list (vector - "Show/hide" - (if idiom (list `pg-toggle-element-visibility idiom name) - idiom) + "Show/hide" + (if idiom (list 'pg-toggle-element-visibility (quote idiom) name)) (not (not idiom)))) (list (vector - "Copy" (list 'pg-copy-span-contents span) t)) + "Copy" (list 'pg-copy-span-contents span) t)) (list (vector "Undo" (list 'pg-span-undo span) t)) |