diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/doc.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 2 |
1 files changed, 0 insertions, 2 deletions
| @@ -35,8 +35,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 35 | #include "keyboard.h" | 35 | #include "keyboard.h" |
| 36 | #include "keymap.h" | 36 | #include "keymap.h" |
| 37 | 37 | ||
| 38 | Lisp_Object Qfunction_documentation; | ||
| 39 | |||
| 40 | /* Buffer used for reading from documentation file. */ | 38 | /* Buffer used for reading from documentation file. */ |
| 41 | static char *get_doc_string_buffer; | 39 | static char *get_doc_string_buffer; |
| 42 | static ptrdiff_t get_doc_string_buffer_size; | 40 | static ptrdiff_t get_doc_string_buffer_size; |