[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d2ea891 5/6: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master d2ea891 5/6: Merge from origin/emacs-25 |
Date: |
Tue, 22 Mar 2016 18:13:17 +0000 |
branch: master
commit d2ea891fca9d78553426f202ae6e1dd0047f693f
Merge: 656058b 91e6676
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
91e6676 Fix an Isearch var to be a string (Bug#23038)
76ef522 Fix (args-out-of-range 1) error in cursor-sensor--detect
---
lisp/emacs-lisp/cursor-sensor.el | 2 +-
lisp/isearch.el | 19 +++++++++++--------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el
index ac063d48..f1ab82e 100644
--- a/lisp/emacs-lisp/cursor-sensor.el
+++ b/lisp/emacs-lisp/cursor-sensor.el
@@ -113,7 +113,7 @@
;; non-sticky on both ends, but that means get-pos-property might
;; never see it.
(new (or (get-char-property point 'cursor-sensor-functions)
- (unless (= point 1)
+ (unless (bobp)
(get-char-property (1- point)
'cursor-sensor-functions))))
(old (window-parameter window 'cursor-sensor--last-state))
(oldposmark (car old))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 988503e..48354d3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2585,16 +2585,19 @@ the word mode."
(eq search-default-mode isearch-regexp))) "")
;; 2. Use the `isearch-message-prefix' set for
;; `regexp-function' if available.
- (regexp-function
- (and (symbolp regexp-function)
- (or (get regexp-function 'isearch-message-prefix)
- "")))
+ (regexp-function
+ (and (symbolp regexp-function)
+ (or (get regexp-function 'isearch-message-prefix)
+ "")))
;; 3. Else if `isearch-regexp' is non-nil, set description
;; to "regexp ".
- (isearch-regexp "regexp ")
- ;; 4. And finally, if we're in literal mode (and if the
- ;; default mode is also not literal), describe it.
- ((functionp search-default-mode) "literal "))))
+ (isearch-regexp "regexp ")
+ ;; 4. Else if we're in literal mode (and if the default
+ ;; mode is also not literal), describe it.
+ ((functionp search-default-mode) "literal ")
+ ;; 5. And finally, if none of the above is true, set the
+ ;; description to an empty string.
+ (t ""))))
(if space-before
;; Move space from the end to the beginning.
(replace-regexp-in-string "\\(.*\\) \\'" " \\1" description)
- [Emacs-diffs] master updated (6bd1e220 -> c4f4e64), Paul Eggert, 2016/03/22
- [Emacs-diffs] master 656058b 4/6: ; Merge from origin/emacs-25, Paul Eggert, 2016/03/22
- [Emacs-diffs] master d2ea891 5/6: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master c4f4e64 6/6: ; Fix etc/NEWS typo in recent merge., Paul Eggert, 2016/03/22
- [Emacs-diffs] master 4869e0d 2/6: ; Merge from origin/emacs-25, Paul Eggert, 2016/03/22
- [Emacs-diffs] master f95bbe5 3/6: -, Paul Eggert, 2016/03/22
- [Emacs-diffs] master 37b9099 1/6: -, Paul Eggert, 2016/03/22