mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-21 18:23:59 +00:00
Code Issues Releases Activity

Make help-at-point stuff also look just before point

Browse Source
This commit is contained in:
Daniel Colascione 2014-02-02 14:21:33 -08:00
parent 99f7b0a6d6
commit 709085b93d
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2014-02-02 Daniel Colascione <dancol@dancol.org>
* help-at-pt.el (help-at-pt-string,help-at-pt-maybe-display): Also
try to display local help from just before point.
2014-02-02 Alan Mackenzie <bug-cc-mode@gnu.org>
c-parse-state. Don't "append-lower-brace-pair" in certain

27
lisp/help-at-pt.el
View File

@ -61,13 +61,18 @@ property, or nil, is returned.
If KBD is non-nil, `kbd-help' is used instead, and any
`help-echo' property is ignored. In this case, the return value
can also be t, if that is the value of the `kbd-help' property."
(let* ((prop (if kbd 'kbd-help 'help-echo))
(pair (get-char-property-and-overlay (point) prop))
(val (car pair))
(ov (cdr pair)))
(if (functionp val)
(funcall val (selected-window) (if ov ov (current-buffer)) (point))
(eval val))))
(save-excursion
(let* ((prop (if kbd 'kbd-help 'help-echo))
(pair (get-char-property-and-overlay (point) prop))
(pair (if (car pair) pair
(unless (bobp)
(backward-char)
(get-char-property-and-overlay (point) prop))))
(val (car pair))
(ov (cdr pair)))
(if (functionp val)
(funcall val (selected-window) (if ov ov (current-buffer)) (point))
(eval val)))))
;;;###autoload
(defun help-at-pt-kbd-string ()
@ -235,7 +240,13 @@ properties, to enable buffer local values."
(catch 'found
(dolist (prop help-at-pt-display-when-idle)
(if (get-char-property (point) prop)
(throw 'found t))))))
(throw 'found t)))
(unless (bobp)
(save-excursion
(backward-char)
(dolist (prop help-at-pt-display-when-idle)
(if (get-char-property (point) prop)
(throw 'found t))))))))
(or (not (current-message))
(string= (current-message) "Quit"))
(display-local-help t)))