diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:14:23 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:14:23 -0700 |
| commit | 3354582b368eb1d054d39409360f874c346065cc (patch) | |
| tree | c4361a37ce9222d4872943439554bfc656efc3c8 /lisp | |
| parent | 198ce5b1715ab44b42d0592e811c3dcebf39870f (diff) | |
| parent | c695fb37d3d3f525918fd50878181be524cba200 (diff) | |
| download | emacs-3354582b368eb1d054d39409360f874c346065cc.tar.gz emacs-3354582b368eb1d054d39409360f874c346065cc.tar.bz2 emacs-3354582b368eb1d054d39409360f874c346065cc.zip | |
Merge from origin/emacs-25
c695fb3 ; Spelling fixes
03750c0 * doc/misc/texinfo.tex: Sync from gnulib.
42fed3b * lisp/isearch.el (isearch-forward-symbol-at-point): Add isea...
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/syntax.el | 2 | ||||
| -rw-r--r-- | lisp/faces.el | 2 | ||||
| -rw-r--r-- | lisp/isearch.el | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index ae682ecf73a..31fc67ec815 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -274,7 +274,7 @@ Note: back-references in REGEXPs do not work." (defun syntax-propertize-via-font-lock (keywords) "Propertize for syntax using font-lock syntax. KEYWORDS obeys the format used in `font-lock-syntactic-keywords'. -The return value is a function (with two paremeters, START and +The return value is a function (with two parameters, START and END) suitable for `syntax-propertize-function'." (lambda (start end) (with-no-warnings diff --git a/lisp/faces.el b/lisp/faces.el index 3e26eadc6bb..71c94e563c7 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2320,7 +2320,7 @@ If you set `term-file-prefix' to nil, this function does nothing." (defface variable-pitch '((((type w32)) - ;; This is a kludgey workaround for an issue discussed in + ;; This is a kludgy workaround for an issue discussed in ;; http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00746.html. :font "-outline-Arial-normal-normal-normal-sans-*-*-*-*-p-*-iso8859-1") (t :family "Sans Serif")) diff --git a/lisp/isearch.el b/lisp/isearch.el index b2223e7b308..418d9ea273a 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -837,6 +837,7 @@ See the command `isearch-forward-symbol' for more information." (buffer-substring-no-properties (car bounds) (cdr bounds)))) (t (setq isearch-error "No symbol at point") + (isearch-push-state) (isearch-update))))) |