diff options
| author | Gerd Moellmann | 2002-04-12 09:40:56 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2002-04-12 09:40:56 +0000 |
| commit | f03b7c7d8a8328bc36e19958616dc78f28fe2bac (patch) | |
| tree | daf449760792efef25d5779211ddf738834d38dd | |
| parent | db1db309387c253d42ea86465b21acc086120a92 (diff) | |
| download | emacs-f03b7c7d8a8328bc36e19958616dc78f28fe2bac.tar.gz emacs-f03b7c7d8a8328bc36e19958616dc78f28fe2bac.zip | |
(string-key-binding): Deal with margin events.
| -rw-r--r-- | lisp/help.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/help.el b/lisp/help.el index a11bc81008d..d47504526d6 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; help.el --- help commands for Emacs | 1 | ;;; help.el --- help commands for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001 | 3 | ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002 |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| @@ -433,7 +433,8 @@ If KEY is an event on a string, and that string has a `local-map' | |||
| 433 | or `keymap' property, return the binding of KEY in the string's keymap." | 433 | or `keymap' property, return the binding of KEY in the string's keymap." |
| 434 | (let* ((defn nil) | 434 | (let* ((defn nil) |
| 435 | (start (when (vectorp key) | 435 | (start (when (vectorp key) |
| 436 | (if (memq (aref key 0) '(mode-line header-line)) | 436 | (if (memq (aref key 0) |
| 437 | '(mode-line header-line left-margin right-margin)) | ||
| 437 | (event-start (aref key 1)) | 438 | (event-start (aref key 1)) |
| 438 | (and (consp (aref key 0)) | 439 | (and (consp (aref key 0)) |
| 439 | (event-start (aref key 0)))))) | 440 | (event-start (aref key 0)))))) |
| @@ -441,7 +442,7 @@ or `keymap' property, return the binding of KEY in the string's keymap." | |||
| 441 | (when string-info | 442 | (when string-info |
| 442 | (let* ((string (car string-info)) | 443 | (let* ((string (car string-info)) |
| 443 | (pos (cdr string-info)) | 444 | (pos (cdr string-info)) |
| 444 | (local-map (and (> pos 0) | 445 | (local-map (and (>= pos 0) |
| 445 | (< pos (length string)) | 446 | (< pos (length string)) |
| 446 | (or (get-text-property pos 'local-map string) | 447 | (or (get-text-property pos 'local-map string) |
| 447 | (get-text-property pos 'keymap string))))) | 448 | (get-text-property pos 'keymap string))))) |