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/buffer.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/buffer.h b/src/buffer.h index 1b2b5b6a1b1..81852cae505 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1141,12 +1141,6 @@ record_unwind_current_buffer (void) | |||
| 1141 | } while (false) | 1141 | } while (false) |
| 1142 | 1142 | ||
| 1143 | extern Lisp_Object Vbuffer_alist; | 1143 | extern Lisp_Object Vbuffer_alist; |
| 1144 | extern Lisp_Object Qbefore_change_functions; | ||
| 1145 | extern Lisp_Object Qafter_change_functions; | ||
| 1146 | extern Lisp_Object Qfirst_change_hook; | ||
| 1147 | extern Lisp_Object Qpriority, Qbefore_string, Qafter_string; | ||
| 1148 | extern Lisp_Object Qchoice, Qrange, Qleft, Qright; | ||
| 1149 | extern Lisp_Object Qvertical_scroll_bar, Qhorizontal_scroll_bar; | ||
| 1150 | 1144 | ||
| 1151 | /* FOR_EACH_LIVE_BUFFER (LIST_VAR, BUF_VAR) followed by a statement is | 1145 | /* FOR_EACH_LIVE_BUFFER (LIST_VAR, BUF_VAR) followed by a statement is |
| 1152 | a `for' loop which iterates over the buffers from Vbuffer_alist. */ | 1146 | a `for' loop which iterates over the buffers from Vbuffer_alist. */ |