diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el index ac063d4896a..f1ab82ecc4a 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 988503eaa4f..48354d39d48 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)