diff options
| author | Charles A. Roelli | 2017-10-31 22:01:34 +0100 |
|---|---|---|
| committer | Charles A. Roelli | 2017-10-31 22:01:34 +0100 |
| commit | 460fe4a1bc40f2ba39deda6448a7baf57e0e6b76 (patch) | |
| tree | b0aa0fc60218835141122f5e5d054458bee57f40 | |
| parent | 41adf3281ef6386c539f1fb9d36c4fb3f643b77c (diff) | |
| download | emacs-460fe4a1bc40f2ba39deda6448a7baf57e0e6b76.tar.gz emacs-460fe4a1bc40f2ba39deda6448a7baf57e0e6b76.zip | |
; Doc fixes
* lisp/progmodes/xref.el (xref-file-location)
(xref-backend-apropos):
* etc/NEWS (Lisp Changes in Emacs 26.1):
* doc/emacs/msdos.texi (Windows Keyboard):
* lisp/vc/vc.el (vc-print-branch-log):
* src/buffer.c (word-wrap): Doc additions and fixes.
| -rw-r--r-- | doc/emacs/msdos.texi | 2 | ||||
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/progmodes/xref.el | 5 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 1 | ||||
| -rw-r--r-- | src/buffer.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi index 356936504ec..dd2004fbb00 100644 --- a/doc/emacs/msdos.texi +++ b/doc/emacs/msdos.texi | |||
| @@ -580,7 +580,7 @@ pressed the @key{Shift} key while typing the non-character key. | |||
| 580 | @vindex w32-enable-caps-lock | 580 | @vindex w32-enable-caps-lock |
| 581 | If the variable @code{w32-enable-caps-lock} is set to a @code{nil} | 581 | If the variable @code{w32-enable-caps-lock} is set to a @code{nil} |
| 582 | value, the @key{CapsLock} key produces the symbol @code{capslock} | 582 | value, the @key{CapsLock} key produces the symbol @code{capslock} |
| 583 | instead of the shifted version of they keys. The default value is | 583 | instead of the shifted version of typed keys. The default value is |
| 584 | @code{t}. | 584 | @code{t}. |
| 585 | 585 | ||
| 586 | @vindex w32-enable-num-lock | 586 | @vindex w32-enable-num-lock |
| @@ -1692,7 +1692,7 @@ job of signaling list cycles instead of looping indefinitely. | |||
| 1692 | 1692 | ||
| 1693 | +++ | 1693 | +++ |
| 1694 | ** The new functions 'make-nearby-temp-file' and 'temporary-file-directory' | 1694 | ** The new functions 'make-nearby-temp-file' and 'temporary-file-directory' |
| 1695 | can be used for creation of temporary files of remote or mounted directories. | 1695 | can be used for creation of temporary files on remote or mounted directories. |
| 1696 | 1696 | ||
| 1697 | +++ | 1697 | +++ |
| 1698 | ** On GNU platforms when operating on a local file, 'file-attributes' | 1698 | ** On GNU platforms when operating on a local file, 'file-attributes' |
| @@ -1720,7 +1720,7 @@ operating recursively and when some other process deletes the directory | |||
| 1720 | or its files before 'delete-directory' gets to them. | 1720 | or its files before 'delete-directory' gets to them. |
| 1721 | 1721 | ||
| 1722 | +++ | 1722 | +++ |
| 1723 | *** New error type 'user-search-failed' like 'search-failed' but | 1723 | ** New error type 'user-search-failed' like 'search-failed' but |
| 1724 | avoids debugger like 'user-error'. | 1724 | avoids debugger like 'user-error'. |
| 1725 | 1725 | ||
| 1726 | +++ | 1726 | +++ |
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 80cdcb3f18b..3dbf65ef6f5 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el | |||
| @@ -102,7 +102,7 @@ This is typically the filename.") | |||
| 102 | ;;;; Commonly needed location classes are defined here: | 102 | ;;;; Commonly needed location classes are defined here: |
| 103 | 103 | ||
| 104 | ;; FIXME: might be useful to have an optional "hint" i.e. a string to | 104 | ;; FIXME: might be useful to have an optional "hint" i.e. a string to |
| 105 | ;; search for in case the line number is sightly out of date. | 105 | ;; search for in case the line number is slightly out of date. |
| 106 | (defclass xref-file-location (xref-location) | 106 | (defclass xref-file-location (xref-location) |
| 107 | ((file :type string :initarg :file) | 107 | ((file :type string :initarg :file) |
| 108 | (line :type fixnum :initarg :line :reader xref-location-line) | 108 | (line :type fixnum :initarg :line :reader xref-location-line) |
| @@ -254,8 +254,7 @@ find a search tool; by default, this uses \"find | grep\" in the | |||
| 254 | (project-external-roots pr))))) | 254 | (project-external-roots pr))))) |
| 255 | 255 | ||
| 256 | (cl-defgeneric xref-backend-apropos (backend pattern) | 256 | (cl-defgeneric xref-backend-apropos (backend pattern) |
| 257 | "Find all symbols that match PATTERN. | 257 | "Find all symbols that match regexp PATTERN.") |
| 258 | PATTERN is a regexp") | ||
| 259 | 258 | ||
| 260 | (cl-defgeneric xref-backend-identifier-at-point (_backend) | 259 | (cl-defgeneric xref-backend-identifier-at-point (_backend) |
| 261 | "Return the relevant identifier at point. | 260 | "Return the relevant identifier at point. |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index b80f0e69491..211feddc55d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -2377,6 +2377,7 @@ When called interactively with a prefix argument, prompt for LIMIT." | |||
| 2377 | 2377 | ||
| 2378 | ;;;###autoload | 2378 | ;;;###autoload |
| 2379 | (defun vc-print-branch-log (branch) | 2379 | (defun vc-print-branch-log (branch) |
| 2380 | "Show the change log for BRANCH in a window." | ||
| 2380 | (interactive | 2381 | (interactive |
| 2381 | (list | 2382 | (list |
| 2382 | (vc-read-revision "Branch to log: "))) | 2383 | (vc-read-revision "Branch to log: "))) |
diff --git a/src/buffer.c b/src/buffer.c index 1c8b4635086..9635733fcff 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5716,7 +5716,7 @@ word-wrapping, you might want to reduce the value of | |||
| 5716 | in narrower windows. | 5716 | in narrower windows. |
| 5717 | 5717 | ||
| 5718 | Instead of setting this variable directly, most users should use | 5718 | Instead of setting this variable directly, most users should use |
| 5719 | Visual Line mode . Visual Line mode, when enabled, sets `word-wrap' | 5719 | Visual Line mode. Visual Line mode, when enabled, sets `word-wrap' |
| 5720 | to t, and additionally redefines simple editing commands to act on | 5720 | to t, and additionally redefines simple editing commands to act on |
| 5721 | visual lines rather than logical lines. See the documentation of | 5721 | visual lines rather than logical lines. See the documentation of |
| 5722 | `visual-line-mode'. */); | 5722 | `visual-line-mode'. */); |