aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-04-13 15:49:13 +0300
committerEli Zaretskii2018-04-13 15:49:13 +0300
commitfebac2796b01b120476c9c38bfe1b32fb4f56f23 (patch)
treec0d9ebc14d3cce7b05dccbf605b56191ebf776d3
parent6c2e21e1cabfb9640320a043063c9a4761e58dec (diff)
parent60e10c503131f3088e901c7bbaaa53da816cf1e1 (diff)
downloademacs-febac2796b01b120476c9c38bfe1b32fb4f56f23.tar.gz
emacs-febac2796b01b120476c9c38bfe1b32fb4f56f23.zip
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
-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/textmodes/reftex-vars.el2
4 files changed, 5 insertions, 5 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el
index e03b9e9a0cb..3e202b9b78c 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -807,7 +807,7 @@ and \\[backward-word], which see.
807 807
808Value is normally t. 808Value is normally t.
809If an edge of the buffer or a field boundary is reached, point is left there 809If an edge of the buffer or a field boundary is reached, point is left there
810there and the function returns nil. Field boundaries are not noticed 810and the function returns nil. Field boundaries are not noticed
811if `inhibit-field-text-motion' is non-nil." 811if `inhibit-field-text-motion' is non-nil."
812 (interactive "^p") 812 (interactive "^p")
813 (if (eq (current-bidi-paragraph-direction) 'left-to-right) 813 (if (eq (current-bidi-paragraph-direction) 'left-to-right)
@@ -823,7 +823,7 @@ and \\[forward-word], which see.
823 823
824Value is normally t. 824Value is normally t.
825If an edge of the buffer or a field boundary is reached, point is left there 825If an edge of the buffer or a field boundary is reached, point is left there
826there and the function returns nil. Field boundaries are not noticed 826and the function returns nil. Field boundaries are not noticed
827if `inhibit-field-text-motion' is non-nil." 827if `inhibit-field-text-motion' is non-nil."
828 (interactive "^p") 828 (interactive "^p")
829 (if (eq (current-bidi-paragraph-direction) 'left-to-right) 829 (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
134attributes, and IGNORABLE-ATTRIBUTES will augment this list. 134attributes, and IGNORABLE-ATTRIBUTES will augment this list.
135 135
136Note that even though :name is not an attribute, it can be used to 136Note that even though :name is not an attribute, it can be used to
137to indicate lax comparison of names via `semantic--tag-similar-names-p'") 137indicate lax comparison of names via `semantic--tag-similar-names-p'")
138 138
139;; Note: optional thing is because overloadable fcns don't handle this 139;; Note: optional thing is because overloadable fcns don't handle this
140;; quite right. 140;; quite right.
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 1052ed97613..c0186f07a1d 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
676to display an image file as the actual image. 676to display an image file as the actual image.
677 677
678You can use `image-mode-as-hex' in `auto-mode-alist' when you want to 678You can use `image-mode-as-hex' in `auto-mode-alist' when you want to
679to display an image file as hex initially. 679display an image file as hex initially.
680 680
681See commands `image-mode' and `image-minor-mode' for more information 681See commands `image-mode' and `image-minor-mode' for more information
682on these modes." 682on these modes."
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
1616 1616
1617MACRO-RE is matched against the macro. SEARCH-RE is the regexp used 1617MACRO-RE is matched against the macro. SEARCH-RE is the regexp used
1618to search for cross references. `%s' in this regexp is replaced with 1618to search for cross references. `%s' in this regexp is replaced with
1619with the macro argument at point. HIGHLIGHT is an integer indicating 1619the macro argument at point. HIGHLIGHT is an integer indicating
1620which subgroup of the match should be highlighted." 1620which subgroup of the match should be highlighted."
1621 :group 'reftex-viewing-cross-references 1621 :group 'reftex-viewing-cross-references
1622 :type '(repeat (group (regexp :tag "Macro Regexp ") 1622 :type '(repeat (group (regexp :tag "Macro Regexp ")