Mercurial > emacs
comparison src/keymap.c @ 12262:a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Check Voverriding_terminal_local_map before Voverriding_local_map.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Fri, 16 Jun 1995 05:24:27 +0000 |
| parents | 43b030e896eb |
| children | fe458a8ecfa2 |
comparison
equal
deleted
inserted
replaced
| 12261:cd2e7821bbf5 | 12262:a7d5578ebb25 |
|---|---|
| 885 int nmaps, i; | 885 int nmaps, i; |
| 886 struct gcpro gcpro1; | 886 struct gcpro gcpro1; |
| 887 | 887 |
| 888 GCPRO1 (key); | 888 GCPRO1 (key); |
| 889 | 889 |
| 890 if (!NILP (Voverriding_local_map)) | 890 if (!NILP (current_kboard->Voverriding_terminal_local_map)) |
| 891 { | |
| 892 value = Flookup_key (current_kboard->Voverriding_terminal_local_map, | |
| 893 key, accept_default); | |
| 894 if (! NILP (value) && !INTEGERP (value)) | |
| 895 RETURN_UNGCPRO (value); | |
| 896 } | |
| 897 else if (!NILP (Voverriding_local_map)) | |
| 891 { | 898 { |
| 892 value = Flookup_key (Voverriding_local_map, key, accept_default); | 899 value = Flookup_key (Voverriding_local_map, key, accept_default); |
| 893 if (! NILP (value) && !INTEGERP (value)) | 900 if (! NILP (value) && !INTEGERP (value)) |
| 894 RETURN_UNGCPRO (value); | 901 RETURN_UNGCPRO (value); |
| 895 } | 902 } |
| 1841 Lisp_Object *modes, *maps; | 1848 Lisp_Object *modes, *maps; |
| 1842 | 1849 |
| 1843 /* Temporarily switch to descbuf, so that we can get that buffer's | 1850 /* Temporarily switch to descbuf, so that we can get that buffer's |
| 1844 minor modes correctly. */ | 1851 minor modes correctly. */ |
| 1845 Fset_buffer (descbuf); | 1852 Fset_buffer (descbuf); |
| 1846 if (!NILP (Voverriding_local_map)) | 1853 if (!NILP (current_kboard->Voverriding_terminal_local_map) |
| 1854 || !NILP (Voverriding_local_map)) | |
| 1847 nmaps = 0; | 1855 nmaps = 0; |
| 1848 else | 1856 else |
| 1849 nmaps = current_minor_maps (&modes, &maps); | 1857 nmaps = current_minor_maps (&modes, &maps); |
| 1850 Fset_buffer (Vstandard_output); | 1858 Fset_buffer (Vstandard_output); |
| 1851 | 1859 |
| 1875 shadow = Fcons (maps[i], shadow); | 1883 shadow = Fcons (maps[i], shadow); |
| 1876 } | 1884 } |
| 1877 } | 1885 } |
| 1878 | 1886 |
| 1879 /* Print the (major mode) local map. */ | 1887 /* Print the (major mode) local map. */ |
| 1880 if (!NILP (Voverriding_local_map)) | 1888 if (!NILP (current_kboard->Voverriding_terminal_local_map)) |
| 1889 start1 = current_kboard->Voverriding_terminal_local_map; | |
| 1890 else if (!NILP (Voverriding_local_map)) | |
| 1881 start1 = Voverriding_local_map; | 1891 start1 = Voverriding_local_map; |
| 1882 else | 1892 else |
| 1883 start1 = XBUFFER (descbuf)->keymap; | 1893 start1 = XBUFFER (descbuf)->keymap; |
| 1884 | 1894 |
| 1885 if (!NILP (start1)) | 1895 if (!NILP (start1)) |