aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron S. Hawley2013-01-11 18:08:55 -0500
committerStefan Monnier2013-01-11 18:08:55 -0500
commit9fc9a531a5938e870339211de6c0ecfedaa1c86b (patch)
tree280a70217061f58021f7174c6f9aa33e8e460a00 /src
parentab7c80f1b852315bee704ff2c9a80aa273cb636a (diff)
downloademacs-9fc9a531a5938e870339211de6c0ecfedaa1c86b.tar.gz
emacs-9fc9a531a5938e870339211de6c0ecfedaa1c86b.zip
Disambiguate function and variable references in docstrings.
* lisp/comint.el (comint-history-isearch-message): Fix ambiguous doc string cross-reference(s). * lisp/ffap.el (ffap-string-at-point-region, ffap-next) (ffap-string-at-point, ffap-string-around) (ffap-copy-string-as-kill, ffap-highlight-overlay) (ffap-literally): Fix ambiguous doc string cross-reference(s). * lisp/font-lock.el (font-lock-keywords-alist) (font-lock-removed-keywords-alist): Fix ambiguous doc string cross-reference(s). * lisp/help-mode.el (help-xref-symbol-regexp): Add "call" as a hint for a cross-reference to a function. * lisp/info.el (Info-find-emacs-command-nodes): Fix ambiguous doc string cross-reference(s). * lisp/isearch.el (isearch-message-function, isearch-fail-pos): Fix ambiguous doc string cross-reference(s). * lisp/misearch.el (multi-isearch-next-buffer-function): Fix ambiguous doc string cross-reference(s). * lisp/newcomment.el (comment-box): Fix ambiguous doc string cross-reference(s). * lisp/printing.el (pr-txt-printer-alist, pr-ps-printer-alist) (pr-setting-database): Fix ambiguous doc string cross-reference(s). * lisp/ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces) (ps-n-up-filling-database): Fix ambiguous doc string cross-reference(s). * lisp/server.el (server-buffer, server-log): Fix ambiguous doc string cross-reference(s). * lisp/simple.el (newline, delete-backward-char, delete-forward-char) (minibuffer-history-isearch-message, kill-line, track-eol) (temporary-goal-column): Fix ambiguous doc string cross-reference(s). * lisp/whitespace.el (whitespace-point) (whitespace-font-lock-refontify, whitespace-bob-marker) (whitespace-eob-marker): Fix ambiguous doc string cross-reference(s). * lisp/calc/calc.el (calc-highlight-selections-with-faces) (calc-dispatch): Fix ambiguous doc string cross-reference(s). * lisp/emacs-lisp/edebug.el (edebug-read, edebug-eval-defun): Fix ambiguous doc string cross-reference(s). * lisp/gnus/gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string cross-reference(s). * lisp/gnus/gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string cross-reference(s). * lisp/international/mule.el (add-to-coding-system-list): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/cc-fonts.el (c-font-lock-keywords-3) (c++-font-lock-keywords-3, objc-font-lock-keywords-3) (java-font-lock-keywords-3, idl-font-lock-keywords-3) (pike-font-lock-keywords-3): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/compile.el (compile): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/etags.el (tags-table-files) (tags-table-files-function, tags-included-tables-function): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/gdb-mi.el (gdb, gdb-setup-windows) (gdb-restore-windows): Fix ambiguous doc string cross-reference(s). * lisp/textmodes/flyspell.el (flyspell-mark-duplications-flag) (flyspell-default-deplacement-commands): Fix ambiguous doc string cross-reference(s). * lisp/textmodes/ispell.el (ispell-accept-output): Fix ambiguous doc string cross-reference(s). * lisp/textmodes/sgml-mode.el (html-tag-help): Fix ambiguous doc string cross-reference(s). * lisp/vc/compare-w.el (compare-ignore-whitespace) (compare-ignore-case, compare-windows-dehighlight): Fix ambiguous doc string cross-reference(s). * lisp/vc/diff.el (diff): Fix ambiguous doc string cross-reference(s). * src/insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix ambiguous doc string cross-reference(s). * src/keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous doc string cross-reference(s). * src/window.c (Fwindow_point, syms_of_window): Fix ambiguous doc string cross-reference(s). Fixes: debbugs:12686
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
-rw-r--r--src/insdel.c4
-rw-r--r--src/keyboard.c6
-rw-r--r--src/window.c5
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 @@
12013-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
12013-01-11 Dmitry Antipov <dmantipov@yandex.ru> 122013-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
2085DEFUN ("combine-after-change-execute", Fcombine_after_change_execute, 2085DEFUN ("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.
10171CMD must be a symbol that satisfies the `commandp' predicate. 10171CMD must be a symbol that satisfies the `commandp' predicate.
10172Optional second arg RECORD-FLAG non-nil 10172Optional second arg RECORD-FLAG non-nil
10173means unconditionally put this command in `command-history'. 10173means unconditionally put this command in the variable `command-history'.
10174Otherwise, that is done only if an arg is read using the minibuffer. 10174Otherwise, that is done only if an arg is read using the minibuffer.
10175The argument KEYS specifies the value to use instead of (this-command-keys) 10175The argument KEYS specifies the value to use instead of (this-command-keys)
10176when reading the arguments; if it is nil, (this-command-keys) is used. 10176when 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.
12057If `select-active-regions' is non-nil, Emacs sets this to the 12057If `select-active-regions' is non-nil, Emacs sets this to the
12058text in the region before modifying the buffer. The next 12058text in the region before modifying the buffer. The next call to
12059`deactivate-mark' call uses this to set the window selection. */); 12059the 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
1437Note that, when WINDOW is selected, the value returned is the same as 1437Note that, when WINDOW is selected, the value returned is the same as
1438that returned by `point' for WINDOW's buffer. It would be more strictly 1438that returned by `point' for WINDOW's buffer. It would be more strictly
1439correct to return the `top-level' value of `point', outside of any 1439correct 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
6794Other values are reserved for future use. 6794Other values are reserved for future use.
6795 6795
6796This variable takes no effect if `window-combination-limit' is non-nil. */); 6796This variable takes no effect if the variable `window-combination-limit' is
6797non-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,