summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-04-14 07:50:45 -0700
committerGlenn Morris <rgm@gnu.org>2018-04-14 07:50:45 -0700
commitdb71b3182778b66fad3865825777b06cc20b89a8 (patch)
treea4528831664836775cdbd5c17436dad8a58aa0e7 /lisp
parent132b3a9ace018a120e1b30fc94c8c98904509884 (diff)
parent5a6bb01777e40a87ac59162d9833a13c81b7f292 (diff)
downloademacs-db71b3182778b66fad3865825777b06cc20b89a8.tar.gz
Merge from origin/emacs-26
5a6bb01 (origin/emacs-26) Fix building etc/DOC in the MSDOS port 274c979 * lisp/select.el (gui-get-selection): Doc fix. ad731b0 ; * doc/lispref/display.texi (Temporary Displays): Fix typos. f1450e9 Complete documentation of syntax flags by adding `c' 6bdcaec Fix typos and minor wording issues in ELisp manual febac27 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 6c2e21e Avoid segfault in processes of type 'pipe' 60e10c5 Remove repetitions in documentation strings 208e752 * lisp/image.el (image-load-path): Doc fix. 92e0fd8 ; * etc/NEWS: Remove a FIXME. (Bug#31122) Conflicts: etc/NEWS
Diffstat (limited to 'lisp')
-rw-r--r--lisp/bindings.el4
-rw-r--r--lisp/cedet/semantic/tag-ls.el2
-rw-r--r--lisp/image-mode.el2
-rw-r--r--lisp/image.el3
-rw-r--r--lisp/select.el6
-rw-r--r--lisp/textmodes/reftex-vars.el2
6 files changed, 12 insertions, 7 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 6ef8ffb0933..9797052725a 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -851,7 +851,7 @@ and \\[backward-word], which see.
Value is normally t.
If an edge of the buffer or a field boundary is reached, point is left there
-there and the function returns nil. Field boundaries are not noticed
+and the function returns nil. Field boundaries are not noticed
if `inhibit-field-text-motion' is non-nil."
(interactive "^p")
(if (eq (current-bidi-paragraph-direction) 'left-to-right)
@@ -867,7 +867,7 @@ and \\[forward-word], which see.
Value is normally t.
If an edge of the buffer or a field boundary is reached, point is left there
-there and the function returns nil. Field boundaries are not noticed
+and the function returns nil. Field boundaries are not noticed
if `inhibit-field-text-motion' is non-nil."
(interactive "^p")
(if (eq (current-bidi-paragraph-direction) 'left-to-right)
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index b9cce176697..39a4d9542e5 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -134,7 +134,7 @@ By default, `semantic-tag-similar-ignorable-attributes' is referenced for
attributes, and IGNORABLE-ATTRIBUTES will augment this list.
Note that even though :name is not an attribute, it can be used to
-to indicate lax comparison of names via `semantic--tag-similar-names-p'")
+indicate lax comparison of names via `semantic--tag-similar-names-p'")
;; Note: optional thing is because overloadable fcns don't handle this
;; quite right.
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 320f21a62d7..c504afa6970 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -676,7 +676,7 @@ displays an image file as hex. `image-minor-mode' provides the key
to display an image file as the actual image.
You can use `image-mode-as-hex' in `auto-mode-alist' when you want to
-to display an image file as hex initially.
+display an image file as hex initially.
See commands `image-mode' and `image-minor-mode' for more information
on these modes."
diff --git a/lisp/image.el b/lisp/image.el
index ab868f7db35..e084fe329af 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -116,6 +116,9 @@ told that the data would have the associated suffix if saved to a file.")
(list (file-name-as-directory (expand-file-name "images" data-directory))
'data-directory 'load-path)
"List of locations in which to search for image files.
+The images for icons shown in the tool bar are also looked up
+in these locations.
+
If an element is a string, it defines a directory to search.
If an element is a variable symbol whose value is a string, that
value defines a directory to search.
diff --git a/lisp/select.el b/lisp/select.el
index d5c9d7cbbbd..698be837547 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -291,8 +291,10 @@ all upper-case names. The most often used ones, in addition to
`PRIMARY', are `SECONDARY' and `CLIPBOARD'.
DATA-TYPE is usually `STRING', but can also be one of the symbols
-in `selection-converter-alist', which see. This argument is
-ignored on NS, MS-Windows and MS-DOS."
+in `selection-converter-alist', which see. Window systems other
+than X usually support only a small subset of these symbols, in
+addition to `STRING'; MS-Windows supports `TARGETS', which reports
+the formats available in the clipboard if TYPE is `CLIPBOARD'."
(let ((data (gui-backend-get-selection (or type 'PRIMARY)
(or data-type 'STRING))))
(when (and (stringp data)
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 01ee4f5fa4d..11dbb8d5705 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1616,7 +1616,7 @@ viewing can be useful. Each entry has the structure
MACRO-RE is matched against the macro. SEARCH-RE is the regexp used
to search for cross references. `%s' in this regexp is replaced with
-with the macro argument at point. HIGHLIGHT is an integer indicating
+the macro argument at point. HIGHLIGHT is an integer indicating
which subgroup of the match should be highlighted."
:group 'reftex-viewing-cross-references
:type '(repeat (group (regexp :tag "Macro Regexp ")