diff options
| author | Daniel Colascione <dancol@dancol.org> | 2014-02-02 14:21:33 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2014-02-02 14:21:33 -0800 |
| commit | 709085b93dab36c23e36502242a1e40806f8d1cf (patch) | |
| tree | 99478a854ea0abe7bc3e0da431a9f8f3e9f1b5e7 | |
| parent | 99f7b0a6d66398d87368448346de104fe8b6531b (diff) | |
| download | emacs-709085b93dab36c23e36502242a1e40806f8d1cf.tar.gz | |
Make help-at-point stuff also look just before point
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help-at-pt.el | 27 |
2 files changed, 24 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 737f54d41e3..9b692283d96 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el index 15db502062c..7f424f7f3ac 100644 --- a/lisp/help-at-pt.el +++ b/lisp/help-at-pt.el @@ -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))) |