diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 11 | ||||
| -rw-r--r-- | src/insdel.c | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 6 | ||||
| -rw-r--r-- | src/window.c | 5 |
4 files changed, 19 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 13a1f1a3858..01862b689f8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2013-01-11 Aaron S. Hawley <Aaron.Hawley@vtinfo.com> | ||
| 2 | |||
| 3 | * insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix | ||
| 4 | ambiguous doc string cross-reference(s). | ||
| 5 | |||
| 6 | * keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous | ||
| 7 | doc string cross-reference(s). | ||
| 8 | |||
| 9 | * window.c (Fwindow_point, syms_of_window): Fix ambiguous doc | ||
| 10 | string cross-reference(s). | ||
| 11 | |||
| 1 | 2013-01-11 Dmitry Antipov <dmantipov@yandex.ru> | 12 | 2013-01-11 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 13 | ||
| 3 | Avoid unnecessary byte position calculation for the gap movement. | 14 | Avoid unnecessary byte position calculation for the gap movement. |
diff --git a/src/insdel.c b/src/insdel.c index c2a3cd42821..303247816ca 100644 --- a/src/insdel.c +++ b/src/insdel.c | |||
| @@ -2084,7 +2084,7 @@ Fcombine_after_change_execute_1 (Lisp_Object val) | |||
| 2084 | 2084 | ||
| 2085 | DEFUN ("combine-after-change-execute", Fcombine_after_change_execute, | 2085 | DEFUN ("combine-after-change-execute", Fcombine_after_change_execute, |
| 2086 | Scombine_after_change_execute, 0, 0, 0, | 2086 | Scombine_after_change_execute, 0, 0, 0, |
| 2087 | doc: /* This function is for use internally in `combine-after-change-calls'. */) | 2087 | doc: /* This function is for use internally in the function `combine-after-change-calls'. */) |
| 2088 | (void) | 2088 | (void) |
| 2089 | { | 2089 | { |
| 2090 | ptrdiff_t count = SPECPDL_INDEX (); | 2090 | ptrdiff_t count = SPECPDL_INDEX (); |
| @@ -2176,7 +2176,7 @@ syms_of_insdel (void) | |||
| 2176 | combine_after_change_buffer = Qnil; | 2176 | combine_after_change_buffer = Qnil; |
| 2177 | 2177 | ||
| 2178 | DEFVAR_LISP ("combine-after-change-calls", Vcombine_after_change_calls, | 2178 | DEFVAR_LISP ("combine-after-change-calls", Vcombine_after_change_calls, |
| 2179 | doc: /* Used internally by the `combine-after-change-calls' macro. */); | 2179 | doc: /* Used internally by the function `combine-after-change-calls' macro. */); |
| 2180 | Vcombine_after_change_calls = Qnil; | 2180 | Vcombine_after_change_calls = Qnil; |
| 2181 | 2181 | ||
| 2182 | DEFVAR_BOOL ("inhibit-modification-hooks", inhibit_modification_hooks, | 2182 | DEFVAR_BOOL ("inhibit-modification-hooks", inhibit_modification_hooks, |
diff --git a/src/keyboard.c b/src/keyboard.c index 14aecd00e90..7594a4f72fc 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -10170,7 +10170,7 @@ DEFUN ("command-execute", Fcommand_execute, Scommand_execute, 1, 4, 0, | |||
| 10170 | doc: /* Execute CMD as an editor command. | 10170 | doc: /* Execute CMD as an editor command. |
| 10171 | CMD must be a symbol that satisfies the `commandp' predicate. | 10171 | CMD must be a symbol that satisfies the `commandp' predicate. |
| 10172 | Optional second arg RECORD-FLAG non-nil | 10172 | Optional second arg RECORD-FLAG non-nil |
| 10173 | means unconditionally put this command in `command-history'. | 10173 | means unconditionally put this command in the variable `command-history'. |
| 10174 | Otherwise, that is done only if an arg is read using the minibuffer. | 10174 | Otherwise, that is done only if an arg is read using the minibuffer. |
| 10175 | The argument KEYS specifies the value to use instead of (this-command-keys) | 10175 | The argument KEYS specifies the value to use instead of (this-command-keys) |
| 10176 | when reading the arguments; if it is nil, (this-command-keys) is used. | 10176 | when reading the arguments; if it is nil, (this-command-keys) is used. |
| @@ -12055,8 +12055,8 @@ This takes effect only when Transient Mark mode is enabled. */); | |||
| 12055 | Vsaved_region_selection, | 12055 | Vsaved_region_selection, |
| 12056 | doc: /* Contents of active region prior to buffer modification. | 12056 | doc: /* Contents of active region prior to buffer modification. |
| 12057 | If `select-active-regions' is non-nil, Emacs sets this to the | 12057 | If `select-active-regions' is non-nil, Emacs sets this to the |
| 12058 | text in the region before modifying the buffer. The next | 12058 | text in the region before modifying the buffer. The next call to |
| 12059 | `deactivate-mark' call uses this to set the window selection. */); | 12059 | the function `deactivate-mark' uses this to set the window selection. */); |
| 12060 | Vsaved_region_selection = Qnil; | 12060 | Vsaved_region_selection = Qnil; |
| 12061 | 12061 | ||
| 12062 | DEFVAR_LISP ("selection-inhibit-update-commands", | 12062 | DEFVAR_LISP ("selection-inhibit-update-commands", |
diff --git a/src/window.c b/src/window.c index 0e5ba04bb98..e60b9e8967d 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1436,7 +1436,7 @@ window were selected. | |||
| 1436 | 1436 | ||
| 1437 | Note that, when WINDOW is selected, the value returned is the same as | 1437 | Note that, when WINDOW is selected, the value returned is the same as |
| 1438 | that returned by `point' for WINDOW's buffer. It would be more strictly | 1438 | that returned by `point' for WINDOW's buffer. It would be more strictly |
| 1439 | correct to return the `top-level' value of `point', outside of any | 1439 | correct to return the top-level value of `point', outside of any |
| 1440 | `save-excursion' forms. But that is hard to define. */) | 1440 | `save-excursion' forms. But that is hard to define. */) |
| 1441 | (Lisp_Object window) | 1441 | (Lisp_Object window) |
| 1442 | { | 1442 | { |
| @@ -6793,7 +6793,8 @@ same combination. | |||
| 6793 | 6793 | ||
| 6794 | Other values are reserved for future use. | 6794 | Other values are reserved for future use. |
| 6795 | 6795 | ||
| 6796 | This variable takes no effect if `window-combination-limit' is non-nil. */); | 6796 | This variable takes no effect if the variable `window-combination-limit' is |
| 6797 | non-nil. */); | ||
| 6797 | Vwindow_combination_resize = Qnil; | 6798 | Vwindow_combination_resize = Qnil; |
| 6798 | 6799 | ||
| 6799 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, | 6800 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, |